Merge pull request #9031 from huangqinjin:gtk

f6a33c48 · Maksim Shabunin · f1a56cb4 · aa75b606 · f6a33c48
Commit f6a33c48 authored Jun 29, 2017 by Maksim Shabunin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

window_gtk.cpp modules/highgui/src/window_gtk.cpp +4 -2

No files found.
--- 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;
 }