[PHP-CVS] cvs: php-src /ext/gd/libgd gd.h gd_jpeg.c
pajoye Tue Apr 7 13:07:04 2009 UTC Modified files: /php-src/ext/gd/libgd gd.h gd_jpeg.c Log: - missing implementation gdJpegGetVersionString (thanks Rob) http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.h?r1=1.36r2=1.37diff_format=u Index: php-src/ext/gd/libgd/gd.h diff -u php-src/ext/gd/libgd/gd.h:1.36 php-src/ext/gd/libgd/gd.h:1.37 --- php-src/ext/gd/libgd/gd.h:1.36 Wed Jan 14 18:57:51 2009 +++ php-src/ext/gd/libgd/gd.h Tue Apr 7 13:07:04 2009 @@ -249,6 +249,9 @@ int gdJpegGetVersionInt(); const char * gdPngGetVersionString(); +int gdJpegGetVersionInt(); +const char * gdJpegGetVersionString(); + /* A custom data source. */ /* The source function must return -1 on error, otherwise the number of bytes fetched. 0 is EOF, not an error! */ http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd_jpeg.c?r1=1.22r2=1.23diff_format=u Index: php-src/ext/gd/libgd/gd_jpeg.c diff -u php-src/ext/gd/libgd/gd_jpeg.c:1.22 php-src/ext/gd/libgd/gd_jpeg.c:1.23 --- php-src/ext/gd/libgd/gd_jpeg.c:1.22 Thu Nov 6 10:23:52 2008 +++ php-src/ext/gd/libgd/gd_jpeg.c Tue Apr 7 13:07:04 2009 @@ -107,6 +107,18 @@ return JPEG_LIB_VERSION; } +const char * gdJpegGetVersionString() +{ + switch(JPEG_LIB_VERSION) { + case 62: + return 6b; + break; + default: + return unknown; + } +} + + /* * Write IM to OUTFILE as a JFIF-formatted JPEG image, using quality * QUALITY. If QUALITY is in the range 0-100, increasing values -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/libgd gd.h
pajoye Tue Sep 11 21:31:14 2007 UTC Modified files: /php-src/ext/gd/libgd gd.h Log: - MFB http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.h?r1=1.33r2=1.34diff_format=u Index: php-src/ext/gd/libgd/gd.h diff -u php-src/ext/gd/libgd/gd.h:1.33 php-src/ext/gd/libgd/gd.h:1.34 --- php-src/ext/gd/libgd/gd.h:1.33 Sun Jun 3 17:43:13 2007 +++ php-src/ext/gd/libgd/gd.h Tue Sep 11 21:31:14 2007 @@ -639,7 +639,7 @@ int gdImageContrast(gdImagePtr src, double contrast); /* Simply adds or substracts respectively red, green or blue to a pixel */ -int gdImageColor(gdImagePtr src, int red, int green, int blue); +int gdImageColor(gdImagePtr src, const int red, const int green, const int blue, const int alpha); /* Image convolution by a 3x3 custom matrix */ int gdImageConvolution(gdImagePtr src, float ft[3][3], float filter_div, float offset); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/libgd gd.h gdft.c
scottmacMon Apr 23 15:06:13 2007 UTC Modified files: /php-src/ext/gd/libgd gd.h gdft.c Log: Fixed bug #40130 (TTF usage doesn't work properly under Netware) http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.h?r1=1.31r2=1.32diff_format=u Index: php-src/ext/gd/libgd/gd.h diff -u php-src/ext/gd/libgd/gd.h:1.31 php-src/ext/gd/libgd/gd.h:1.32 --- php-src/ext/gd/libgd/gd.h:1.31 Wed Apr 4 00:44:38 2007 +++ php-src/ext/gd/libgd/gd.h Mon Apr 23 15:06:13 2007 @@ -7,14 +7,18 @@ #include php_compat.h -#ifndef WIN32 -/* default fontpath for unix systems */ -#define DEFAULT_FONTPATH /usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:. -#define PATHSEPARATOR : -#else +#ifdef NETWARE +/* default fontpath for netware systems */ +#define DEFAULT_FONTPATH sys:/java/nwgfx/lib/x11/fonts/ttf;. +#define PATHSEPARATOR ; +#elif WIN32 /* default fontpath for windows systems */ #define DEFAULT_FONTPATH c:\\winnt\\fonts;c:\\windows\\fonts;. #define PATHSEPARATOR ; +#else +/* default fontpath for unix systems */ +#define DEFAULT_FONTPATH /usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:. +#define PATHSEPARATOR : #endif /* gd.h: declarations file for the graphic-draw module. http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdft.c?r1=1.44r2=1.45diff_format=u Index: php-src/ext/gd/libgd/gdft.c diff -u php-src/ext/gd/libgd/gdft.c:1.44 php-src/ext/gd/libgd/gdft.c:1.45 --- php-src/ext/gd/libgd/gdft.c:1.44Wed Apr 4 14:26:04 2007 +++ php-src/ext/gd/libgd/gdft.c Mon Apr 23 15:06:13 2007 @@ -377,7 +377,11 @@ path = gdEstrdup (fontsearchpath); /* if name is an absolute filename then test directly */ +#ifdef NETWARE + if (*name == '/' || (name[0] != 0 strstr(name, :/))) { +#else if (*name == '/' || (name[0] != 0 name[1] == ':' (name[2] == '/' || name[2] == '\\'))) { +#endif snprintf(fullname, sizeof(fullname) - 1, %s, name); if (access(fullname, R_OK) == 0) { font_found++; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/libgd gd.h gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdtables.c
nlopess Fri Sep 15 15:14:04 2006 UTC Modified files: /php-src/ext/gd/libgd gd.h gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdtables.c Log: MFB http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.h?r1=1.28r2=1.29diff_format=u Index: php-src/ext/gd/libgd/gd.h diff -u php-src/ext/gd/libgd/gd.h:1.28 php-src/ext/gd/libgd/gd.h:1.29 --- php-src/ext/gd/libgd/gd.h:1.28 Thu Feb 2 20:30:54 2006 +++ php-src/ext/gd/libgd/gd.h Fri Sep 15 15:14:04 2006 @@ -189,7 +189,7 @@ /* Font data; array of characters, one row after another. Easily included in code, also easily loaded from data files. */ - char *data; + const char *data; } gdFont; /* Text functions take these. */ http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdfontg.c?r1=1.2r2=1.3diff_format=u Index: php-src/ext/gd/libgd/gdfontg.c diff -u php-src/ext/gd/libgd/gdfontg.c:1.2 php-src/ext/gd/libgd/gdfontg.c:1.3 --- php-src/ext/gd/libgd/gdfontg.c:1.2 Mon Mar 29 18:20:33 2004 +++ php-src/ext/gd/libgd/gdfontg.c Fri Sep 15 15:14:04 2006 @@ -13,7 +13,7 @@ #include gdfontg.h -char gdFontGiantData[] = +static const char gdFontGiantData[] = { /* Char 0 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdfontl.c?r1=1.2r2=1.3diff_format=u Index: php-src/ext/gd/libgd/gdfontl.c diff -u php-src/ext/gd/libgd/gdfontl.c:1.2 php-src/ext/gd/libgd/gdfontl.c:1.3 --- php-src/ext/gd/libgd/gdfontl.c:1.2 Mon Mar 29 18:20:33 2004 +++ php-src/ext/gd/libgd/gdfontl.c Fri Sep 15 15:14:04 2006 @@ -14,7 +14,7 @@ #include gdfontl.h -char gdFontLargeData[] = +static const char gdFontLargeData[] = { /* Char 0 */ 0, 0, 0, 0, 0, 0, 0, 0, http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdfontmb.c?r1=1.2r2=1.3diff_format=u Index: php-src/ext/gd/libgd/gdfontmb.c diff -u php-src/ext/gd/libgd/gdfontmb.c:1.2 php-src/ext/gd/libgd/gdfontmb.c:1.3 --- php-src/ext/gd/libgd/gdfontmb.c:1.2 Mon Mar 29 18:20:33 2004 +++ php-src/ext/gd/libgd/gdfontmb.c Fri Sep 15 15:14:04 2006 @@ -12,7 +12,7 @@ #include gdfontmb.h -char gdFontMediumBoldData[] = +static const char gdFontMediumBoldData[] = { /* Char 0 */ 0, 0, 0, 0, 0, 0, 0, http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdfonts.c?r1=1.2r2=1.3diff_format=u Index: php-src/ext/gd/libgd/gdfonts.c diff -u php-src/ext/gd/libgd/gdfonts.c:1.2 php-src/ext/gd/libgd/gdfonts.c:1.3 --- php-src/ext/gd/libgd/gdfonts.c:1.2 Mon Mar 29 18:20:33 2004 +++ php-src/ext/gd/libgd/gdfonts.c Fri Sep 15 15:14:04 2006 @@ -12,7 +12,7 @@ #include gdfonts.h -char gdFontSmallData[] = +static const char gdFontSmallData[] = { /* Char 0 */ 0, 0, 0, 0, 0, 0, http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdfontt.c?r1=1.2r2=1.3diff_format=u Index: php-src/ext/gd/libgd/gdfontt.c diff -u php-src/ext/gd/libgd/gdfontt.c:1.2 php-src/ext/gd/libgd/gdfontt.c:1.3 --- php-src/ext/gd/libgd/gdfontt.c:1.2 Mon Mar 29 18:20:33 2004 +++ php-src/ext/gd/libgd/gdfontt.c Fri Sep 15 15:14:04 2006 @@ -13,7 +13,7 @@ #include gdfontt.h -char gdFontTinyData[] = +static const char gdFontTinyData[] = { /* Char 0 */ 0, 0, 0, 0, 0, http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdtables.c?r1=1.2r2=1.3diff_format=u Index: php-src/ext/gd/libgd/gdtables.c diff -u php-src/ext/gd/libgd/gdtables.c:1.2 php-src/ext/gd/libgd/gdtables.c:1.3 --- php-src/ext/gd/libgd/gdtables.c:1.2 Tue Aug 31 16:41:29 2004 +++ php-src/ext/gd/libgd/gdtables.c Fri Sep 15 15:14:04 2006 @@ -1,7 +1,7 @@ #include php_compat.h -int gdCosT[] = +const int gdCosT[] = { 1024, 1023, @@ -365,7 +365,7 @@ 1023 }; -int gdSinT[] = +const int gdSinT[] = { 0, 17, -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/libgd gd.h gdtables.c wbmp.h /main php_compat.h
jorton Tue Aug 31 12:41:29 2004 EDT Modified files: /php-src/ext/gd/libgd gd.h gdtables.c wbmp.h /php-src/main php_compat.h Log: Move global symbols defined by bundled copy of libgd into private php_gd_* namespace, to avoid symbol conflicts with, for instance, another Apache module which loads a different copy of libgd. http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gd.h?r1=1.24r2=1.25ty=u Index: php-src/ext/gd/libgd/gd.h diff -u php-src/ext/gd/libgd/gd.h:1.24 php-src/ext/gd/libgd/gd.h:1.25 --- php-src/ext/gd/libgd/gd.h:1.24 Thu Jul 22 18:38:59 2004 +++ php-src/ext/gd/libgd/gd.h Tue Aug 31 12:41:29 2004 @@ -5,6 +5,8 @@ extern C { #endif +#include php_compat.h + #ifndef WIN32 /* default fontpath for unix systems */ #define DEFAULT_FONTPATH /usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:. http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gdtables.c?r1=1.1r2=1.2ty=u Index: php-src/ext/gd/libgd/gdtables.c diff -u php-src/ext/gd/libgd/gdtables.c:1.1 php-src/ext/gd/libgd/gdtables.c:1.2 --- php-src/ext/gd/libgd/gdtables.c:1.1 Fri Apr 12 22:03:09 2002 +++ php-src/ext/gd/libgd/gdtables.c Tue Aug 31 12:41:29 2004 @@ -1,4 +1,6 @@ +#include php_compat.h + int gdCosT[] = { 1024, http://cvs.php.net/diff.php/php-src/ext/gd/libgd/wbmp.h?r1=1.2r2=1.3ty=u Index: php-src/ext/gd/libgd/wbmp.h diff -u php-src/ext/gd/libgd/wbmp.h:1.2 php-src/ext/gd/libgd/wbmp.h:1.3 --- php-src/ext/gd/libgd/wbmp.h:1.2 Sun Dec 28 15:11:08 2003 +++ php-src/ext/gd/libgd/wbmp.h Tue Aug 31 12:41:29 2004 @@ -12,6 +12,7 @@ #ifndef __WBMP_H #define __WBMP_H 1 +#include php_compat.h /* WBMP struct ** --- http://cvs.php.net/diff.php/php-src/main/php_compat.h?r1=1.20r2=1.21ty=u Index: php-src/main/php_compat.h diff -u php-src/main/php_compat.h:1.20 php-src/main/php_compat.h:1.21 --- php-src/main/php_compat.h:1.20 Thu Jan 8 12:33:04 2004 +++ php-src/main/php_compat.h Tue Aug 31 12:41:29 2004 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_compat.h,v 1.20 2004/01/08 17:33:04 sniper Exp $ */ +/* $Id: php_compat.h,v 1.21 2004/08/31 16:41:29 jorton Exp $ */ #ifndef PHP_COMPAT_H #define PHP_COMPAT_H @@ -125,6 +125,203 @@ #define XML_UseForeignDTD php_XML_UseForeignDTD #define XML_GetFeatureList php_XML_GetFeatureList #define XML_ParserReset php_XML_ParserReset + +#ifdef HAVE_GD_BUNDLED +#define any2eucjp php_gd_any2eucjp +#define createwbmp php_gd_createwbmp +#define empty_output_buffer php_gd_empty_output_buffer +#define fill_input_buffer php_gd_fill_input_buffer +#define freewbmp php_gd_freewbmp +#define gdAlphaBlend php_gd_gdAlphaBlend +#define gdCompareInt php_gd_gdCompareInt +#define gdCosT php_gd_gdCosT +#define gdCtxPrintf php_gd_gdCtxPrintf +#define gdDPExtractData php_gd_gdDPExtractData +#define gdFontGetGiant php_gd_gdFontGetGiant +#define gdFontGetLarge php_gd_gdFontGetLarge +#define gdFontGetMediumBold php_gd_gdFontGetMediumBold +#define gdFontGetSmall php_gd_gdFontGetSmall +#define gdFontGetTiny php_gd_gdFontGetTiny +#define gdFontGiant php_gd_gdFontGiant +#define gdFontGiantData php_gd_gdFontGiantData +#define gdFontGiantRep php_gd_gdFontGiantRep +#define gdFontLarge php_gd_gdFontLarge +#define gdFontLargeData php_gd_gdFontLargeData +#define gdFontLargeRep php_gd_gdFontLargeRep +#define gdFontMediumBold php_gd_gdFontMediumBold +#define gdFontMediumBoldData php_gd_gdFontMediumBoldData +#define gdFontMediumBoldRep php_gd_gdFontMediumBoldRep +#define gdFontSmall php_gd_gdFontSmall +#define gdFontSmallData php_gd_gdFontSmallData +#define gdFontSmallRep php_gd_gdFontSmallRep +#define gdFontTiny php_gd_gdFontTiny +#define gdFontTinyData php_gd_gdFontTinyData +#define gdFontTinyRep php_gd_gdFontTinyRep +#define gdGetBuf php_gd_gdGetBuf +#define gdGetByte php_gd_gdGetByte +#define gdGetC php_gd_gdGetC +#define _gdGetColors php_gd__gdGetColors +#define gd_getin php_gd_gd_getin +#define gdGetInt php_gd_gdGetInt +#define gdGetWord php_gd_gdGetWord +#define gdImageAABlend php_gd_gdImageAABlend +#define gdImageAALine php_gd_gdImageAALine +#define gdImageAlphaBlending php_gd_gdImageAlphaBlending +#define gdImageAntialias php_gd_gdImageAntialias +#define gdImageArc php_gd_gdImageArc +#define gdImageBrightness php_gd_gdImageBrightness +#define gdImageChar php_gd_gdImageChar +#define gdImageCharUp php_gd_gdImageCharUp +#define gdImageColor php_gd_gdImageColor +#define gdImageColorAllocate php_gd_gdImageColorAllocate +#define gdImageColorAllocateAlpha php_gd_gdImageColorAllocateAlpha +#define gdImageColorClosest php_gd_gdImageColorClosest +#define gdImageColorClosestAlpha php_gd_gdImageColorClosestAlpha +#define gdImageColorClosestHWB php_gd_gdImageColorClosestHWB +#define gdImageColorDeallocate
[PHP-CVS] cvs: php-src /ext/gd/libgd gd.h
iliaa Sun May 9 22:18:49 2004 EDT Modified files: /php-src/ext/gd/libgd gd.h Log: Missing part of the upgrade patch. http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gd.h?r1=1.22r2=1.23ty=u Index: php-src/ext/gd/libgd/gd.h diff -u php-src/ext/gd/libgd/gd.h:1.22 php-src/ext/gd/libgd/gd.h:1.23 --- php-src/ext/gd/libgd/gd.h:1.22 Mon Apr 12 17:42:42 2004 +++ php-src/ext/gd/libgd/gd.h Sun May 9 22:18:49 2004 @@ -321,11 +321,14 @@ gdFTEX_Shift_JIS, or gdFTEX_Big5; when not specified, maps are searched for in the above order. */ + int hdpi; + int vdpi; } gdFTStringExtra, *gdFTStringExtraPtr; #define gdFTEX_LINESPACE 1 #define gdFTEX_CHARMAP 2 +#define gdFTEX_RESOLUTION 4 /* These are NOT flags; set one in 'charmap' if you set the gdFTEX_CHARMAP bit in 'flags'. */ #define gdFTEX_Unicode 0 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/libgd gd.h
derick Mon Apr 12 17:42:43 2004 EDT Modified files: /php-src/ext/gd/libgd gd.h Log: - Add fontpath for win98/XP (Patch by Friedhelm Betz) http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gd.h?r1=1.21r2=1.22ty=u Index: php-src/ext/gd/libgd/gd.h diff -u php-src/ext/gd/libgd/gd.h:1.21 php-src/ext/gd/libgd/gd.h:1.22 --- php-src/ext/gd/libgd/gd.h:1.21 Mon Mar 29 13:20:33 2004 +++ php-src/ext/gd/libgd/gd.h Mon Apr 12 17:42:42 2004 @@ -11,7 +11,7 @@ #define PATHSEPARATOR : #else /* default fontpath for windows systems */ -#define DEFAULT_FONTPATH c:\\winnt\\fonts;. +#define DEFAULT_FONTPATH c:\\winnt\\fonts;c:\\windows\\fonts;. #define PATHSEPARATOR ; #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/gd/libgd gd.h
It's probably nicer to put c:\\windows first in the path; post-NT, server versions of windows use that instead of C:\\winnt, so we save a syscall by checking it first. --Wez. - Original Message - From: Derick Rethans [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Monday, April 12, 2004 10:42 PM Subject: [PHP-CVS] cvs: php-src /ext/gd/libgd gd.h derick Mon Apr 12 17:42:43 2004 EDT Modified files: /php-src/ext/gd/libgd gd.h Log: - Add fontpath for win98/XP (Patch by Friedhelm Betz) http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gd.h?r1=1.21r2=1.22ty=u Index: php-src/ext/gd/libgd/gd.h diff -u php-src/ext/gd/libgd/gd.h:1.21 php-src/ext/gd/libgd/gd.h:1.22 --- php-src/ext/gd/libgd/gd.h:1.21 Mon Mar 29 13:20:33 2004 +++ php-src/ext/gd/libgd/gd.h Mon Apr 12 17:42:42 2004 @@ -11,7 +11,7 @@ #define PATHSEPARATOR : #else /* default fontpath for windows systems */ -#define DEFAULT_FONTPATH c:\\winnt\\fonts;. +#define DEFAULT_FONTPATH c:\\winnt\\fonts;c:\\windows\\fonts;. #define PATHSEPARATOR ; #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php