I've uploaded an NMU with the following patch to the DELAYED/5-day
queue. You can prevent this upload from making it to unstable by
performing an MU sometime during this 5 day period.
diff -urN orig.gnome-iconedit-1.2.0/debian/changelog
gnome-iconedit-1.2.0/debian/changelog
--- orig.gnome-iconedit-1.2.0/debian/changelog 2005-09-16 15:53:31.000000000
-0600
+++ gnome-iconedit-1.2.0/debian/changelog 2005-09-16 15:56:49.000000000
-0600
@@ -1,3 +1,12 @@
+gnome-iconedit (1.2.0-9.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix a couple implicitly converted pointers, and some other compiler
+ warnings. Patch from "J.H.M. Dassen (Ray)" <[EMAIL PROTECTED]>.
+ Closes: #226588.
+
+ -- dann frazier <[EMAIL PROTECTED]> Fri, 16 Sep 2005 15:55:45 -0600
+
gnome-iconedit (1.2.0-9) unstable; urgency=low
* added libpng2-dev to builddependencies (Closes: #165005).
diff -urN orig.gnome-iconedit-1.2.0/src/grid.c gnome-iconedit-1.2.0/src/grid.c
--- orig.gnome-iconedit-1.2.0/src/grid.c 2000-07-07 11:44:14.000000000
-0600
+++ gnome-iconedit-1.2.0/src/grid.c 2005-09-16 15:54:05.000000000 -0600
@@ -120,7 +120,7 @@
grid_new_bonoboview (GtkWidget *canvas,
IEBonoboView *view)
{
- GnomeCanvasItem *root;
+ GnomeCanvasGroup *root;
guint width, height;
Grid* g;
@@ -136,7 +136,7 @@
root = gnome_canvas_root (GNOME_CANVAS (canvas));
/* In order: bottom->top */
- g->cboard = gnome_canvas_item_new (GNOME_CANVAS_GROUP (root),
+ g->cboard = gnome_canvas_item_new (root,
ie_canvas_chequer_board_get_type (),
"x", 0.0,
"y", 0.0,
@@ -145,7 +145,7 @@
"square_size", 16.0,
NULL);
- g->mainlayer = gnome_canvas_item_new (GNOME_CANVAS_GROUP (root),
+ g->mainlayer = gnome_canvas_item_new (root,
ie_canvas_layer_get_type (),
"x", 0.0,
"y", 0.0,
@@ -156,7 +156,7 @@
"rowstride", gdk_pixbuf_get_rowstride
(view->model->model),
NULL);
- g->gridlines = gnome_canvas_item_new (GNOME_CANVAS_GROUP (root),
+ g->gridlines = gnome_canvas_item_new (root,
ie_canvas_grid_get_type (),
"x", 0.0,
"y", 0.0,
diff -urN orig.gnome-iconedit-1.2.0/src/widgets/ie-canvas-chequer-board.c
gnome-iconedit-1.2.0/src/widgets/ie-canvas-chequer-board.c
--- orig.gnome-iconedit-1.2.0/src/widgets/ie-canvas-chequer-board.c
2000-06-22 17:25:57.000000000 -0600
+++ gnome-iconedit-1.2.0/src/widgets/ie-canvas-chequer-board.c 2005-09-16
15:54:05.000000000 -0600
@@ -20,6 +20,7 @@
*/
#include <math.h>
+#include <string.h> /* for memset() */
#include "ie-canvas-chequer-board.h"
#include <libgnomeui/gnome-canvas-util.h>
diff -urN orig.gnome-iconedit-1.2.0/src/widgets/ie-model.c
gnome-iconedit-1.2.0/src/widgets/ie-model.c
--- orig.gnome-iconedit-1.2.0/src/widgets/ie-model.c 2000-07-07
11:41:12.000000000 -0600
+++ gnome-iconedit-1.2.0/src/widgets/ie-model.c 2005-09-16 15:54:05.000000000
-0600
@@ -3,6 +3,7 @@
Copyright (C) 1999 - Iain Holmes <[EMAIL PROTECTED]>
*/
+#include <string.h> /* for memset() and memcpy() */
#include <gtk/gtksignal.h>
#include "ie-model.h"
diff -urN orig.gnome-iconedit-1.2.0/src/widgets/ie-model.h
gnome-iconedit-1.2.0/src/widgets/ie-model.h
--- orig.gnome-iconedit-1.2.0/src/widgets/ie-model.h 2000-06-22
11:34:41.000000000 -0600
+++ gnome-iconedit-1.2.0/src/widgets/ie-model.h 2005-09-16 15:54:05.000000000
-0600
@@ -71,6 +71,10 @@
gint width,
gint height);
+const guchar*
+ie_model_get_pixel(IEModel *model,
+ guint x,
+ guint y);
#ifdef __cplusplus
}
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
