From 51df7ffd3ff8107524ab2b238196a3ff91e7ad77 Mon Sep 17 00:00:00 2001 From: thb Date: Mon, 29 Jun 2009 15:15:41 +0200 Subject: #103174# Code from the ecntablet and eraser CWS; optionally improves user paint interactions in slideshow --- cppcanvas/inc/cppcanvas/color.hxx | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'cppcanvas') diff --git a/cppcanvas/inc/cppcanvas/color.hxx b/cppcanvas/inc/cppcanvas/color.hxx index 7441f6f2937a..e1cb30900e5e 100644 --- a/cppcanvas/inc/cppcanvas/color.hxx +++ b/cppcanvas/inc/cppcanvas/color.hxx @@ -83,6 +83,11 @@ namespace cppcanvas return (nRed << 24U)|(nGreen << 16U)|(nBlue << 8U)|(nAlpha); } + 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 */ -- cgit From 74d69666a871202c0073d4fe23982c7cea063276 Mon Sep 17 00:00:00 2001 From: ericb Date: Thu, 7 Jan 2010 10:16:57 +0100 Subject: eraser01: #i103174# fix missing changes due to rebase from external repository --- cppcanvas/inc/cppcanvas/color.hxx | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'cppcanvas') diff --git a/cppcanvas/inc/cppcanvas/color.hxx b/cppcanvas/inc/cppcanvas/color.hxx index e1cb30900e5e..ad0430713ead 100644 --- a/cppcanvas/inc/cppcanvas/color.hxx +++ b/cppcanvas/inc/cppcanvas/color.hxx @@ -83,6 +83,11 @@ 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); -- cgit