Merge pull request #9031 from huangqinjin:gtk

8 years ago · f6a33c4826
parent f1a56cb4b7 aa75b6067c
commit f6a33c4826
1 changed files with 4 additions and 2 deletions
--- a/modules/highgui/src/window_gtk.cpp
+++ b/modules/highgui/src/window_gtk.cpp
@ -951,7 +951,8 @@ static gboolean cvImageWidget_draw(GtkWidget* widget, cairo_t *cr, gpointer data
  }

  cairo_paint(cr);
-  g_object_unref(pixbuf);
+  if(pixbuf)
+      g_object_unref(pixbuf);
  return TRUE;
 }

@ -1005,7 +1006,8 @@ static gboolean cvImageWidget_expose(GtkWidget* widget, GdkEventExpose* event, g
  }

  cairo_paint(cr);
-  g_object_unref(pixbuf);
+  if(pixbuf)
+      g_object_unref(pixbuf);
  cairo_destroy(cr);
  return TRUE;
 }