gimp r28143 - in branches/gimp-2-6: . app/display

[neo svn gnome org]

Author: neo
Date: Thu Mar 12 19:32:00 2009
New Revision: 28143
URL: http://svn.gnome.org/viewvc/gimp?rev=28143&view=rev

Log:
2009-03-12  Sven Neumann  <sven gimp org>

	Merged from trunk:

	Bug 573070 â crash when working with 1x3200 pixel image

	* app/display/gimpdisplayshell.c 
(gimp_display_shell_scale_changed):
	make sure that x_src_dec and y_src_dec never become zero.



Modified:
   branches/gimp-2-6/ChangeLog
   branches/gimp-2-6/app/display/gimpdisplayshell.c

Modified: branches/gimp-2-6/app/display/gimpdisplayshell.c
==============================================================================
--- branches/gimp-2-6/app/display/gimpdisplayshell.c	(original)
+++ branches/gimp-2-6/app/display/gimpdisplayshell.c	Thu Mar 12 19:32:00 2009
@@ -1459,6 +1459,12 @@
       shell->y_dest_inc = gimp_image_get_height (image);
       shell->x_src_dec  = SCALEX (shell, gimp_image_get_width  (image));
       shell->y_src_dec  = SCALEY (shell, gimp_image_get_height (image));
+
+      if (shell->x_src_dec < 1)
+        shell->x_src_dec = 1;
+
+      if (shell->y_src_dec < 1)
+        shell->y_src_dec = 1;
     }
   else
     {