Allow scaled image in Fl_Window::cursor(const Fl_RGB_Image *, int, int)

1 files changed, 7 insertions, 7 deletions

diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 748f686d2..da3d27116 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -3729,24 +3729,24 @@ int Fl_Cocoa_Window_Driver::set_cursor(const Fl_RGB_Image *image, int hotx, int
 
   NSBitmapImageRep *bitmap = [[NSBitmapImageRep alloc]
                               initWithBitmapDataPlanes:NULL
-                              pixelsWide:image->w()
-                              pixelsHigh:image->h()
+                              pixelsWide:image->data_w()
+                              pixelsHigh:image->data_h()
                               bitsPerSample:8
                               samplesPerPixel:image->d()
                               hasAlpha:!(image->d() & 1)
                               isPlanar:NO
                               colorSpaceName:(image->d()<=2) ? NSDeviceWhiteColorSpace : NSDeviceRGBColorSpace
-                              bytesPerRow:(image->w() * image->d())
+                              bytesPerRow:(image->data_w() * image->d())
                               bitsPerPixel:(image->d()*8)];
 
   // Alpha needs to be premultiplied for this format
 
   const uchar *i = (const uchar*)*image->data();
-  const int extra_data = image->ld() ? (image->ld() - image->w() * image->d()) : 0;
+  const int extra_data = image->ld() ? (image->ld() - image->data_w() * image->d()) : 0;
   unsigned char *o = [bitmap bitmapData];
-  for (int y = 0;y < image->h();y++) {
+  for (int y = 0;y < image->data_h();y++) {
     if (!(image->d() & 1)) {
-      for (int x = 0;x < image->w();x++) {
+      for (int x = 0;x < image->data_w();x++) {
         unsigned int alpha;
         if (image->d() == 4) {
           alpha = i[3];
@@ -3761,7 +3761,7 @@ int Fl_Cocoa_Window_Driver::set_cursor(const Fl_RGB_Image *image, int hotx, int
   }
     } else {
       // No alpha, so we can just copy everything directly.
-      int len = image->w() * image->d();
+      int len = image->data_w() * image->d();
       memcpy(o, i, len);
       o += len;
       i += len;