gimp r26070 - in trunk: . app/display

[martinn svn gnome org]

Author: martinn
Date: Sat Jul  5 15:43:39 2008
New Revision: 26070
URL: http://svn.gnome.org/viewvc/gimp?rev=26070&view=rev

Log:
2008-07-05  Martin Nordholts  <martinn svn gnome org>

	* app/display/gimpdisplayshell-scroll.c
	(gimp_display_shell_scroll_clamp_offsets): Renamed the variales sx
	and sy to sw and sh.


Modified:
   trunk/ChangeLog
   trunk/app/display/gimpdisplayshell-scroll.c

Modified: trunk/app/display/gimpdisplayshell-scroll.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-scroll.c	(original)
+++ trunk/app/display/gimpdisplayshell-scroll.c	Sat Jul  5 15:43:39 2008
@@ -94,16 +94,16 @@
 
   if (shell->display->image)
     {
-      gint sx, sy;
+      gint sw, sh;
 
-      sx = SCALEX (shell, gimp_image_get_width  (shell->display->image));
-      sy = SCALEY (shell, gimp_image_get_height (shell->display->image));
+      sw = SCALEX (shell, gimp_image_get_width  (shell->display->image));
+      sh = SCALEY (shell, gimp_image_get_height (shell->display->image));
 
       shell->offset_x = CLAMP (shell->offset_x, 0,
-                               MAX (sx - shell->disp_width, 0));
+                               MAX (sw - shell->disp_width, 0));
 
       shell->offset_y = CLAMP (shell->offset_y, 0,
-                               MAX (sy - shell->disp_height, 0));
+                               MAX (sh - shell->disp_height, 0));
     }
   else
     {