X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-cursor.cpp;h=3e9c5ef904060f9cb93ffc3986059e442cbbb5ff;hb=a90ee35704b576186c47d5f8d4b077f6f7103c05;hp=339990771c3e05d189c2358b17e6a26dd3e9fa03;hpb=f951374eef04129c6a0d213e7ab4d9ed2095ca69;p=inkscape.git

diff --git a/src/sp-cursor.cpp b/src/sp-cursor.cpp
index 339990771..3e9c5ef90 100644
--- a/src/sp-cursor.cpp
+++ b/src/sp-cursor.cpp
@@ -12,11 +12,13 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <cstdio>
 #include <string.h>
 #include <ctype.h>
 #include "sp-cursor.h"
 
-void sp_cursor_bitmap_and_mask_from_xpm (GdkBitmap **bitmap, GdkBitmap **mask, gchar **xpm)
+void
+sp_cursor_bitmap_and_mask_from_xpm(GdkBitmap **bitmap, GdkBitmap **mask, gchar const *const *xpm)
 {
     int height;
     int width;
@@ -64,10 +66,10 @@ void sp_cursor_bitmap_and_mask_from_xpm (GdkBitmap **bitmap, GdkBitmap **mask, g
             char maskv = 0;
 			
             for (int pix = 0; pix < 8; pix++, x++){
-                if (xpm [4+y][x] != transparent_color) {
+                if (xpm[4+y][x] != transparent_color) {
                     maskv |= 1 << pix;
 
-                    if (xpm [4+y][x] == black_color) {
+                    if (xpm[4+y][x] == black_color) {
                         value |= 1 << pix;
                     }
                 }
@@ -82,7 +84,8 @@ void sp_cursor_bitmap_and_mask_from_xpm (GdkBitmap **bitmap, GdkBitmap **mask, g
     *mask   = gdk_bitmap_create_from_data(NULL, mask_buffer, 32, 32);
 }
 
-GdkCursor *sp_cursor_new_from_xpm (gchar **xpm, gint hot_x, gint hot_y)
+GdkCursor *
+sp_cursor_new_from_xpm(gchar const *const *xpm, gint hot_x, gint hot_y)
 {
     GdkColor const fg = { 0, 0, 0, 0 };
     GdkColor const bg = { 0, 65535, 65535, 65535 };