diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-02-04 10:38:39 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-02-04 10:38:39 +0100 |
| commit | 3641e034cbe04cb3dfb6aea2aa76ad1fe4487216 (patch) | |
| tree | f899b508516810530f3c0366909a0f163ba8a25d /cppcanvas | |
| parent | e99873a9d21b2e7fc897b582252e3693f719a81a (diff) | |
| parent | da2c680d23b67d4721aa29f740475fd6d40e2e08 (diff) | |
autorecovery: commit resolved merge (after rebase to m71)
Diffstat (limited to 'cppcanvas')
| -rw-r--r-- | cppcanvas/inc/cppcanvas/color.hxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/cppcanvas/inc/cppcanvas/color.hxx b/cppcanvas/inc/cppcanvas/color.hxx index 7441f6f2937a..ad0430713ead 100644 --- a/cppcanvas/inc/cppcanvas/color.hxx +++ b/cppcanvas/inc/cppcanvas/color.hxx @@ -83,6 +83,16 @@ namespace cppcanvas return (nRed << 24U)|(nGreen << 16U)|(nBlue << 8U)|(nAlpha); } + inline sal_Int32 unMakeColor( sal_uInt8 nAlpha, sal_uInt8 nRed, sal_uInt8 nGreen, sal_uInt8 nBlue) + { + return (nAlpha << 24U)|(nRed << 16U)|(nGreen << 8U)|(nBlue); + } + + inline sal_Int32 makeColorARGB( sal_uInt8 nAlpha, sal_uInt8 nRed, sal_uInt8 nGreen, sal_uInt8 nBlue) + { + return (nAlpha << 24U)|(nRed << 16U)|(nGreen << 8U)|(nBlue); + } + } #endif /* _CPPCANVAS_COLOR_HXX */ |