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

[Noel Grandin]

 include/vcl/bitmap.hxx             |    2 +-
 include/vcl/bitmapex.hxx           |    6 +++++-
 vcl/source/filter/igif/gifread.cxx |    2 --
 vcl/source/gdi/animate.cxx         |    2 --
 vcl/workben/outdevgrind.cxx        |    5 +++++
 5 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 7daa249981e0d0b69f4f7564bfb6bc643f375039
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Wed Feb 7 14:48:53 2018 +0200

    sprinkle SAL_WARN_UNUSED over Bitmap/BitmapEx
    
    Change-Id: If6fe5f05ecfc26c38890efde0f5e61edb7c3fbc5
    Reviewed-on: https://gerrit.libreoffice.org/49359
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 2f74b71dd7b3..d4f290e35793 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -212,7 +212,7 @@ struct BitmapSystemData
     int mnHeight;
 };
 
-class VCL_DLLPUBLIC Bitmap
+class SAL_WARN_UNUSED VCL_DLLPUBLIC Bitmap
 {
 public:
 
diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx
index 1857e7608314..31b008a081b2 100644
--- a/include/vcl/bitmapex.hxx
+++ b/include/vcl/bitmapex.hxx
@@ -40,7 +40,7 @@ enum class TransparentType
     Bitmap
 };
 
-class VCL_DLLPUBLIC BitmapEx
+class SAL_WARN_UNUSED VCL_DLLPUBLIC BitmapEx
 {
 public:
 
@@ -371,6 +371,7 @@ public:
         @param bSmooth
         Defines if pixel interpolation is to be used to create the result
     */
+    SAL_WARN_UNUSED_RESULT
     BitmapEx            TransformBitmapEx(
                             double fWidth,
                             double fHeight,
@@ -398,6 +399,7 @@ public:
 
         @return The transformed bitmap
     */
+    SAL_WARN_UNUSED_RESULT
     BitmapEx            getTransformed(
                             const basegfx::B2DHomMatrix& rTransformation,
                             const basegfx::B2DRange& rVisibleRange,
@@ -409,8 +411,10 @@ public:
         @param rBColorModifierStack
         A ColrModifierStack which defines how each pixel has to be modified
     */
+    SAL_WARN_UNUSED_RESULT
     BitmapEx            ModifyBitmapEx( const basegfx::BColorModifierStack& rBColorModifierStack) const;
 
+    SAL_WARN_UNUSED_RESULT
     static BitmapEx     AutoScaleBitmap( BitmapEx const & aBitmap, const long aStandardSize );
 
     /// populate from a canvas implementation
diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx
index f24414f7e634..208e2f84c029 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -683,8 +683,6 @@ Graphic GIFReader::GetIntermediateGraphic()
     // but graphic still not completely read
     if ( bImGraphicReady && !aAnimation.Count() )
     {
-        Bitmap  aBmp;
-
         pAcc8.reset();
 
         if ( bGCTransparent )
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx
index f226b9d699c5..7898fda187b4 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/gdi/animate.cxx
@@ -688,7 +688,6 @@ SvStream& WriteAnimation( SvStream& rOStm, const Animation& rAnimation )
 
 SvStream& ReadAnimation( SvStream& rIStm, Animation& rAnimation )
 {
-    Bitmap      aBmp;
     sal_uLong   nStmPos;
     sal_uInt32  nAnimMagic1, nAnimMagic2;
     SvStreamEndian nOldFormat = rIStm.GetEndian();
@@ -722,7 +721,6 @@ SvStream& ReadAnimation( SvStream& rIStm, Animation& rAnimation )
     if( bReadAnimations )
     {
         AnimationBitmap aAnimBmp;
-        BitmapEx        aBmpEx;
         sal_uInt32          nTmp32;
         sal_uInt16          nTmp16;
         bool           cTmp;
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index 79e025ad3b79..277a370486a8 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -133,10 +133,15 @@ void setupMethodStubs( functor_vector_type& res )
 #endif
 
     const BitmapEx    aBitmapEx( aBitmap, aBitmapBW );
+    (void)aBitmapEx;
     const BitmapEx    aBitmapExBW( aBitmapBW, aBitmapBW );
+    (void)aBitmapExBW;
     const BitmapEx    aBitmapExAlien( aBitmapAlien, aBitmapBW );
+    (void)aBitmapExAlien;
     const BitmapEx    aBitmapExAlpha( aBitmap, aBitmapAlien );
+    (void)aBitmapExAlpha;
     const BitmapEx    aBitmapExAlphaAlien( aBitmapAlien, aBitmapAlien );
+    (void)aBitmapExAlphaAlien;
 
 #ifdef NEEDS_QUALITY_PARAMETER
     const Image       aImage( aBitmapEx );