Fix 64-bit warnings

diff --git a/src/grits-opengl.c b/src/grits-opengl.c
index b51e767cc8bfe1c6a6dd59b18d3bc1d7e616519a..59fea09edccd9443b5bb1a25dc47aa29bf20d668 100644 (file)
--- a/src/grits-opengl.c
+++ b/src/grits-opengl.c
@@ -182,7 +182,7 @@ static gboolean on_configure(GritsOpenGL *opengl, GdkEventConfigure *event, gpoi
 
 static gboolean _draw_level(gpointer key, gpointer value, gpointer user_data)
 {
-       g_debug("GritsOpenGL: _draw_level - level=%-4d", (int)key);
+       g_debug("GritsOpenGL: _draw_level - level=%-4ld", (glong)key);
        GritsOpenGL *opengl = user_data;
        struct RenderLevel *level = value;
        int nsorted = 0, nunsorted = 0;
@@ -489,10 +489,10 @@ static gpointer grits_opengl_add(GritsViewer *_opengl, GritsObject *object,
        g_assert(GRITS_IS_OPENGL(_opengl));
        GritsOpenGL *opengl = GRITS_OPENGL(_opengl);
        g_mutex_lock(opengl->objects_lock);
-       struct RenderLevel *level = g_tree_lookup(opengl->objects, (gpointer)key);
+       struct RenderLevel *level = g_tree_lookup(opengl->objects, (gpointer)(gintptr)key);
        if (!level) {
                level = g_new0(struct RenderLevel, 1);
-               g_tree_insert(opengl->objects, (gpointer)key, level);
+               g_tree_insert(opengl->objects, (gpointer)(gintptr)key, level);
        }
        GList *list = sort ? &level->sorted : &level->unsorted;
        /* Put the link in the list */
@@ -530,7 +530,7 @@ static GritsObject *grits_opengl_remove(GritsViewer *_opengl, GritsObject *objec
  ****************/
 static int _objects_cmp(gconstpointer _a, gconstpointer _b, gpointer _)
 {
-       gint a = (int)_a, b = (int)_b;
+       gintptr a = (gintptr)_a, b = (gintptr)_b;
        return a < b ? -1 :
               a > b ?  1 : 0;
 }

diff --git a/src/objects/grits-poly.c b/src/objects/grits-poly.c
index 2b62997e249c7a85ba5d6998dda27e46e0ed71b2..67dca9a9156302f1fe84c83f55c376dfc0529d60 100644 (file)
--- a/src/objects/grits-poly.c
+++ b/src/objects/grits-poly.c
@@ -153,7 +153,7 @@ static void grits_poly_pick(GritsObject *_poly, GritsOpenGL *opengl)
 
 static gboolean grits_poly_delete(gpointer list)
 {
-       glDeleteLists((guint)list, 1);
+       glDeleteLists((guintptr)list, 1);
        return FALSE;
 }
 
@@ -242,8 +242,8 @@ static void grits_poly_finalize(GObject *_poly)
 {
        //g_debug("GritsPoly: finalize");
        GritsPoly *poly = GRITS_POLY(_poly);
-       if (poly->list[0]) g_idle_add(grits_poly_delete, (gpointer)poly->list[0]);
-       if (poly->list[1]) g_idle_add(grits_poly_delete, (gpointer)poly->list[1]);
+       if (poly->list[0]) g_idle_add(grits_poly_delete, (gpointer)(guintptr)poly->list[0]);
+       if (poly->list[1]) g_idle_add(grits_poly_delete, (gpointer)(guintptr)poly->list[1]);
 }
 
 static void grits_poly_class_init(GritsPolyClass *klass)

diff --git a/src/plugins/elev.c b/src/plugins/elev.c
index 383c509097c2cff2a9157ec7a80664bb0ae306fd..7e4509f57e3182884bb83f7d7a1e19a8160a530b 100644 (file)
--- a/src/plugins/elev.c
+++ b/src/plugins/elev.c
@@ -113,7 +113,7 @@ static guint16 *_load_bil(gchar *path)
        g_file_get_contents(path, &data, &len, NULL);
        g_debug("GritsPluginElev: load_bil %p", data);
        if (len != TILE_SIZE) {
-               g_warning("GritsPluginElev: _load_bil - unexpected tile size %d, != %d",
+               g_warning("GritsPluginElev: _load_bil - unexpected tile size %ld, != %ld",
                                len, TILE_SIZE);
                g_free(data);
                return NULL;

diff --git a/src/tile-test.c b/src/tile-test.c
index a800b9c750117212d580785ad0512f422d0ddcf4..0aeafbdf1cf68f50f442782431b595821a7252cc 100644 (file)
--- a/src/tile-test.c
+++ b/src/tile-test.c
@@ -32,7 +32,7 @@ struct CacheState {
 void chunk_callback(gsize cur, gsize total, gpointer _state)
 {
        struct CacheState *state = _state;
-       g_message("chunk_callback: %d/%d", cur, total);
+       g_message("chunk_callback: %ld/%ld", cur, total);
 
        if (state->progress == NULL) {
                state->progress = gtk_progress_bar_new();