From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 7 Mar 2006 23:52:46 +0000 (+0000)
Subject: test for dst!=NULL instead of bpp==1 in Rescale() as otherwise we'd crash on monochro... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ce46daf91c812038f13df8c8ca625145057cc09e?ds=inline

test for dst!=NULL instead of bpp==1 in Rescale() as otherwise we'd crash on monochrome display (not very common any more, but still) (coverity checker CID 12)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 05ffe3b3d3..cb358da34a 100644
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -455,7 +455,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
                     old_x = x;
                 }
 
-                if (bpp == 1)
+                if ( dst )
                 {
                     if (!pixval)
                     {
@@ -480,14 +480,14 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
             }
 
             // do not forget the last byte
-            if ((bpp == 1) && (width % 8 != 0))
+            if ( dst && (width % 8 != 0) )
                 dst[h*dstbyteperline+width/8] = outbyte;
         }
 
         gdk_image_destroy( img );
         if (gc) gdk_gc_unref( gc );
 
-        if (bpp == 1)
+        if ( dst )
         {
             bmp = wxBitmap( (const char *)dst, width, height, 1 );
             free( dst );