diff --git a/src/sp-cursor.cpp b/src/sp-cursor.cpp
index 339990771c3e05d189c2358b17e6a26dd3e9fa03..4bbba5f10875748550293add149c905de30b6e12 100644 (file)
--- a/src/sp-cursor.cpp
+++ b/src/sp-cursor.cpp
* Released under GNU GPL, read the file 'COPYING' for more information
*/
-#include <string.h>
+#include <cstdio>
+#include <cstring>
+#include <string>
#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;
int transparent_color = ' ';
int black_color = '.';
-
+
char pixmap_buffer[(32 * 32)/8];
char mask_buffer[(32 * 32)/8];
@@ -64,10 +67,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;
}
}
*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 };