iliaa Mon Oct 28 20:15:44 2002 EDT
Modified files:
/php4/ext/gd gd.c php_gd.h
/php4/ext/gd/libgd gd.c gd.h
Log:
Added a patch by Pierre-Alain Joye <[EMAIL PROTECTED]>, which implements the
imagerotate() that allows rotation of images in gd.
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.216 php4/ext/gd/gd.c:1.217
--- php4/ext/gd/gd.c:1.216 Fri Oct 11 09:09:48 2002
+++ php4/ext/gd/gd.c Mon Oct 28 20:15:43 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.216 2002/10/11 13:09:48 derick Exp $ */
+/* $Id: gd.c,v 1.217 2002/10/29 01:15:43 iliaa Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -158,6 +158,10 @@
PHP_FE(imagecopyresampled, NULL)
#endif
+#ifdef HAVE_GD_BUNDLED
+ PHP_FE(imagerotate, NULL)
+#endif
+
#if HAVE_GD_IMAGESETTILE
PHP_FE(imagesettile, NULL)
#endif
@@ -912,6 +916,39 @@
gdImageCopyResampled(im_dst, im_src, dstX, dstY, srcX, srcY, dstW, dstH, srcW,
srcH);
RETURN_TRUE;
+
+}
+/* }}} */
+#endif
+
+#ifdef HAVE_GD_BUNDLED
+/* {{{ proto int imagerotate(int src_im, float angle, int bgdcolor)
+ Rotate an image using a custom angle */
+PHP_FUNCTION(imagerotate)
+{
+ zval **SIM, **ANGLE, **BGDCOLOR;
+ gdImagePtr im_dst, im_src;
+ double degrees;
+ long color;
+
+ if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &SIM, &ANGLE, &BGDCOLOR)
+== FAILURE) {
+ ZEND_WRONG_PARAM_COUNT();
+ }
+
+ ZEND_FETCH_RESOURCE(im_src, gdImagePtr, SIM, -1, "Image", le_gd);
+
+ convert_to_long_ex(BGDCOLOR);
+ color = Z_LVAL_PP(BGDCOLOR);
+
+ convert_to_double_ex(ANGLE);
+ degrees = Z_DVAL_PP(ANGLE);
+ im_dst = gdImageRotate(im_src, degrees, color);
+
+ if (im_dst != NULL) {
+ ZEND_REGISTER_RESOURCE(return_value, im_dst, le_gd);
+ } else {
+ RETURN_FALSE;
+ }
}
/* }}} */
#endif
Index: php4/ext/gd/php_gd.h
diff -u php4/ext/gd/php_gd.h:1.42 php4/ext/gd/php_gd.h:1.43
--- php4/ext/gd/php_gd.h:1.42 Thu Aug 22 03:28:25 2002
+++ php4/ext/gd/php_gd.h Mon Oct 28 20:15:43 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_gd.h,v 1.42 2002/08/22 07:28:25 ttoohey Exp $ */
+/* $Id: php_gd.h,v 1.43 2002/10/29 01:15:43 iliaa Exp $ */
#ifndef PHP_GD_H
#define PHP_GD_H
@@ -93,6 +93,11 @@
PHP_FUNCTION(imagecolorclosestalpha);
PHP_FUNCTION(imagecolorexactalpha);
PHP_FUNCTION(imagecopyresampled);
+
+#ifdef HAVE_GD_BUNDLED
+PHP_FUNCTION(imagerotate);
+#endif
+
PHP_FUNCTION(imagesetthickness);
PHP_FUNCTION(imagesettile);
PHP_FUNCTION(imagecopymergegray);
Index: php4/ext/gd/libgd/gd.c
diff -u php4/ext/gd/libgd/gd.c:1.20 php4/ext/gd/libgd/gd.c:1.21
--- php4/ext/gd/libgd/gd.c:1.20 Sun Oct 6 04:39:05 2002
+++ php4/ext/gd/libgd/gd.c Mon Oct 28 20:15:44 2002
@@ -2191,6 +2191,439 @@
}
}
+
+#ifdef ROTATE_PI
+#undef ROTATE_PI
+#endif /* ROTATE_PI */
+
+#define ROTATE_DEG2RAD 3.1415926535897932384626433832795/180
+void gdImageSkewX (gdImagePtr dst, gdImagePtr src, int uRow, int iOffset, double
+dWeight, int clrBack)
+{
+ typedef int (*FuncPtr)(gdImagePtr, int, int);
+ int i, r, g, b, a;
+ FuncPtr f;
+
+ int pxlOldLeft, pxlLeft, pxlSrc;
+
+ if (src->trueColor) {
+ f = gdImageGetTrueColorPixel;
+ } else {
+ f = gdImageGetPixel;
+ }
+
+ for (i = 0; i < iOffset; i++) {
+ gdImageSetPixel (dst, i, uRow, clrBack);
+ }
+
+ if (i < dst->sx) {
+ gdImageSetPixel (dst, i, uRow, pxlLeft);
+ }
+
+ pxlOldLeft = clrBack;
+
+ for (i = 0; i < src->sx; i++) {
+ pxlSrc = f (src,i,uRow);
+
+ r = gdImageRed(src,pxlSrc) * dWeight;
+ g = gdImageGreen(src,pxlSrc) * dWeight;
+ b = gdImageBlue(src,pxlSrc) * dWeight;
+ a = gdImageAlpha(src,pxlSrc) * dWeight;
+
+ pxlLeft = gdImageColorAllocateAlpha(src, r, g, b, a);
+
+ if (pxlLeft == -1) {
+ pxlLeft = gdImageColorClosestAlpha(src, r, g, b, a);
+ }
+
+ r = gdImageRed(src,pxlSrc) - (gdImageRed(src,pxlLeft) -
+gdImageRed(src,pxlOldLeft));
+ g = gdImageGreen(src,pxlSrc) - (gdImageGreen(src,pxlLeft) -
+gdImageGreen(src,pxlOldLeft));
+ b = gdImageBlue(src,pxlSrc) - (gdImageBlue(src,pxlLeft) -
+gdImageBlue(src,pxlOldLeft));
+ a = gdImageAlpha(src,pxlSrc) - (gdImageAlpha(src,pxlLeft) -
+gdImageAlpha(src,pxlOldLeft));
+
+ if (r>255) {
+ r = 255;
+ }
+
+ if (g>255) {
+ g = 255;
+ }
+
+ if(b>255) {
+ b = 255;
+ }
+
+ if (a>127) {
+ b = 127;
+ }
+
+ pxlSrc = gdImageColorAllocateAlpha(dst, r, g, b, a);
+
+ if (pxlSrc == -1) {
+ pxlSrc = gdImageColorClosestAlpha(dst, r, g, b, a);
+ }
+
+ if ((i + iOffset >= 0) && (i + iOffset < dst->sx)) {
+ gdImageSetPixel (dst, i+iOffset, uRow, pxlSrc);
+ }
+
+ pxlOldLeft = pxlLeft;
+ }
+
+ i += iOffset;
+
+ if (i < dst->sx) {
+ gdImageSetPixel (dst, i, uRow, pxlLeft);
+ }
+
+ gdImageSetPixel (dst, iOffset, uRow, clrBack);
+
+ i--;
+
+ while (++i < dst->sx) {
+ gdImageSetPixel (dst, i, uRow, clrBack);
+ }
+}
+
+void gdImageSkewY (gdImagePtr dst, gdImagePtr src, int uCol, int iOffset, double
+dWeight, int clrBack)
+{
+ typedef int (*FuncPtr)(gdImagePtr, int, int);
+ int i, iYPos, r, g, b, a;
+ FuncPtr f;
+ int pxlOldLeft, pxlLeft, pxlSrc;
+
+ if (src->trueColor) {
+ f = gdImageGetTrueColorPixel;
+ } else {
+ f = gdImageGetPixel;
+ }
+
+ for (i = 0; i<iOffset; i++) {
+ gdImageSetPixel (dst, uCol, i, clrBack);
+ }
+
+ pxlOldLeft = clrBack;
+
+ for (i = 0; i < src->sy; i++) {
+ pxlSrc = f (src, uCol, i);
+ iYPos = i + iOffset;
+
+ r = gdImageRed(src,pxlSrc) * dWeight;
+ g = gdImageGreen(src,pxlSrc) * dWeight;
+ b = gdImageBlue(src,pxlSrc) * dWeight;
+ a = gdImageAlpha(src,pxlSrc) * dWeight;
+
+ pxlLeft = gdImageColorAllocateAlpha(src, r, g, b, a);
+
+ if (pxlLeft == -1) {
+ pxlLeft = gdImageColorClosestAlpha(src, r, g, b, a);
+ }
+
+ r = gdImageRed(src,pxlSrc) - (gdImageRed(src,pxlLeft) -
+gdImageRed(src,pxlOldLeft));
+ g = gdImageGreen(src,pxlSrc) - (gdImageGreen(src,pxlLeft) -
+gdImageGreen(src,pxlOldLeft));
+ b = gdImageBlue(src,pxlSrc) - (gdImageBlue(src,pxlLeft) -
+gdImageBlue(src,pxlOldLeft));
+ a = gdImageAlpha(src,pxlSrc) - (gdImageAlpha(src,pxlLeft) -
+gdImageAlpha(src,pxlOldLeft));
+
+ if (r>255) {
+ r = 255;
+ }
+
+ if (g>255) {
+ g = 255;
+ }
+
+ if(b>255) {
+ b = 255;
+ }
+
+ if (a>127) {
+ b = 127;
+ }
+
+ pxlSrc = gdImageColorAllocateAlpha(dst, r, g, b, a);
+
+ if (pxlSrc == -1) {
+ pxlSrc = gdImageColorClosestAlpha(dst, r, g, b, a);
+ }
+
+ if ((iYPos >= 0) && (iYPos < dst->sy)) {
+ gdImageSetPixel (dst, uCol, iYPos, pxlSrc);
+ }
+
+ pxlOldLeft = pxlLeft;
+ }
+
+ i = iYPos;
+ if (i < dst->sy) {
+ gdImageSetPixel (dst, uCol, i, pxlLeft);
+ }
+
+ i--;
+ while (++i < dst->sy) {
+ gdImageSetPixel (dst, uCol, i, clrBack);
+ }
+}
+
+/* Rotates an image by 90 degrees (counter clockwise) */
+gdImagePtr gdImageRotate90 (gdImagePtr src)
+{
+ int uY, uX;
+ int c;
+ gdImagePtr dst;
+ typedef int (*FuncPtr)(gdImagePtr, int, int);
+ FuncPtr f;
+
+ if (src->trueColor) {
+ dst = gdImageCreateTrueColor ( src->sx,src->sy);
+ f = gdImageGetTrueColorPixel;
+ } else {
+ dst = gdImageCreate (src->sx, src->sy);
+ f = gdImageGetPixel;
+ }
+
+ if (dst != NULL) {
+ gdImagePaletteCopy (dst, src);
+
+ for (uY = 0; uY<src->sy; uY++) {
+ for (uX = 0; uX<src->sx; uX++) {
+ c = f (src, uX, uY);
+ gdImageSetPixel(dst, uY, (dst->sy - uX - 1), c);
+ }
+ }
+ }
+
+ return dst;
+}
+
+/* Rotates an image by 180 degrees (counter clockwise) */
+gdImagePtr gdImageRotate180 (gdImagePtr src)
+{
+ int uY, uX;
+ int c;
+ gdImagePtr dst;
+ typedef int (*FuncPtr)(gdImagePtr, int, int);
+ FuncPtr f;
+
+ if (src->trueColor) {
+ dst = gdImageCreateTrueColor ( src->sx,src->sy);
+ f = gdImageGetTrueColorPixel;
+ } else {
+ dst = gdImageCreate (src->sx, src->sy);
+ f = gdImageGetPixel;
+ }
+
+ if (dst != NULL) {
+ gdImagePaletteCopy (dst, src);
+
+ for (uY = 0; uY<src->sy; uY++) {
+ for (uX = 0; uX<src->sx; uX++) {
+ c = f (src, uX, uY);
+ gdImageSetPixel(dst, (dst->sx - uX - 1), (dst->sy - uY
+- 1), c);
+ }
+ }
+ }
+
+ return dst;
+}
+
+/* Rotates an image by 270 degrees (counter clockwise) */
+gdImagePtr gdImageRotate270 ( gdImagePtr src )
+{
+ int uY, uX;
+ int c;
+ gdImagePtr dst;
+ typedef int (*FuncPtr)(gdImagePtr, int, int);
+ FuncPtr f;
+
+ if (src->trueColor) {
+ dst = gdImageCreateTrueColor (src->sy, src->sx);
+ f = gdImageGetTrueColorPixel;
+ } else {
+ dst = gdImageCreate (src->sy, src->sx);
+ f = gdImageGetPixel;
+ }
+
+ if (dst != NULL) {
+ gdImagePaletteCopy (dst, src);
+
+ for (uY = 0; uY<src->sx; uY++) {
+ for (uX = 0; uX<src->sx; uX++) {
+ c = f (src, uX, uY);
+ gdImageSetPixel(dst, (dst->sx - uY - 1), uX, c);
+ }
+ }
+ }
+
+ return dst;
+}
+
+gdImagePtr gdImageRotate45 (gdImagePtr src, double dAngle, int clrBack)
+{
+ typedef int (*FuncPtr)(gdImagePtr, int, int);
+ gdImagePtr dst1,dst2,dst3;
+ FuncPtr f;
+ double dRadAngle, dSinE, dTan, dShear;
+ double dOffset; /* Variable skew offset */
+ int u, iShear, newx, newy;
+
+ /* See GEMS I for the algorithm details */
+ dRadAngle = dAngle * ROTATE_DEG2RAD; /* Angle in radians */
+ dSinE = sin (dRadAngle);
+ dTan = tan (dRadAngle / 2.0);
+
+ newx = src->sx + src->sy * fabs(dTan);
+ newy = src->sy;
+
+ /* 1st shear */
+ if (src->trueColor) {
+ dst1 = gdImageCreateTrueColor (newx, newy);
+ f = gdImageGetTrueColorPixel;
+ } else {
+ dst1 = gdImageCreate (newx, newy);
+ f = gdImageGetPixel;
+ }
+
+ /******* Perform 1st shear (horizontal) ******/
+ if (dst1 == NULL) {
+ return NULL;
+ }
+
+ if (dAngle == 0.0) {
+ /* Returns copy of src */
+ gdImageCopy (dst1, src,0,0,0,0,src->sx,src->sy);
+ return dst1;
+ }
+
+ gdImagePaletteCopy (dst1, src);
+ dRadAngle = dAngle * ROTATE_DEG2RAD; /* Angle in radians */
+ dSinE = sin (dRadAngle);
+ dTan = tan (dRadAngle / 2.0);
+
+ for (u = 0; u < dst1->sy; u++) {
+ if (dTan >= 0.0) {
+ dShear = ((double)(u + 0.5)) * dTan;
+ } else {
+ dShear = ((double)(u - dst1->sy) + 0.5) * dTan;
+ }
+
+ iShear = floor(dShear);
+
+ gdImageSkewX(dst1, src, u, iShear, (dShear - iShear), clrBack);
+ }
+
+ /* 2nd shear */
+ newx = dst1->sx;
+
+ if (dSinE > 0.0) {
+ dOffset = (src->sx ) * dSinE;
+ } else {
+ dOffset = -dSinE * (src->sx - newx);
+ }
+
+ newy = (int) ((double) src->sx * fabs( dSinE ) + (double) src->sy * cos
+(dRadAngle));
+
+ if (src->trueColor) {
+ dst2 = gdImageCreateTrueColor (newx, newy);
+ f = gdImageGetTrueColorPixel;
+ } else {
+ dst2 = gdImageCreate (newx, newy);
+ f = gdImageGetPixel;
+ }
+
+ if (dst2 == NULL) {
+ gdImageDestroy(dst1);
+ return NULL;
+ }
+
+ for (u = 0; u < dst2->sx; u++, dOffset -= dSinE) {
+ iShear = floor (dOffset);
+ gdImageSkewY(dst2, dst1, u, iShear, (dOffset - iShear), clrBack);
+ }
+
+
+ /* 3rd shear */
+ gdImageDestroy(dst1);
+
+ newx = (int) ((double)src->sy * fabs (dSinE) + (double)src->sx * cos
+(dRadAngle)) + 1;
+ newy = dst2->sy;
+
+ if (src->trueColor) {
+ dst3 = gdImageCreateTrueColor (newx, newy);
+ f = gdImageGetTrueColorPixel;
+ } else {
+ dst3 = gdImageCreate (newx, newy);
+ f = gdImageGetPixel;
+ }
+
+ if (dst3 == NULL) {
+ gdImageDestroy(dst2);
+ return NULL;
+ }
+ if (dSinE >= 0.0) {
+ dOffset = (double)(src->sx - 1) * dSinE * -dTan;
+ } else {
+ dOffset = dTan * ((double)(src->sx - 1) * -dSinE + (double)(1 - newy));
+ }
+
+ for (u = 0; u < dst3->sy; u++, dOffset += dTan) {
+ int iShear = (int)floor(dOffset);
+ gdImageSkewX(dst3, dst2, u, iShear, (dOffset - iShear), clrBack);
+ }
+
+ gdImageDestroy(dst2);
+
+ return dst3;
+}
+
+gdImagePtr gdImageRotate (gdImagePtr src, double dAngle, int clrBack)
+{
+ gdImagePtr pMidImg;
+ gdImagePtr rotatedImg;
+
+ if (src == NULL) {
+ return NULL;
+ }
+
+ while (dAngle >= 360.0) {
+ dAngle -= 360.0;
+ }
+
+ while (dAngle < 0) {
+ dAngle += 360.0;
+ }
+
+ if (dAngle == 90.00) {
+ return gdImageRotate90(src);
+ }
+ if (dAngle == 180.00) {
+ return gdImageRotate180(src);
+ }
+ if(dAngle == 270.00) {
+ return gdImageRotate270 ( src);
+ }
+
+ if ((dAngle > 45.0) && (dAngle <= 135.0)) {
+ pMidImg = gdImageRotate90 (src);
+ dAngle -= 90.0;
+ } else if ((dAngle > 135.0) && (dAngle <= 225.0)) {
+ pMidImg = gdImageRotate180 (src);
+ dAngle -= 180.0;
+ } else if ((dAngle > 225.0) && (dAngle <= 315.0)) {
+ pMidImg = gdImageRotate270 (src);
+ dAngle -= 270.0;
+ } else {
+ return gdImageRotate45 (src, dAngle, clrBack);
+ }
+
+ if (pMidImg == NULL) {
+ return NULL;
+ }
+
+ rotatedImg = gdImageRotate45 (pMidImg, dAngle, clrBack);
+ gdImageDestroy(pMidImg);
+
+ return rotatedImg;
+}
+
gdImagePtr
gdImageCreateFromXbm (FILE * fd)
{
Index: php4/ext/gd/libgd/gd.h
diff -u php4/ext/gd/libgd/gd.h:1.5 php4/ext/gd/libgd/gd.h:1.6
--- php4/ext/gd/libgd/gd.h:1.5 Sun Oct 6 02:03:17 2002
+++ php4/ext/gd/libgd/gd.h Mon Oct 28 20:15:44 2002
@@ -450,6 +450,12 @@
substituted automatically. */
void gdImageCopyResampled(gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int
srcX, int srcY, int dstW, int dstH, int srcW, int srcH);
+gdImagePtr gdImageRotate90(gdImagePtr src);
+gdImagePtr gdImageRotate180(gdImagePtr src);
+gdImagePtr gdImageRotate270(gdImagePtr src);
+gdImagePtr gdImageRotate45(gdImagePtr src, double dAngle, int clrBack);
+gdImagePtr gdImageRotate (gdImagePtr src, double dAngle, int clrBack);
+
void gdImageSetBrush(gdImagePtr im, gdImagePtr brush);
void gdImageSetTile(gdImagePtr im, gdImagePtr tile);
void gdImageSetStyle(gdImagePtr im, int *style, int noOfPixels);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
