Fix wxCursor(wxImage&) ctor for image widths not a multiple of 8, and finding second-most frequent color.

Simplify color cursor code.

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

src/gtk/cursor.cpp

@@ -17,6 +17,7 @@
     #include "wx/utils.h"
     #include "wx/image.h"
     #include "wx/colour.h"
+    #include "wx/bitmap.h"
 #endif // WX_PRECOMP
 
 #include <gtk/gtk.h>
@@ -173,121 +174,77 @@ static void GetHotSpot(const wxImage& image, int& x, int& y)
 
 wxCursor::wxCursor( const wxImage & image )
 {
-    unsigned char * rgbBits = image.GetData();
     int w = image.GetWidth() ;
     int h = image.GetHeight();
     bool bHasMask = image.HasMask();
-    int imagebitcount = (w*h)/8;
-
-    if ( gdk_display_supports_cursor_color(gdk_display_get_default()) )
-    {
-        unsigned char rMask = 0,
-                      gMask = 0,
-                      bMask = 0;
-        if (bHasMask)
-        {
-            rMask = image.GetMaskRed();
-            gMask = image.GetMaskGreen();
-            bMask = image.GetMaskBlue();
-        }
-
-        GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, w, h);
-        unsigned char *alpha = image.HasAlpha() ? image.GetAlpha() : NULL;
-        unsigned char *out = gdk_pixbuf_get_pixels(pixbuf);
-        int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - 4 * w;
-        for ( int y = 0; y < h; y++, out += rowpad )
-        {
-            for ( int x = 0; x < w; x++, out += 4, rgbBits += 3 )
-            {
-                out[0] = rgbBits[0];
-                out[1] = rgbBits[1];
-                out[2] = rgbBits[2];
-                if (bHasMask &&
-                    out[0] == rMask && out[1] == gMask && out[2] == bMask)
-                    out[3] = 0;
-                else
-                    out[3] = alpha ? *alpha : 255;
-                if ( alpha )
-                    ++alpha;
-            }
-        }
-
     int hotSpotX, hotSpotY;
     GetHotSpot(image, hotSpotX, hotSpotY);
-
     m_refData = new wxCursorRefData;
+    wxImage image_copy(image);
+
+    GdkDisplay* display = gdk_drawable_get_display(wxGetRootWindow()->window);
+    if (gdk_display_supports_cursor_color(display))
+    {
+        if (!image.HasAlpha())
+        {
+            // add alpha, so wxBitmap will convert to pixbuf format
+            image_copy.InitAlpha();
+        }
+        wxBitmap bitmap(image_copy);
+        wxASSERT(bitmap.HasPixbuf());
         M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixbuf
                              (
-                              gdk_display_get_default(),
+                              display,
-                              pixbuf,
+                              bitmap.GetPixbuf(),
                               hotSpotX, hotSpotY
                              );
-        g_object_unref (pixbuf);
         return;
     }
 
-    unsigned char * bits = new unsigned char [imagebitcount];
+    // modify image so wxBitmap can be used to convert to pixmap
-    unsigned char * maskBits = new unsigned char [imagebitcount];
+    image_copy.UnShare();
-
+    int i, j;
-    int i, j, i8; unsigned char c, cMask;
+    wxByte* data = image_copy.GetData();
-    for (i=0; i<imagebitcount; i++)
+    for (j = 0; j < h; j++)
     {
-        bits[i] = 0;
+        for (i = 0; i < w; i++, data += 3)
-        i8 = i * 8;
-
-        cMask = 1;
-        for (j=0; j<8; j++)
         {
-            // possible overflow if we do the summation first ?
-            c = rgbBits[(i8+j)*3]/3 + rgbBits[(i8+j)*3+1]/3 + rgbBits[(i8+j)*3+2]/3;
             //if average value is > mid grey
-            if (c>127)
+            if (int(data[0]) + data[1] + data[2] >= 3 * 128)
-                bits[i] = bits[i] | cMask;
+            {
-            cMask = cMask * 2;
+                // wxBitmap only converts (255,255,255) to white
+                data[0] = 255;
+                data[1] = 255;
+                data[2] = 255;
+            }
         }
     }
 
-    unsigned long keyMaskColor;
+    wxBitmap bitmap(image_copy, 1);
+
+    unsigned long keyMaskColor = 0;
+    GdkPixmap* mask;
     if (bHasMask)
     {
-        unsigned char
+        keyMaskColor = wxImageHistogram::MakeKey(
-            r = image.GetMaskRed(),
+            image.GetMaskRed(), image.GetMaskGreen(), image.GetMaskBlue());
-            g = image.GetMaskGreen(),
+        mask = bitmap.GetMask()->GetBitmap();
-            b = image.GetMaskBlue();
+        g_object_ref(mask);
-
-        for (i=0; i<imagebitcount; i++)
-        {
-            maskBits[i] = 0x0;
-            i8 = i * 8;
-
-            cMask = 1;
-            for (j=0; j<8; j++)
-            {
-                if (rgbBits[(i8+j)*3] != r || rgbBits[(i8+j)*3+1] != g || rgbBits[(i8+j)*3+2] != b)
-                    maskBits[i] = maskBits[i] | cMask;
-                cMask = cMask * 2;
     }
-        }
+    else
-
-        keyMaskColor = (r << 16) | (g << 8) | b;
-    }
-    else // no mask
     {
-        for (i=0; i<imagebitcount; i++)
+        const int size = ((w + 7) / 8) * h;
-            maskBits[i] = 0xFF;
+        char* bits = new char[size];
-
+        memset(bits, 0xff, size);
-        // init it to avoid compiler warnings
+        mask = gdk_bitmap_create_from_data(
-        keyMaskColor = 0;
+            bitmap.GetPixmap(), bits, w, h);
+        delete[] bits;
     }
 
     // find the most frequent color(s)
     wxImageHistogram histogram;
     image.ComputeHistogram(histogram);
 
-    // colors as rrggbb
-    unsigned long key;
-    unsigned long value;
-
     long colMostFreq = 0;
     unsigned long nMost = 0;
     long colNextMostFreq = 0;
@@ -296,12 +253,14 @@ wxCursor::wxCursor( const wxImage & image )
           entry != histogram.end();
           ++entry )
     {
-        value = entry->second.value;
+        unsigned long key = entry->first;
-        key = entry->first;
         if ( !bHasMask || (key != keyMaskColor) )
         {
+            unsigned long value = entry->second.value;
             if (value > nMost)
             {
+                nNext = nMost;
+                colNextMostFreq = colMostFreq;
                 nMost = value;
                 colMostFreq = key;
             }
@@ -332,27 +291,15 @@ wxCursor::wxCursor( const wxImage & image )
         bg = tmp;
     }
 
-    int hotSpotX, hotSpotY;
-    GetHotSpot(image, hotSpotX, hotSpotY);
-
-    GdkBitmap *data = gdk_bitmap_create_from_data(wxGetRootWindow()->window,
-                                                  (gchar *) bits, w, h);
-    GdkBitmap *mask = gdk_bitmap_create_from_data(wxGetRootWindow()->window,
-                                                  (gchar *) maskBits, w, h);
-
-    m_refData = new wxCursorRefData;
     M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap
                              (
-                                data,
+                                bitmap.GetPixmap(),
                                 mask,
                                 fg.GetColor(), bg.GetColor(),
                                 hotSpotX, hotSpotY
                              );
 
-    g_object_unref (data);
     g_object_unref (mask);
-    delete [] bits;
-    delete [] maskBits;
 }
 
 #endif // wxUSE_IMAGE