gimp r27697 - in trunk: . app/core app/display

[neo svn gnome org]

Author: neo
Date: Fri Nov 21 17:59:04 2008
New Revision: 27697
URL: http://svn.gnome.org/viewvc/gimp?rev=27697&view=rev

Log:
2008-11-21  Sven Neumann  <sven gimp org>

	* app/core/gimpprojection.c (gimp_projection_get_tiles_at_level)
	cosmetics.

	* app/display/gimpdisplayshell-render.[ch]: added const 
qualifier.



Modified:
   trunk/ChangeLog
   trunk/app/core/gimpprojection.c
   trunk/app/display/gimpdisplayshell-render.c
   trunk/app/display/gimpdisplayshell-render.h

Modified: trunk/app/core/gimpprojection.c
==============================================================================
--- trunk/app/core/gimpprojection.c	(original)
+++ trunk/app/core/gimpprojection.c	Fri Nov 21 17:59:04 2008
@@ -412,12 +412,14 @@
 
   if (! proj->pyramid)
     {
-      gint width, height;
+      GimpImageType type;
+      gint          width;
+      gint          height;
 
+      type = gimp_projection_get_image_type (GIMP_PICKABLE (proj));
       gimp_projectable_get_size (proj->projectable, &width, &height);
 
-      proj->pyramid = tile_pyramid_new (gimp_projection_get_image_type (GIMP_PICKABLE (proj)),
-                                        width, height);
+      proj->pyramid = tile_pyramid_new (type, width, height);
 
       tile_pyramid_set_validate_proc (proj->pyramid,
                                       (TileValidateProc) gimp_projection_validate_tile,

Modified: trunk/app/display/gimpdisplayshell-render.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-render.c	(original)
+++ trunk/app/display/gimpdisplayshell-render.c	Fri Nov 21 17:59:04 2008
@@ -202,7 +202,7 @@
                                                   gint                    y,
                                                   gint                    w,
                                                   gint                    h,
-                                                  GdkRectangle           *highlight);
+                                                  const GdkRectangle     *highlight);
 static void  gimp_display_shell_render_mask      (const GimpDisplayShell *shell,
                                                   RenderInfo             *info);
 
@@ -220,7 +220,7 @@
                            gint                    y,
                            gint                    w,
                            gint                    h,
-                           GdkRectangle           *highlight)
+                           const GdkRectangle     *highlight)
 {
   GimpProjection *projection;
   GimpImage      *image;
@@ -236,7 +236,8 @@
 
   projection = gimp_image_get_projection (image);
 
-  gimp_display_shell_scroll_get_render_start_offset (shell, &offset_x, &offset_y);
+  gimp_display_shell_scroll_get_render_start_offset (shell,
+						     &offset_x, &offset_y);
 
   /* Initialize RenderInfo with values that don't change during the
    * call of this function.
@@ -322,15 +323,18 @@
     gint disp_xoffset, disp_yoffset;
     gint offset_x, offset_y;
 
-    gimp_display_shell_scroll_get_disp_offset (shell, &disp_xoffset, &disp_yoffset);
-    gimp_display_shell_scroll_get_render_start_offset (shell, &offset_x, &offset_y);
-
-    gimp_canvas_draw_rgb (GIMP_CANVAS (shell->canvas), GIMP_CANVAS_STYLE_RENDER,
-                        x + disp_xoffset, y + disp_yoffset,
-                        w, h,
-                        shell->render_buf,
-                        3 * GIMP_DISPLAY_RENDER_BUF_WIDTH,
-                        offset_x, offset_y);
+    gimp_display_shell_scroll_get_disp_offset (shell,
+					       &disp_xoffset, &disp_yoffset);
+    gimp_display_shell_scroll_get_render_start_offset (shell,
+						       &offset_x, &offset_y);
+
+    gimp_canvas_draw_rgb (GIMP_CANVAS (shell->canvas),
+			  GIMP_CANVAS_STYLE_RENDER,
+			  x + disp_xoffset, y + disp_yoffset,
+			  w, h,
+			  shell->render_buf,
+			  3 * GIMP_DISPLAY_RENDER_BUF_WIDTH,
+			  offset_x, offset_y);
   }
 }
 
@@ -350,14 +354,15 @@
                                      gint                    y,
                                      gint                    w,
                                      gint                    h,
-                                     GdkRectangle           *highlight)
+                                     const GdkRectangle     *highlight)
 {
   guchar       *buf  = shell->render_buf;
   GdkRectangle  rect;
   gint          offset_x;
   gint          offset_y;
 
-  gimp_display_shell_scroll_get_render_start_offset (shell, &offset_x, &offset_y);
+  gimp_display_shell_scroll_get_render_start_offset (shell,
+						     &offset_x, &offset_y);
 
   rect.x      = x + offset_x;
   rect.y      = y + offset_y;

Modified: trunk/app/display/gimpdisplayshell-render.h
==============================================================================
--- trunk/app/display/gimpdisplayshell-render.h	(original)
+++ trunk/app/display/gimpdisplayshell-render.h	Fri Nov 21 17:59:04 2008
@@ -28,7 +28,7 @@
                                        gint                    y,
                                        gint                    w,
                                        gint                    h,
-                                       GdkRectangle           *highlight);
+                                       const GdkRectangle     *highlight);
 
 
 #endif  /*  __GIMP_DISPLAY_SHELL_RENDER_H__  */