[Libreoffice-commits] core.git: include/vcl vcl/source

[Chris Sherlock (via logerrit)]

 include/vcl/bitmap.hxx     |    2 ++
 vcl/source/gdi/bitmap3.cxx |    2 --
 vcl/source/gdi/gdimtf.cxx  |    2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 26f504eccfcfaa548f0648703925360e08d4a0c2
Author:     Chris Sherlock <chris.sherlock79 at gmail.com>
AuthorDate: Fri Dec 18 15:47:59 2020 +1100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Sat Dec 19 04:17:49 2020 +0100

    vcl: move GAMMA define to bitmap.hxx
    
    Change-Id: I6ffe438fa4b12d51eecb73a79c9443240e1d4695
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107949
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 810ece4e5286..ef27679bc9fc 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -30,6 +30,8 @@
 #include <o3tl/typed_flags_set.hxx>
 #include <memory>
 
+#define GAMMA( _def_cVal, _def_InvGamma )   (static_cast<sal_uInt8>(MinMax(FRound(pow( _def_cVal/255.0,_def_InvGamma)*255.0),0,255)))
+
 class Color;
 
 template <typename Arg, typename Ret> class Link;
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index cd7232ed1b82..6f760d0f1602 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -46,8 +46,6 @@
 
 #include <memory>
 
-#define GAMMA( _def_cVal, _def_InvGamma )   (static_cast<sal_uInt8>(MinMax(FRound(pow( _def_cVal/255.0,_def_InvGamma)*255.0),0,255)))
-
 #define CALC_ERRORS                                                             \
                         nTemp = p1T[nX++] >> 12;                              \
                         nBErr = MinMax( nTemp, 0, 255 );                        \
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 02f47b5c6bba..980d1170bc7e 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -49,8 +49,6 @@
 
 using namespace com::sun::star;
 
-#define GAMMA( _def_cVal, _def_InvGamma )   (static_cast<sal_uInt8>(MinMax(FRound(pow( _def_cVal/255.0,_def_InvGamma)*255.0),0,255)))
-
 namespace {
 
 struct ImplColAdjustParam