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

[Pierre-Alain Joye]

pajoye          Tue Jul  7 10:54:44 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/gd/libgd       gd.c 
  Log:
  - WS
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.c?r1=1.90.2.1.2.21.2.14&r2=1.90.2.1.2.21.2.15&diff_format=u
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.90.2.1.2.21.2.14 
php-src/ext/gd/libgd/gd.c:1.90.2.1.2.21.2.15
--- php-src/ext/gd/libgd/gd.c:1.90.2.1.2.21.2.14        Tue Jul  7 10:49:38 2009
+++ php-src/ext/gd/libgd/gd.c   Tue Jul  7 10:54:44 2009
@@ -1093,8 +1093,7 @@
        int w, wstart;
        int thick = im->thick;
 
-       if (color == gdAntiAliased)
-       {
+       if (color == gdAntiAliased) {
                /* 
                   gdAntiAliased passed as color: use the much faster, much 
cheaper
                   and equally attractive gdImageAALine implementation. That
@@ -1191,7 +1190,7 @@
        } else {
                /* More-or-less vertical. use wid for horizontal stroke */
                /* 2.0.12: Michael Schwartz: divide rather than multiply;
-           TBB: but watch out for /0! */
+                  TBB: but watch out for /0! */
                double as = sin (atan2 (dy, dx));
                if (as != 0) {
                        wid = thick / as;
@@ -1681,27 +1680,26 @@
 
     if ((s % 360)  == (e % 360)) {
                s = 0; e = 360;
-    } else {
-        if (s > 360) {
-            s = s % 360;
-        }
-
-        if (e > 360) {
-            e = e % 360;
-        }
-
-        while (s < 0) {
-            s += 360;
-        }
-
-        while (e < s) {
-            e += 360;
-        }
+       } else {
+               if (s > 360) {
+                       s = s % 360;
+               }
+
+               if (e > 360) {
+                       e = e % 360;
+               }
+
+               while (s < 0) {
+                       s += 360;
+               }
 
-        if (s == e) {
+               while (e < s) {
+                       e += 360;
+               }
+               if (s == e) {
                        s = 0; e = 360;
-        }
-    }
+               }
+       }
 
        for (i = s; i <= e; i++) {
                int x, y;
@@ -1987,7 +1985,7 @@
 
        oc = gdImageGetPixel(im, x, y);
 
-/* required! */
+       /* required! */
        FILL_PUSH(y,x,x,1);
        /* seed segment (popped 1st) */
        FILL_PUSH(y+1, x, x, -1);
@@ -2308,7 +2306,6 @@
                for (x = srcX; (x < (srcX + w)); x++) {
                        int nc;
                        c = gdImageGetPixel (src, x, y);
-
                        /* Added 7/24/95: support transparent copies */
                        if (gdImageGetTransparent(src) == c) {
                                tox++;



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