merged the trunk r8719:8731 and 8807

2012-06-28 16:39:53 +00:00
parent 01570fa800
commit 3def843652
6 changed files with 25 additions and 15 deletions
--- a/modules/highgui/src/window_gtk.cpp
+++ b/modules/highgui/src/window_gtk.cpp
@@ -678,6 +678,8 @@ double cvGetOpenGlProp_GTK(const char* name)
    result = window->useGl;

    __END__;
+#else
+    (void)name;
 #endif

    return result;
@@ -1004,6 +1006,8 @@ static gboolean cvImageWidget_expose(GtkWidget* widget, GdkEventExpose* event, g
        drawGl(window);
        return TRUE;
    }
+#else
+    (void)data;
 #endif

  CvImageWidget *image_widget;