gimp r26148 - in trunk: . app/display

[martinn svn gnome org]

Author: martinn
Date: Sat Jul 12 07:14:22 2008
New Revision: 26148
URL: http://svn.gnome.org/viewvc/gimp?rev=26148&view=rev

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

	* app/display/gimpdisplayshell-scale.c
	(gimp_display_shell_scale_setup): Renamed the variables sx and sy
	to sw and sh.


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

Modified: trunk/app/display/gimpdisplayshell-scale.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-scale.c	(original)
+++ trunk/app/display/gimpdisplayshell-scale.c	Sat Jul 12 07:14:22 2008
@@ -89,7 +89,7 @@
 gimp_display_shell_scale_setup (GimpDisplayShell *shell)
 {
   GimpImage *image;
-  gfloat     sx, sy;
+  gfloat     sw, sh;
   gint       image_width;
   gint       image_height;
   gint       offset_x;
@@ -107,29 +107,29 @@
       image_width  = gimp_image_get_width  (image);
       image_height = gimp_image_get_height (image);
 
-      sx = SCALEX (shell, image_width);
-      sy = SCALEY (shell, image_height);
+      sw = SCALEX (shell, image_width);
+      sh = SCALEY (shell, image_height);
     }
   else
     {
       image_width  = shell->disp_width;
       image_height = shell->disp_height;
 
-      sx = image_width;
-      sy = image_height;
+      sw = image_width;
+      sh = image_height;
     }
 
   gimp_display_shell_get_render_start_offset (shell, &offset_x, &offset_y);
 
   shell->hsbdata->value          = offset_x;
-  shell->hsbdata->upper          = sx;
-  shell->hsbdata->page_size      = MIN (sx, shell->disp_width);
+  shell->hsbdata->upper          = sw;
+  shell->hsbdata->page_size      = MIN (sw, shell->disp_width);
   shell->hsbdata->page_increment = shell->disp_width / 2;
   shell->hsbdata->step_increment = shell->scale_x;
 
   shell->vsbdata->value          = offset_y;
-  shell->vsbdata->upper          = sy;
-  shell->vsbdata->page_size      = MIN (sy, shell->disp_height);
+  shell->vsbdata->upper          = sh;
+  shell->vsbdata->page_size      = MIN (sh, shell->disp_height);
   shell->vsbdata->page_increment = shell->disp_height / 2;
   shell->vsbdata->step_increment = shell->scale_y;