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

[Tor Lillqvist]

 vcl/source/bitmap/BitmapEmbossGreyFilter.cxx |    2 +-
 vcl/source/bitmap/BitmapMosaicFilter.cxx     |    2 +-
 vcl/source/bitmap/BitmapSepiaFilter.cxx      |    2 +-
 vcl/source/bitmap/BitmapSmoothenFilter.cxx   |    2 +-
 vcl/source/bitmap/BitmapSobelGreyFilter.cxx  |   20 ++++++++++----------
 vcl/source/bitmap/BitmapSolarizeFilter.cxx   |    2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit c250b6a5c6edbca08d5f083ff33fbfc5a49b3b4a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Apr 23 09:31:01 2018 +0300

    loplugin:expressionalwayszero
    
    So comment out the use of those expressions, and to avoid ununsed
    variables, also comment out the definitions of those const variables.
    
    Change-Id: I870c7d9599f944d3d55758492c059bcf15628a4a
    Reviewed-on: https://gerrit.libreoffice.org/53305
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/source/bitmap/BitmapSobelGreyFilter.cxx b/vcl/source/bitmap/BitmapSobelGreyFilter.cxx
index 450772dd2abe..a80b09c1dad7 100644
--- a/vcl/source/bitmap/BitmapSobelGreyFilter.cxx
+++ b/vcl/source/bitmap/BitmapSobelGreyFilter.cxx
@@ -37,11 +37,11 @@ BitmapEx BitmapSobelGreyFilter::execute(BitmapEx const& rBitmapEx)
                 BitmapColor aGrey(sal_uInt8(0));
                 const long nWidth = pWriteAcc->Width();
                 const long nHeight = pWriteAcc->Height();
-                const long nMask111 = -1, nMask121 = 0, nMask131 = 1;
-                const long nMask211 = -2, nMask221 = 0, nMask231 = 2;
-                const long nMask311 = -1, nMask321 = 0, nMask331 = 1;
+                const long nMask111 = -1, /* nMask121 = 0, */ nMask131 = 1;
+                const long nMask211 = -2, /* nMask221 = 0, */ nMask231 = 2;
+                const long nMask311 = -1, /* nMask321 = 0, */ nMask331 = 1;
                 const long nMask112 = 1, nMask122 = 2, nMask132 = 1;
-                const long nMask212 = 0, nMask222 = 0, nMask232 = 0;
+                // const long /* nMask212 = 0, */ /* nMask222 = 0, */ /* nMask232 = 0 */;
                 const long nMask312 = -1, nMask322 = -2, nMask332 = -1;
                 long nGrey11, nGrey12, nGrey13;
                 long nGrey21, nGrey22, nGrey23;
@@ -89,25 +89,25 @@ BitmapEx BitmapSobelGreyFilter::execute(BitmapEx const& rBitmapEx)
                         nSum1 += nMask111 * nGrey11;
                         nSum2 += nMask112 * nGrey11;
 
-                        nSum1 += nMask121 * nGrey12;
+                        // nSum1 += nMask121 * nGrey12;
                         nSum2 += nMask122 * nGrey12;
 
                         nSum1 += nMask131 * nGrey13;
                         nSum2 += nMask132 * nGrey13;
 
                         nSum1 += nMask211 * nGrey21;
-                        nSum2 += nMask212 * nGrey21;
+                        // nSum2 += nMask212 * nGrey21;
 
-                        nSum1 += nMask221 * nGrey22;
-                        nSum2 += nMask222 * nGrey22;
+                        // nSum1 += nMask221 * nGrey22;
+                        // nSum2 += nMask222 * nGrey22;
 
                         nSum1 += nMask231 * nGrey23;
-                        nSum2 += nMask232 * nGrey23;
+                        // nSum2 += nMask232 * nGrey23;
 
                         nSum1 += nMask311 * nGrey31;
                         nSum2 += nMask312 * nGrey31;
 
