aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/opencv/opencv/debian/300_fix_segfault_in_window_gtk.diff
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/opencv/opencv/debian/300_fix_segfault_in_window_gtk.diff')
-rw-r--r--recipes/opencv/opencv/debian/300_fix_segfault_in_window_gtk.diff15
1 files changed, 15 insertions, 0 deletions
diff --git a/recipes/opencv/opencv/debian/300_fix_segfault_in_window_gtk.diff b/recipes/opencv/opencv/debian/300_fix_segfault_in_window_gtk.diff
new file mode 100644
index 0000000000..9391eec7ca
--- /dev/null
+++ b/recipes/opencv/opencv/debian/300_fix_segfault_in_window_gtk.diff
@@ -0,0 +1,15 @@
+--- opencv-1.0.0.orig/otherlibs/highgui/window_gtk.cpp
++++ opencv-1.0.0/otherlibs/highgui/window_gtk.cpp
+@@ -333,8 +333,10 @@
+ GDK_RGB_DITHER_MAX, image_widget->scaled_image->data.ptr, image_widget->scaled_image->step );
+ }
+ else if( image_widget->original_image ){
+- gdk_draw_rgb_image( widget->window, widget->style->fg_gc[GTK_STATE_NORMAL],
+- 0, 0, widget->allocation.width, widget->allocation.height,
++ gdk_draw_rgb_image( widget->window, widget->style->fg_gc[GTK_STATE_NORMAL],
++ 0, 0,
++ MIN(image_widget->original_image->cols, widget->allocation.width),
++ MIN(image_widget->original_image->rows, widget->allocation.height),
+ GDK_RGB_DITHER_MAX, image_widget->original_image->data.ptr, image_widget->original_image->step );
+ }
+ return TRUE;