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

[Pierre-Alain Joye]

pajoye          Wed Jul  9 06:38:22 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/ext/gd/libgd       gd.c 
  Log:
  - MFH
  
  
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.24.2.16 php-src/ext/gd/libgd/gd.c:1.24.2.17
--- php-src/ext/gd/libgd/gd.c:1.24.2.16 Wed Jul  2 07:33:35 2003
+++ php-src/ext/gd/libgd/gd.c   Wed Jul  9 06:38:22 2003
@@ -2547,7 +2547,7 @@
                dst = gdImageCreate (src->sy, src->sx);
                f = gdImageGetPixel;
        }
-
+       dst = gdImageCreateTrueColor(src->sy, src->sx);
        if (dst != NULL) {
                gdImagePaletteCopy (dst, src);
                
@@ -2572,13 +2572,11 @@
        FuncPtr f;
 
        if (src->trueColor) {
-               dst = gdImageCreateTrueColor ( src->sx,src->sy);
                f = gdImageGetTrueColorPixel;
        } else {
-               dst = gdImageCreate (src->sx, src->sy);
                f = gdImageGetPixel;
        }
-
+       dst = gdImageCreateTrueColor(src->sx, src->sy);
        if (dst != NULL) {
                gdImagePaletteCopy (dst, src);
                
@@ -2603,12 +2601,11 @@
        FuncPtr f;
 
        if (src->trueColor) {
-               dst = gdImageCreateTrueColor (src->sy, src->sx);
                f = gdImageGetTrueColorPixel;
        } else {
-               dst = gdImageCreate (src->sy, src->sx);
                f = gdImageGetPixel;
        }
+       dst = gdImageCreateTrueColor(src->sy, src->sx);
 
        if (dst != NULL) {
                gdImagePaletteCopy (dst, src);
@@ -2643,12 +2640,11 @@
 
        /* 1st shear */
        if (src->trueColor) {
-               dst1 = gdImageCreateTrueColor (newx, newy);
                f = gdImageGetTrueColorPixel;
        } else {
-               dst1 = gdImageCreate (newx, newy);
                f = gdImageGetPixel;
        }
+       dst1 = gdImageCreateTrueColor(newx, newy);
 
        /******* Perform 1st shear (horizontal) ******/
        if (dst1 == NULL) {
@@ -2749,6 +2745,11 @@
        if (src == NULL) {
                return NULL;
        }
+
+       if (!gdImageTrueColor(src) && clrBack>=gdImageColorsTotal(src)) {
+               return NULL;
+       }
+
 
        while (dAngle >= 360.0) {
                dAngle -= 360.0;



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