[PHP-CVS] cvs: php4(PHP_4_3) /ext/pdf pdf.c

2003-01-16 Thread Ilia Alshanetsky 
iliaa   Thu Jan 16 16:18:55 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/pdf   pdf.c 
  Log:
  MFH
  
  
Index: php4/ext/pdf/pdf.c
diff -u php4/ext/pdf/pdf.c:1.112.2.3 php4/ext/pdf/pdf.c:1.112.2.4
--- php4/ext/pdf/pdf.c:1.112.2.3Tue Dec 31 11:35:11 2002
+++ php4/ext/pdf/pdf.c  Thu Jan 16 16:18:55 2003
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: pdf.c,v 1.112.2.3 2002/12/31 16:35:11 sebastian Exp $ */
+/* $Id: pdf.c,v 1.112.2.4 2003/01/16 21:18:55 iliaa Exp $ */
 
 /* pdflib 2.02 ... 3.0x is subject to the ALADDIN FREE PUBLIC LICENSE.
Copyright (C) 1997-1999 Thomas Merz. 2000-2001 PDFlib GmbH */
@@ -331,7 +331,7 @@
 #else
php_info_print_table_row(2, PDFlib GmbH Version, tmp );
 #endif
-   php_info_print_table_row(2, Revision, $Revision: 1.112.2.3 $ );
+   php_info_print_table_row(2, Revision, $Revision: 1.112.2.4 $ );
php_info_print_table_end();
 
 }
@@ -1979,7 +1979,7 @@
} else {
 #endif
if (im-pixels  gdImageBoundsSafe(im, j, i)) {
-   color = im-pixels[im-sy][im-sx];
+   color = im-pixels[i][j];
*ptr++ = im-red[color];
*ptr++ = im-green[color];
*ptr++ = im-blue[color];



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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/pdf pdf.c

2002-12-03 Thread Ilia Alshanetsky 
iliaa   Tue Dec  3 14:25:49 2002 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/pdf   pdf.c 
  Log:
  MFH
  
  
Index: php4/ext/pdf/pdf.c
diff -u php4/ext/pdf/pdf.c:1.112.2.1 php4/ext/pdf/pdf.c:1.112.2.2
--- php4/ext/pdf/pdf.c:1.112.2.1Mon Dec  2 01:35:50 2002
+++ php4/ext/pdf/pdf.c  Tue Dec  3 14:25:48 2002
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: pdf.c,v 1.112.2.1 2002/12/02 06:35:50 iliaa Exp $ */
+/* $Id: pdf.c,v 1.112.2.2 2002/12/03 19:25:48 iliaa Exp $ */
 
 /* pdflib 2.02 ... 3.0x is subject to the ALADDIN FREE PUBLIC LICENSE.
Copyright (C) 1997-1999 Thomas Merz. 2000-2001 PDFlib GmbH */
@@ -276,7 +276,7 @@
case PDF_SystemError:
case PDF_UnknownError:
default:
-   php_error(E_WARNING,PDFlib error: %s, shortmsg);
+   php_error(E_ERROR,PDFlib error: %s, shortmsg);
}
 }
 /* }}} */
@@ -331,7 +331,7 @@
 #else
php_info_print_table_row(2, PDFlib GmbH Version, tmp );
 #endif
-   php_info_print_table_row(2, Revision, $Revision: 1.112.2.1 $ );
+   php_info_print_table_row(2, Revision, $Revision: 1.112.2.2 $ );
php_info_print_table_end();
 
 }
@@ -1963,17 +1963,30 @@
ZEND_FETCH_RESOURCE(im, gdImagePtr, arg2, -1, Image, le_gd);
 
count = 3 * im-sx * im-sy;
-   if(NULL == (buffer = (unsigned char *) emalloc(count))) {
-   RETURN_FALSE;
-   }
+   buffer = (unsigned char *) emalloc(count);
 
ptr = buffer;
for(i=0; iim-sy; i++) {
for(j=0; jim-sx; j++) {
-   color = im-pixels[i][j];
-   *ptr++ = im-red[color];
-   *ptr++ = im-green[color];
-   *ptr++ = im-blue[color];
+#if HAVE_LIBGD20
+   if(gdImageTrueColor(im)) {
+   if (im-tpixels  gdImageBoundsSafe(im, j, i)) {
+   color = gdImageTrueColorPixel(im, j, i);
+   *ptr++ = (color  16)  0xFF;
+   *ptr++ = (color  8)  0xFF;
+   *ptr++ = color  0xFF;
+   }
+   } else {
+#endif
+   if (im-pixels  gdImageBoundsSafe(im, j, i)) {
+   color = im-pixels[im-sy][im-sx];
+   *ptr++ = im-red[color];
+   *ptr++ = im-green[color];
+   *ptr++ = im-blue[color];
+   }
+#if HAVE_LIBGD20
+   }
+#endif 
}
}
 



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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/pdf pdf.c

2002-12-01 Thread Ilia Alshanetsky 
iliaa   Mon Dec  2 01:35:50 2002 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/pdf   pdf.c 
  Log:
  MFH
  
  
Index: php4/ext/pdf/pdf.c
diff -u php4/ext/pdf/pdf.c:1.112 php4/ext/pdf/pdf.c:1.112.2.1
--- php4/ext/pdf/pdf.c:1.112Wed Sep 25 11:46:44 2002
+++ php4/ext/pdf/pdf.c  Mon Dec  2 01:35:50 2002
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: pdf.c,v 1.112 2002/09/25 15:46:44 wez Exp $ */
+/* $Id: pdf.c,v 1.112.2.1 2002/12/02 06:35:50 iliaa Exp $ */
 
 /* pdflib 2.02 ... 3.0x is subject to the ALADDIN FREE PUBLIC LICENSE.
Copyright (C) 1997-1999 Thomas Merz. 2000-2001 PDFlib GmbH */
@@ -276,8 +276,7 @@
case PDF_SystemError:
case PDF_UnknownError:
default:
-   if (p !=NULL) PDF_delete(p); /* clean up PDFlib */
-   php_error(E_ERROR,PDFlib error: %s, shortmsg);
+   php_error(E_WARNING,PDFlib error: %s, shortmsg);
}
 }
 /* }}} */
@@ -332,7 +331,7 @@
 #else
php_info_print_table_row(2, PDFlib GmbH Version, tmp );
 #endif
-   php_info_print_table_row(2, Revision, $Revision: 1.112 $ );
+   php_info_print_table_row(2, Revision, $Revision: 1.112.2.1 $ );
php_info_print_table_end();
 
 }



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