Switch to explicit GL_CLAMP_TO_EDGE

[grits] / src / plugins / elev.c

diff --git a/src/plugins/elev.c b/src/plugins/elev.c
index 383c509097c2cff2a9157ec7a80664bb0ae306fd..765e970648c8903bca3725020cf6233d728294a8 100644 (file)
--- a/src/plugins/elev.c
+++ b/src/plugins/elev.c
@@ -26,7 +26,6 @@
  */
 
 #include <glib/gstdio.h>
-#include <GL/gl.h>
 
 #include <grits.h>
 
@@ -113,8 +112,8 @@ 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",
-                               len, TILE_SIZE);
+               g_warning("GritsPluginElev: _load_bil - unexpected tile size %ld, != %ld",
+                               (glong)len, (glong)TILE_SIZE);
                g_free(data);
                return NULL;
        }
@@ -162,8 +161,8 @@ static guint _load_opengl(GdkPixbuf *pixbuf)
                        (alpha ? GL_RGBA : GL_RGB), GL_UNSIGNED_BYTE, pixels);
        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
        g_debug("GritsPluginElev: load_opengl %d", opengl);
        return opengl;
@@ -301,7 +300,7 @@ GritsPluginElev *grits_plugin_elev_new(GritsViewer *viewer)
 
        /* Add renderers */
        if (LOAD_OPENGL)
-               grits_viewer_add(viewer, GRITS_OBJECT(elev->tiles), GRITS_LEVEL_WORLD, 0);
+               grits_viewer_add(viewer, GRITS_OBJECT(elev->tiles), GRITS_LEVEL_WORLD, FALSE);
 
        return elev;
 }