gimp r26770 - trunk/app/base

[neo svn gnome org]

Author: neo
Date: Tue Aug 26 07:41:53 2008
New Revision: 26770
URL: http://svn.gnome.org/viewvc/gimp?rev=26770&view=rev

Log:
more fiddling with the edges


Modified:
   trunk/app/base/pixel-surround.c

Modified: trunk/app/base/pixel-surround.c
==============================================================================
--- trunk/app/base/pixel-surround.c	(original)
+++ trunk/app/base/pixel-surround.c	Tue Aug 26 07:41:53 2008
@@ -75,6 +75,8 @@
   PixelSurround *surround;
 
   g_return_val_if_fail (tiles != NULL, NULL);
+  g_return_val_if_fail (width < TILE_WIDTH, NULL);
+  g_return_val_if_fail (height < TILE_WIDTH, NULL);
 
   surround = g_slice_new0 (PixelSurround);
 
@@ -331,78 +333,74 @@
       return tile_data_pointer (surround->tile, x, y);
     }
 
-  switch (surround->mode)
+  if (surround->mode == PIXEL_SURROUND_SMEAR)
     {
-    case PIXEL_SURROUND_SMEAR:
-      {
-        const guchar *edata;
-        gint          ex = x;
-        gint          ey = y;
-        gint          estride;
-        gint          ecode = 0;
-
-        if (ex < 0)
-          {
-            ex = 0;
-            ecode |= LEFT;
-          }
-        else if (ex > surround->xmax)
-          {
-            ex = surround->xmax;
-            ecode |= RIGHT;
-          }
-
-        if (ey < 0)
-          {
-            ey = 0;
-            ecode |= TOP;
-          }
-        else if (ey > surround->ymax)
-          {
-            ey = surround->ymax;
-            ecode |= BOTTOM;
-          }
-
-        /*  call ourselves with corrected coordinates  */
-        edata = pixel_surround_get_data (surround, ex, ey, w, h, &estride);
-
-        /*  fill the virtual background tile  */
-        switch (ecode)
-          {
-          case (TOP | LEFT):
-          case (TOP | RIGHT):
-          case (BOTTOM | LEFT):
-          case (BOTTOM | RIGHT):
-            pixel_surround_set_bg (surround, edata);
-            break;
-
-          case (TOP):
-          case (BOTTOM):
-            pixel_surround_fill_row (surround, edata, *w);
-            break;
-
-          case (LEFT):
-          case (RIGHT):
-            pixel_surround_fill_col (surround, edata, estride, *h);
-            break;
-          }
-      }
-      break;
-
-    case PIXEL_SURROUND_BACKGROUND:
-      if (x < 0)
-        *w = MIN (- x, surround->w);
-      else
-        *w = surround->w;
-      if (y < 0)
-        *h = MIN (- y, surround->h);
-      else
-        *h = surround->h;
-      break;
+      const guchar *edata;
+      gint          ex = x;
+      gint          ey = y;
+      gint          ew, eh;
+      gint          estride;
+      gint          ecode = 0;
+
+      if (ex < 0)
+        {
+          ex = 0;
+          ecode |= LEFT;
+        }
+      else if (ex > surround->xmax)
+        {
+          ex = surround->xmax;
+          ecode |= RIGHT;
+        }
+
+      if (ey < 0)
+        {
+          ey = 0;
+          ecode |= TOP;
+        }
+      else if (ey > surround->ymax)
+        {
+          ey = surround->ymax;
+          ecode |= BOTTOM;
+        }
+
+      /*  call ourselves with corrected coordinates  */
+      edata = pixel_surround_get_data (surround, ex, ey, &ew, &eh, &estride);
+
+      /*  fill the virtual background tile  */
+      switch (ecode)
+        {
+        case (TOP | LEFT):
+        case (TOP | RIGHT):
+        case (BOTTOM | LEFT):
+        case (BOTTOM | RIGHT):
+          pixel_surround_set_bg (surround, edata);
+          break;
+
+        case (TOP):
+        case (BOTTOM):
+          pixel_surround_fill_row (surround, edata, ew);
+          break;
+
+        case (LEFT):
+        case (RIGHT):
+          pixel_surround_fill_col (surround, edata, estride, eh);
+          break;
+        }
     }
 
   /*   return a pointer to the virtual background tile  */
 
+  if (x < 0)
+    *w = MIN (- x, surround->w);
+  else
+    *w = surround->w;
+
+  if (y < 0)
+    *h = MIN (- y, surround->h);
+  else
+    *h = surround->h;
+
   *rowstride = surround->rowstride;
 
   return surround->bg;