From: Andy Spencer <andy753421@gmail.com>
Date: Wed, 11 Nov 2009 07:11:45 +0000 (+0000)
Subject: Revert problems with the win32 build
X-Git-Tag: v0.4~155
X-Git-Url: http://pileus.org/git/?p=grits;a=commitdiff_plain;h=ff8ceb895f1519634578433c13e685ed96402f1e

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 866eac8..31e1f39 100644
--- 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 32bed7b..efd9218 100644
--- 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 5f29aa0..370fa20 100644
--- 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 ad3eff3..e4460fe 100644
--- 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;