[198/906] add fxtest vs8 project

diff --git a/gst/gl/gstgldifferencematte.c b/gst/gl/gstgldifferencematte.c
index 6abf6e3..a291fe6 100644 (file)
--- a/gst/gl/gstgldifferencematte.c
+++ b/gst/gl/gstgldifferencematte.c
@@ -194,11 +194,11 @@ gst_gl_differencematte_draw_texture (GstGLDifferenceMatte * differencematte, GLu
 
   glTexCoord2f (0.0, 0.0);
   glVertex2f (-1.0, -1.0);
-  glTexCoord2f (filter->width, 0.0);
+  glTexCoord2f ((gfloat)filter->width, 0.0);
   glVertex2f (1.0, -1.0);
-  glTexCoord2f (filter->width, filter->height);
+  glTexCoord2f ((gfloat)filter->width, (gfloat)filter->height);
   glVertex2f (1.0, 1.0);
-  glTexCoord2f (0.0, filter->height);
+  glTexCoord2f (0.0, (gfloat)filter->height);
   glVertex2f (-1.0, 1.0);
 
   glEnd ();
@@ -333,9 +333,9 @@ gst_gl_differencematte_hblur (gint width, gint height, guint texture, gpointer s
 {
   GstGLDifferenceMatte* differencematte = GST_GL_DIFFERENCEMATTE (stuff);
   gfloat gauss_kernel[9] = { 
-    0.026995, 0.064759, 0.120985,
-    0.176033, 0.199471, 0.176033,
-    0.120985, 0.064759, 0.026995
+    0.026995f, 0.064759f, 0.120985f,
+    0.176033f, 0.199471f, 0.176033f,
+    0.120985f, 0.064759f, 0.026995f
   };
   
   glMatrixMode (GL_PROJECTION);
@@ -362,9 +362,9 @@ gst_gl_differencematte_vblur (gint width, gint height, guint texture, gpointer s
 {
   GstGLDifferenceMatte* differencematte = GST_GL_DIFFERENCEMATTE (stuff);
   gfloat gauss_kernel[9] = { 
-    0.026995, 0.064759, 0.120985,
-    0.176033, 0.199471, 0.176033,
-    0.120985, 0.064759, 0.026995
+    0.026995f, 0.064759f, 0.120985f,
+    0.176033f, 0.199471f, 0.176033f,
+    0.120985f, 0.064759f, 0.026995f
   };
   
   glMatrixMode (GL_PROJECTION);

diff --git a/tests/examples/gtk/fxtest/fxtest.c b/tests/examples/gtk/fxtest/fxtest.c
index aedb0a0..f3c2bfa 100644 (file)
--- a/tests/examples/gtk/fxtest/fxtest.c
+++ b/tests/examples/gtk/fxtest/fxtest.c
@@ -2,7 +2,13 @@
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+
+#ifdef WIN32
+#include <gdk/gdkwin32.h>
+#else
 #include <gdk/gdkx.h>
+#endif
+
 #include <gst/interfaces/xoverlay.h>
 
 
@@ -13,7 +19,12 @@ expose_cb (GtkWidget * widget, GdkEventExpose * event, gpointer data)
   GstXOverlay *overlay =
     GST_X_OVERLAY (gst_bin_get_by_interface (GST_BIN (data),
                                              GST_TYPE_X_OVERLAY));
+#ifdef WIN32
+  gst_x_overlay_set_xwindow_id (overlay, (gulong)GDK_WINDOW_HWND(widget->window));
+#else
   gst_x_overlay_set_xwindow_id (overlay, GDK_WINDOW_XWINDOW (widget->window));
+#endif
+
   return FALSE;
 }
 

diff --git a/tests/examples/gtk/fxtest/pixbufdrop.c b/tests/examples/gtk/fxtest/pixbufdrop.c
index df99dfa..33f3485 100644 (file)
--- a/tests/examples/gtk/fxtest/pixbufdrop.c
+++ b/tests/examples/gtk/fxtest/pixbufdrop.c
@@ -2,7 +2,13 @@
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+
+#ifdef WIN32
+#include <gdk/gdkwin32.h>
+#else
 #include <gdk/gdkx.h>
+#endif
+
 #include <gst/interfaces/xoverlay.h>
 
 static gint delay = 0;