[PHP-CVS] cvs: php-src /ext/gd/libgd gd.c

[Pierre-Alain Joye]

pajoye          Sun Jun 17 17:14:02 2007 UTC

  Modified files:              
    /php-src/ext/gd/libgd       gd.c 
  Log:
  - Re commit "sync with libgd: improve _gdImageFillTiled()", I reverted 
    it in my previous commit
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.c?r1=1.109&r2=1.110&diff_format=u
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.109 php-src/ext/gd/libgd/gd.c:1.110
--- php-src/ext/gd/libgd/gd.c:1.109     Sun Jun 17 17:12:46 2007
+++ php-src/ext/gd/libgd/gd.c   Sun Jun 17 17:14:02 2007
@@ -1943,7 +1943,7 @@
 #define FILL_POP(Y, XL, XR, DY) \
     {sp--; Y = sp->y+(DY = sp->dy); XL = sp->xl; XR = sp->xr;}
 
-void _gdImageFillTiled(gdImagePtr im, int x, int y, int nc);
+static void _gdImageFillTiled(gdImagePtr im, int x, int y, int nc);
 
 void gdImageFill(gdImagePtr im, int x, int y, int nc)
 {
@@ -2044,16 +2044,16 @@
        im->alphaBlendingFlag = alphablending_bak;      
 }
 
-void _gdImageFillTiled(gdImagePtr im, int x, int y, int nc)
+static void _gdImageFillTiled(gdImagePtr im, int x, int y, int nc)
 {
-       int i,l, x1, x2, dy;
+       int l, x1, x2, dy;
        int oc;   /* old pixel value */
        int tiled;
        int wx2,wy2;
        /* stack of filled segments */
        struct seg *stack;
        struct seg *sp;
-       char **pts;
+       char *pts;
 
        if (!im->tile) {
                return;
@@ -2063,11 +2063,7 @@
        tiled = nc==gdTiled;
 
        nc =  gdImageTileGet(im,x,y);
-       pts = (char **) ecalloc(im->sy, sizeof(char*));
-
-       for (i=0; i<im->sy;i++) {
-               pts[i] = (char *) ecalloc(im->sx, sizeof(char));
-       }
+       pts = (char *) ecalloc(im->sy * im->sx, sizeof(char));
 
        stack = (struct seg *)safe_emalloc(sizeof(struct seg), 
((int)(im->sy*im->sx)/4), 1);
        sp = stack;
@@ -2080,9 +2076,9 @@
        FILL_PUSH(y+1, x, x, -1);
        while (sp>stack) {
                FILL_POP(y, x1, x2, dy);
-               for (x=x1; x>=0 && (!pts[y][x] && gdImageGetPixel(im,x,y)==oc); 
x--) {
+               for (x=x1; x>=0 && (!pts[y + x*wx2] && 
gdImageGetPixel(im,x,y)==oc); x--) {
                        nc = gdImageTileGet(im,x,y);
-                       pts[y][x]=1;
+                       pts[y + x*wx2]=1;
                        gdImageSetPixel(im,x, y, nc);
                }
                if (x>=x1) {
@@ -2096,9 +2092,9 @@
                }
                x = x1+1;
                do {
-                       for (; x<wx2 && (!pts[y][x] && gdImageGetPixel(im,x, 
y)==oc) ; x++) {
+                       for (; x<wx2 && (!pts[y + x*wx2] && 
gdImageGetPixel(im,x, y)==oc) ; x++) {
                                nc = gdImageTileGet(im,x,y);
-                               pts[y][x]=1;
+                               pts[y + x*wx2]=1;
                                gdImageSetPixel(im, x, y, nc);
                        }
                        FILL_PUSH(y, l, x-1, dy);
@@ -2106,13 +2102,11 @@
                        if (x>x2+1) {
                                FILL_PUSH(y, x2+1, x-1, -dy);
                        }
-skip:                  for (x++; x<=x2 && (pts[y][x] || gdImageGetPixel(im,x, 
y)!=oc); x++);
+skip:                  for (x++; x<=x2 && (pts[y + x*wx2] || 
gdImageGetPixel(im,x, y)!=oc); x++);
                        l = x;
                } while (x<=x2);
        }
-       for (i=0; i<im->sy;i++) {
-               efree(pts[i]);
-       }
+
        efree(pts);
        efree(stack);
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php