Revert problems with the win32 build

* Revert texture params for srtm/bmng
* Remove gdk_threads enter/leave from GisOpeng

diff --git a/src/gis-opengl.c b/src/gis-opengl.c
index 866eac8c15f67e6dc7ec89a557c11ee8e645ff27..31e1f393ca14906ac813a90700acfbf2270d3896 100644 (file)
--- a/src/gis-opengl.c
+++ b/src/gis-opengl.c
@@ -399,8 +399,6 @@ void gis_opengl_begin(GisOpenGL *self)
 {
        g_assert(GIS_IS_OPENGL(self));
 
-       gdk_threads_enter();
-
        GdkGLContext   *glcontext  = gtk_widget_get_gl_context(GTK_WIDGET(self));
        GdkGLDrawable  *gldrawable = gtk_widget_get_gl_drawable(GTK_WIDGET(self));
 
@@ -412,7 +410,6 @@ void gis_opengl_end(GisOpenGL *self)
        g_assert(GIS_IS_OPENGL(self));
        GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(GTK_WIDGET(self));
        gdk_gl_drawable_gl_end(gldrawable);
-       gdk_threads_leave();
 }
 void gis_opengl_flush(GisOpenGL *self)
 {

diff --git a/src/gis_test.c b/src/gis_test.c
index 32bed7b3990639e804c5bfa9d19a0c19e22fa770..efd9218d0f3613f8ae05774315ff9b01d0fd83db 100644 (file)
--- a/src/gis_test.c
+++ b/src/gis_test.c
@@ -60,7 +60,7 @@ int main(int argc, char **argv)
        gdk_threads_leave();
 
        gis_plugins_load(plugins, "bmng", world, view, opengl, prefs);
-       //gis_plugins_load(plugins, "srtm", world, view, opengl, prefs);
+       gis_plugins_load(plugins, "srtm", world, view, opengl, prefs);
 
        gis_view_set_site(view, "KLSX");
 

diff --git a/src/plugins/bmng.c b/src/plugins/bmng.c
index 5f29aa0a286825355e0a9298b4e1ab138c026693..370fa2072b43b44d37e0ac64648c7374558ea82f 100644 (file)
--- a/src/plugins/bmng.c
+++ b/src/plugins/bmng.c
@@ -57,8 +57,8 @@ static gboolean _load_tile_cb(gpointer _data)
                        (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_TO_BORDER);
-       //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
        glFlush();
        gis_opengl_end(self->opengl);
 

diff --git a/src/plugins/srtm.c b/src/plugins/srtm.c
index ad3eff30e930c225105ef21757d96a25c437a4a5..e4460fe9d2e2e3338f6dd8f4ca7386670ce6e430 100644 (file)
--- a/src/plugins/srtm.c
+++ b/src/plugins/srtm.c
@@ -141,8 +141,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_TO_BORDER);
-       //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
 
        g_debug("GisPluginSrtm: load_opengl %d", opengl);
        return opengl;