[Libreoffice-commits] core.git: filter/source jvmfwk/source

Desmin Alpaslan (via logerrit) logerrit at kemper.freedesktop.org
Mon Feb 3 14:46:20 UTC 2020


 filter/source/graphicfilter/ipsd/ipsd.cxx |    6 +++---
 jvmfwk/source/framework.cxx               |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f17f9bf0b3e5e548a8ef40206ebed180bda14931
Author:     Desmin Alpaslan <mavibirdesmi at gmail.com>
AuthorDate: Thu Dec 26 01:03:08 2019 +0300
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Feb 3 15:45:39 2020 +0100

    tdf#96505: Get rid of cargo cult long integer literals
    
    Change-Id: Id64855e3879d21106930a4dc9c36b246deb3c6e7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85818
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
index 7c61ae350290..3c219870f1d2 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -685,9 +685,9 @@ bool PSDReader::ImplReadBody()
                         sal_Int32 nDAT = pBlack[ nX + nY * mpFileHeader->nColumns ] * ( nBlackMax - 256 ) / 0x1ff;
 
                         aBitmapColor = mpBitmap->GetPixel( nY, nX );
-                        sal_uInt8 cR = static_cast<sal_uInt8>(MinMax( aBitmapColor.GetRed() - nDAT, 0L, 255L ));
-                        sal_uInt8 cG = static_cast<sal_uInt8>(MinMax( aBitmapColor.GetGreen() - nDAT, 0L, 255L ));
-                        sal_uInt8 cB = static_cast<sal_uInt8>(MinMax( aBitmapColor.GetBlue() - nDAT, 0L, 255L ));
+                        sal_uInt8 cR = static_cast<sal_uInt8>(MinMax( aBitmapColor.GetRed() - nDAT, 0, 255L ));
+                        sal_uInt8 cG = static_cast<sal_uInt8>(MinMax( aBitmapColor.GetGreen() - nDAT, 0, 255L ));
+                        sal_uInt8 cB = static_cast<sal_uInt8>(MinMax( aBitmapColor.GetBlue() - nDAT, 0, 255L ));
                         mpBitmap->SetPixel( nY, nX, Color( cR, cG, cB ) );
                     }
                 }
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 60d7dd796c20..67b65acb8a5c 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -309,7 +309,7 @@ javaFrameworkError jfw_findAndSelectJRE(std::unique_ptr<JavaInfo> *pInfo)
         //Determine if accessibility support is needed
         bool bSupportAccessibility = jfw::isAccessibilitySupportDesired();
         nFeatureFlags = bSupportAccessibility ?
-            JFW_FEATURE_ACCESSBRIDGE : 0L;
+            JFW_FEATURE_ACCESSBRIDGE : 0;
 
 
         // 'bInfoFound' indicates whether a Java installation has been found


More information about the Libreoffice-commits mailing list