Bit fiddling.

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

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 50d6763dcf3eb60e257ff66eaf3a0e4b15b1eeed..453f827b5f9ffb0901bd812e45a73baa486b7c6d 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -529,18 +529,13 @@ wxImage wxBitmap::ConvertToImage() const
       int pixel = gdk_image_get_pixel( gdk_image, i, j );
       if (bpp <= 8)
       {
-/*
-        int r = cmap->colors[pixel].red;    // debug code
-        int g = cmap->colors[pixel].green;
-        int b = cmap->colors[pixel].blue;
-*/
         data[pos] = cmap->colors[pixel].red >> 8;
         data[pos+1] = cmap->colors[pixel].green >> 8;
         data[pos+2] = cmap->colors[pixel].blue >> 8;
       } else if (bpp == 15)
       {
         data[pos] = (pixel >> 7) & 0xf8;
-        data[pos+1] = (pixel >> 3) & 0xf8;
+        data[pos+1] = (pixel >> 2) & 0xf8;
         data[pos+2] = (pixel << 3) & 0xf8;
       } else if (bpp == 16)
       {

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 50d6763dcf3eb60e257ff66eaf3a0e4b15b1eeed..453f827b5f9ffb0901bd812e45a73baa486b7c6d 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -529,18 +529,13 @@ wxImage wxBitmap::ConvertToImage() const
       int pixel = gdk_image_get_pixel( gdk_image, i, j );
       if (bpp <= 8)
       {
-/*
-        int r = cmap->colors[pixel].red;    // debug code
-        int g = cmap->colors[pixel].green;
-        int b = cmap->colors[pixel].blue;
-*/
         data[pos] = cmap->colors[pixel].red >> 8;
         data[pos+1] = cmap->colors[pixel].green >> 8;
         data[pos+2] = cmap->colors[pixel].blue >> 8;
       } else if (bpp == 15)
       {
         data[pos] = (pixel >> 7) & 0xf8;
-        data[pos+1] = (pixel >> 3) & 0xf8;
+        data[pos+1] = (pixel >> 2) & 0xf8;
         data[pos+2] = (pixel << 3) & 0xf8;
       } else if (bpp == 16)
       {