-                        nSum1 += nMask321 * nGrey32;
+                        // nSum1 += nMask321 * nGrey32;
                         nSum2 += nMask322 * nGrey32;
 
                         nSum1 += nMask331 * nGrey33;
commit c08b09331083aff367c153b9da14fb5a2e6d130b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Apr 23 09:35:37 2018 +0200

    loplugin:redundantfcast
    
    (Presumably <https://gerrit.libreoffice.org/#/c/53201/> "vcl: ImplSolarize() to
    BitmapSolarizeFilter" passed Gerrit/Jenkins because the Linux Clang plugin build
    was done in C++11, not C++17 mode.)
    
    Change-Id: I8a7afee18ed2f83921eb82b74252d0ebf76c25d5

diff --git a/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx b/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx
index f6ea34527de5..f64126ac978a 100644
--- a/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx
+++ b/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx
@@ -145,7 +145,7 @@ BitmapEx BitmapEmbossGreyFilter::execute(BitmapEx const& rBitmapEx)
     }
 
     if (bRet)
-        return BitmapEx(rBitmapEx);
+        return rBitmapEx;
 
     return BitmapEx();
 }
diff --git a/vcl/source/bitmap/BitmapMosaicFilter.cxx b/vcl/source/bitmap/BitmapMosaicFilter.cxx
index faefbe5d3766..f17a25ff2283 100644
--- a/vcl/source/bitmap/BitmapMosaicFilter.cxx
+++ b/vcl/source/bitmap/BitmapMosaicFilter.cxx
@@ -179,7 +179,7 @@ BitmapEx BitmapMosaicFilter::execute(BitmapEx const& rBitmapEx)
     }
 
     if (bRet)
-        return BitmapEx(rBitmapEx);
+        return rBitmapEx;
 
     return BitmapEx();
 }
diff --git a/vcl/source/bitmap/BitmapSepiaFilter.cxx b/vcl/source/bitmap/BitmapSepiaFilter.cxx
index a953fcbee2a8..0d1a41083974 100644
--- a/vcl/source/bitmap/BitmapSepiaFilter.cxx
+++ b/vcl/source/bitmap/BitmapSepiaFilter.cxx
@@ -98,7 +98,7 @@ BitmapEx BitmapSepiaFilter::execute(BitmapEx const& rBitmapEx)
     }
 
     if (bRet)
-        return BitmapEx(rBitmapEx);
+        return rBitmapEx;
 
     return BitmapEx();
 }
diff --git a/vcl/source/bitmap/BitmapSmoothenFilter.cxx b/vcl/source/bitmap/BitmapSmoothenFilter.cxx
index 4c3b3f53c368..17ab1bbff3f9 100644
--- a/vcl/source/bitmap/BitmapSmoothenFilter.cxx
+++ b/vcl/source/bitmap/BitmapSmoothenFilter.cxx
@@ -28,7 +28,7 @@ BitmapEx BitmapSmoothenFilter::execute(BitmapEx const& rBitmapEx)
         bRet = BitmapFilter::Filter(aBitmapEx, BitmapSeparableUnsharpenFilter(mfRadius));
 
     if (bRet)
-        return BitmapEx(rBitmapEx);
+        return rBitmapEx;
 
     return BitmapEx();
 }
diff --git a/vcl/source/bitmap/BitmapSolarizeFilter.cxx b/vcl/source/bitmap/BitmapSolarizeFilter.cxx
index 88808ff97426..3c8b3b598c68 100644
--- a/vcl/source/bitmap/BitmapSolarizeFilter.cxx
+++ b/vcl/source/bitmap/BitmapSolarizeFilter.cxx
@@ -60,7 +60,7 @@ BitmapEx BitmapSolarizeFilter::execute(BitmapEx const& rBitmapEx)
     }
 
     if (bRet)
-        return BitmapEx(rBitmapEx);
+        return rBitmapEx;
 
     return BitmapEx();
 }