Merge pull request opencv#9031 from huangqinjin:gtk

mshabunin · mshabunin · commit f6a33c4826ad · 2017-06-29T07:59:56.000Z
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -951,7 +951,8 @@ static gboolean cvImageWidget_draw(GtkWidget* widget, cairo_t *cr, gpointer data`
`951`	`951`	`}`
`952`	`952`
`953`	`953`	`cairo_paint(cr);`
`954`		`- g_object_unref(pixbuf);`
	`954`	`+ if(pixbuf)`
	`955`	`+ g_object_unref(pixbuf);`
`955`	`956`	`return TRUE;`
`956`	`957`	`}`
`957`	`958`
`@@ -1005,7 +1006,8 @@ static gboolean cvImageWidget_expose(GtkWidget* widget, GdkEventExpose* event, g`
`1005`	`1006`	`}`
`1006`	`1007`
`1007`	`1008`	`cairo_paint(cr);`
`1008`		`- g_object_unref(pixbuf);`
	`1009`	`+ if(pixbuf)`
	`1010`	`+ g_object_unref(pixbuf);`
`1009`	`1011`	`cairo_destroy(cr);`
`1010`	`1012`	`return TRUE;`
`1011`	`1013`	`}`