Attachment #45910 for bug #70638

View | Details | Raw Unified | Return to bug 70638
Collapse All | Expand All




--- config.m4.orig	Tue Jul 27 12:44:35 2004
+++ config.m4	Wed Aug 18 17:29:19 2004
@@ -43,6 +43,9 @@
 PHP_ARG_ENABLE(gd-jis-conv, whether to enable JIS-mapped Japanese font support in GD,
 [  --enable-gd-jis-conv      GD: Enable JIS-mapped Japanese font support.], no, no)

 dnl  
 dnl Checks for the configure options 
 dnl 
@@ -220,7 +223,7 @@
     ],[
       AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) 
     ],[

     ])
   fi
 ])
@@ -237,6 +240,12 @@
   fi
 ])
 

 AC_DEFUN(PHP_GD_CHECK_VERSION,[
   PHP_CHECK_LIBRARY(gd, gdImageString16,        [AC_DEFINE(HAVE_LIBGD13,             1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
   PHP_CHECK_LIBRARY(gd, gdImagePaletteCopy,     [AC_DEFINE(HAVE_LIBGD15,             1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
@@ -257,6 +266,7 @@
   PHP_CHECK_LIBRARY(gd, gdImageColorClosestHWB, [AC_DEFINE(HAVE_COLORCLOSESTHWB,     1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
   PHP_CHECK_LIBRARY(gd, gdImageColorResolve,    [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
   PHP_CHECK_LIBRARY(gd, gdImageGifCtx,          [AC_DEFINE(HAVE_GD_GIF_CTX,          1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
+  PHP_CHECK_LIBRARY(gd, gdImageGifAnimBegin,    [AC_DEFINE(HAVE_GD_GIF_ANIM,         1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
   PHP_CHECK_LIBRARY(gd, gdCacheCreate,          [AC_DEFINE(HAVE_GD_CACHE_CREATE,     1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
   PHP_CHECK_LIBRARY(gd, gdFontCacheShutdown,    [AC_DEFINE(HAVE_GD_THREAD_SAFE,      1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
   PHP_CHECK_LIBRARY(gd, gdNewDynamicCtxEx,      [AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX,    1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
@@ -273,6 +283,7 @@
                  libgd/gdxpm.c libgd/gdfontt.c libgd/gdfonts.c libgd/gdfontmb.c libgd/gdfontl.c \
                  libgd/gdfontg.c libgd/gdtables.c libgd/gdft.c libgd/gdcache.c libgd/gdkanji.c \
                  libgd/wbmp.c libgd/gd_wbmp.c libgd/gdhelpers.c libgd/gd_topal.c libgd/gd_gif_in.c \
+                 libgd/gd_biggif_out.c libgd/gd_lzw_out.c
                  libgd/xbm.c libgd/gd_gif_out.c "
 
 dnl check for fabsf and floorf which are available since C99
@@ -284,6 +295,7 @@
 dnl Various checks for GD features
   PHP_GD_TTSTR
   PHP_GD_JISX0208

   PHP_GD_JPEG
   PHP_GD_PNG
   PHP_GD_XPM
@@ -308,6 +320,8 @@
   AC_DEFINE(HAVE_GD_XBM,              1, [ ])
   AC_DEFINE(HAVE_GD_BUNDLED,          1, [ ])
   AC_DEFINE(HAVE_GD_GIF_READ,         1, [ ])
   AC_DEFINE(HAVE_GD_GIF_CREATE,       1, [ ])
+  AC_DEFINE(HAVE_GD_GIF_CTX,          1, [ ])
+  AC_DEFINE(HAVE_GD_GIF_ANIM,         1, [ ])
   AC_DEFINE(HAVE_GD_IMAGEELLIPSE,     1, [ ])
   AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX,   1, [ ])
 
@@ -340,6 +354,11 @@
@@ -336,6 +351,11 @@
   if test -n "$USE_GD_JIS_CONV"; then
     AC_DEFINE(USE_GD_JISX0208, 1, [ ])
     GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208"




--- libgd/gd_gif_out.c.orig	Sat Jun 28 15:47:56 2003
+++ libgd/gd_gif_out.c	Sat Jun 28 16:07:33 2003
@@ -0,0 +1,70 @@
+#include <stdio.h>
+#include <math.h>
+#include <string.h>
+#include <stdlib.h>
+#include "gd.h"
+
+/*
+** Wrapper functions for GIF output.
+*/
+
+void gdImageGifToSink(gdImagePtr im, gdSinkPtr outSink)
+{
+        gdIOCtx   *out = gdNewSSCtx(NULL,outSink);
+        gdImageGifCtx(im, out);
+        out->gd_free(out);
+}
+
+void gdImageGifCtx(gdImagePtr im, gdIOCtx *out)
+{
+#ifdef LZW_LICENCED
+	gdImageLzwCtx(im, out);
+#else
+        gdImageBigGifCtx(im, out);
+#endif
+}
+
+void gdImageGif(gdImagePtr im, FILE *outFile)
+{
+#ifdef LZW_LICENCED
+        gdImageLzw(im, outFile);
+#else
+        gdImageBigGif(im, outFile);
+#endif
+}
+
+void* gdImageGifPtr(gdImagePtr im, int *size)
+{
+#ifdef LZW_LICENCED
+        return gdImageLzwPtr(im, size);
+#else
+        return gdImageBigGifPtr(im, size);
+#endif
+}
+
+void gdImageGifAnimAddCtx(gdImagePtr im, gdIOCtx *out, int LocalCM, int LeftOfs, int TopOfs, int Delay, int Disposal)
+{
+#ifdef LZW_LICENCED
+	gdImageLzwAnimAddCtx(im, out, LocalCM, LeftOfs, TopOfs, Delay, Disposal);
+#else
+	gdImageBigGifAnimAddCtx(im, out, LocalCM, LeftOfs, TopOfs, Delay, Disposal);
+#endif
+}
+
+void gdImageGifAnimAdd(gdImagePtr im, FILE *outFile, int LocalCM, int LeftOfs, int TopOfs, int Delay, int Disposal)
+{
+#ifdef LZW_LICENCED
+	gdImageLzwAnimAdd(im, outFile, LocalCM, LeftOfs, TopOfs, Delay, Disposal);
+#else
+	gdImageBigGifAnimAdd(im, outFile, LocalCM, LeftOfs, TopOfs, Delay, Disposal);
+#endif
+}
+
+void *gdImageGifAnimAddPtr(gdImagePtr im, int *size, int LocalCM, int LeftOfs, int TopOfs, int Delay, int Disposal)
+{
+#ifdef LZW_LICENCED
+	return gdImageLzwAnimAddPtr(im, size, LocalCM, LeftOfs, TopOfs, Delay, Disposal);
+#else
+	return gdImageBigGifAnimAddPtr(im, size, LocalCM, LeftOfs, TopOfs, Delay, Disposal);
+#endif
+}

Return to bug 70638

Lines 1-5 Link Here

(-)php5-gd/files/patch-config.m4 (-15 / +14 lines)
1	--- config.m4.orig Thu Dec 25 23:33:02 2003	1	--- config.m4.orig Tue Jul 27 12:44:35 2004
2	+++ config.m4 Wed Jul 7 14:37:18 2004	2	+++ config.m4 Wed Aug 18 17:29:19 2004
3	@@ -43,6 +43,9 @@	3	@@ -43,6 +43,9 @@
4	PHP_ARG_ENABLE(gd-jis-conv, whether to enable JIS-mapped Japanese font support in GD,	4	PHP_ARG_ENABLE(gd-jis-conv, whether to enable JIS-mapped Japanese font support in GD,
5	[ --enable-gd-jis-conv GD: Enable JIS-mapped Japanese font support.], no, no)	5	[ --enable-gd-jis-conv GD: Enable JIS-mapped Japanese font support.], no, no)
Lines 10-16 Link Here
10	dnl	10	dnl
11	dnl Checks for the configure options	11	dnl Checks for the configure options
12	dnl	12	dnl
13	@@ -219,7 +222,7 @@	13	@@ -220,7 +223,7 @@
14	],[	14	],[
15	AC_MSG_ERROR([Problem with libt1.(a\|so). Please check config.log for more information.])	15	AC_MSG_ERROR([Problem with libt1.(a\|so). Please check config.log for more information.])
16	],[	16	],[
Lines 19-25 Link Here
19	])	19	])
20	fi	20	fi
21	])	21	])
22	@@ -236,6 +239,12 @@	22	@@ -237,6 +240,12 @@
23	fi	23	fi
24	])	24	])
25		25
Lines 32-54 Link Here
32	AC_DEFUN(PHP_GD_CHECK_VERSION,[	32	AC_DEFUN(PHP_GD_CHECK_VERSION,[
33	PHP_CHECK_LIBRARY(gd, gdImageString16, [AC_DEFINE(HAVE_LIBGD13, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])	33	PHP_CHECK_LIBRARY(gd, gdImageString16, [AC_DEFINE(HAVE_LIBGD13, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
34	PHP_CHECK_LIBRARY(gd, gdImagePaletteCopy, [AC_DEFINE(HAVE_LIBGD15, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])	34	PHP_CHECK_LIBRARY(gd, gdImagePaletteCopy, [AC_DEFINE(HAVE_LIBGD15, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
35	@@ -256,6 +265,7 @@	35	@@ -257,6 +266,7 @@
36	PHP_CHECK_LIBRARY(gd, gdImageColorClosestHWB, [AC_DEFINE(HAVE_COLORCLOSESTHWB, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])	36	PHP_CHECK_LIBRARY(gd, gdImageColorClosestHWB, [AC_DEFINE(HAVE_COLORCLOSESTHWB, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
37	PHP_CHECK_LIBRARY(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])	37	PHP_CHECK_LIBRARY(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
38	PHP_CHECK_LIBRARY(gd, gdImageGifCtx, [AC_DEFINE(HAVE_GD_GIF_CTX, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])	38	PHP_CHECK_LIBRARY(gd, gdImageGifCtx, [AC_DEFINE(HAVE_GD_GIF_CTX, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
39	+ PHP_CHECK_LIBRARY(gd, gdImageGifAnimBegin, [AC_DEFINE(HAVE_GD_GIF_ANIM, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])	39	+ PHP_CHECK_LIBRARY(gd, gdImageGifAnimBegin, [AC_DEFINE(HAVE_GD_GIF_ANIM, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
40	PHP_CHECK_LIBRARY(gd, gdCacheCreate, [AC_DEFINE(HAVE_GD_CACHE_CREATE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])	40	PHP_CHECK_LIBRARY(gd, gdCacheCreate, [AC_DEFINE(HAVE_GD_CACHE_CREATE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
41	PHP_CHECK_LIBRARY(gd, gdFontCacheShutdown, [AC_DEFINE(HAVE_GD_THREAD_SAFE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])	41	PHP_CHECK_LIBRARY(gd, gdFontCacheShutdown, [AC_DEFINE(HAVE_GD_THREAD_SAFE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
42	])	42	PHP_CHECK_LIBRARY(gd, gdNewDynamicCtxEx, [AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
43	@@ -271,6 +281,7 @@	43	@@ -273,6 +283,7 @@
44	libgd/gdxpm.c libgd/gdfontt.c libgd/gdfonts.c libgd/gdfontmb.c libgd/gdfontl.c \	44	libgd/gdxpm.c libgd/gdfontt.c libgd/gdfonts.c libgd/gdfontmb.c libgd/gdfontl.c \
45	libgd/gdfontg.c libgd/gdtables.c libgd/gdft.c libgd/gdcache.c libgd/gdkanji.c \	45	libgd/gdfontg.c libgd/gdtables.c libgd/gdft.c libgd/gdcache.c libgd/gdkanji.c \
46	libgd/wbmp.c libgd/gd_wbmp.c libgd/gdhelpers.c libgd/gd_topal.c libgd/gd_gif_in.c \	46	libgd/wbmp.c libgd/gd_wbmp.c libgd/gdhelpers.c libgd/gd_topal.c libgd/gd_gif_in.c \
47	+ libgd/gd_biggif_out.c libgd/gd_lzw_out.c libgd/gd_gif_out.c \	47	+ libgd/gd_biggif_out.c libgd/gd_lzw_out.c
48	libgd/xbm.c"	48	libgd/xbm.c libgd/gd_gif_out.c "
49		49
50	dnl check for fabsf and floorf which are available since C99	50	dnl check for fabsf and floorf which are available since C99
51	@@ -282,6 +293,7 @@	51	@@ -284,6 +295,7 @@
52	dnl Various checks for GD features	52	dnl Various checks for GD features
53	PHP_GD_TTSTR	53	PHP_GD_TTSTR
54	PHP_GD_JISX0208	54	PHP_GD_JISX0208
Lines 56-72 Link Here
56	PHP_GD_JPEG	56	PHP_GD_JPEG
57	PHP_GD_PNG	57	PHP_GD_PNG
58	PHP_GD_XPM	58	PHP_GD_XPM
59	@@ -305,6 +317,9 @@	59	@@ -308,6 +320,8 @@
60	AC_DEFINE(HAVE_GD_XBM, 1, [ ])
61	AC_DEFINE(HAVE_GD_BUNDLED, 1, [ ])	60	AC_DEFINE(HAVE_GD_BUNDLED, 1, [ ])
62	AC_DEFINE(HAVE_GD_GIF_READ, 1, [ ])	61	AC_DEFINE(HAVE_GD_GIF_READ, 1, [ ])
63	+ AC_DEFINE(HAVE_GD_GIF_CREATE, 1, [ ])	62	AC_DEFINE(HAVE_GD_GIF_CREATE, 1, [ ])
64	+ AC_DEFINE(HAVE_GD_GIF_CTX, 1, [ ])	63	+ AC_DEFINE(HAVE_GD_GIF_CTX, 1, [ ])
65	+ AC_DEFINE(HAVE_GD_GIF_ANIM, 1, [ ])	64	+ AC_DEFINE(HAVE_GD_GIF_ANIM, 1, [ ])
66	AC_DEFINE(HAVE_GD_IMAGEELLIPSE, 1, [ ])	65	AC_DEFINE(HAVE_GD_IMAGEELLIPSE, 1, [ ])
		66	AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX, 1, [ ])
67		67
68	dnl Make sure the libgd/ is first in the include path	68	@@ -340,6 +354,11 @@
69	@@ -336,6 +351,11 @@
70	if test -n "$USE_GD_JIS_CONV"; then	69	if test -n "$USE_GD_JIS_CONV"; then
71	AC_DEFINE(USE_GD_JISX0208, 1, [ ])	70	AC_DEFINE(USE_GD_JISX0208, 1, [ ])
72	GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208"	71	GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208"

Lines 1-73 Link Here

(-)php5-gd/files/patch-libgd::gd_gif_out.c (-73 lines)
1	--- libgd/gd_gif_out.c.orig Sat Jun 28 15:47:56 2003
2	+++ libgd/gd_gif_out.c Sat Jun 28 16:07:33 2003
3	@@ -0,0 +1,70 @@
4	+#include <stdio.h>
5	+#include <math.h>
6	+#include <string.h>
7	+#include <stdlib.h>
8	+#include "gd.h"
9	+
10	+/*
11	+** Wrapper functions for GIF output.
12	+*/
13	+
14	+void gdImageGifToSink(gdImagePtr im, gdSinkPtr outSink)
15	+{
16	+ gdIOCtx *out = gdNewSSCtx(NULL,outSink);
17	+ gdImageGifCtx(im, out);
18	+ out->gd_free(out);
19	+}
20	+
21	+void gdImageGifCtx(gdImagePtr im, gdIOCtx *out)
22	+{
23	+#ifdef LZW_LICENCED
24	+ gdImageLzwCtx(im, out);
25	+#else
26	+ gdImageBigGifCtx(im, out);
27	+#endif
28	+}
29	+
30	+void gdImageGif(gdImagePtr im, FILE *outFile)
31	+{
32	+#ifdef LZW_LICENCED
33	+ gdImageLzw(im, outFile);
34	+#else
35	+ gdImageBigGif(im, outFile);
36	+#endif
37	+}
38	+
39	+void* gdImageGifPtr(gdImagePtr im, int *size)
40	+{
41	+#ifdef LZW_LICENCED
42	+ return gdImageLzwPtr(im, size);
43	+#else
44	+ return gdImageBigGifPtr(im, size);
45	+#endif
46	+}
47	+
48	+void gdImageGifAnimAddCtx(gdImagePtr im, gdIOCtx *out, int LocalCM, int LeftOfs, int TopOfs, int Delay, int Disposal)
49	+{
50	+#ifdef LZW_LICENCED
51	+ gdImageLzwAnimAddCtx(im, out, LocalCM, LeftOfs, TopOfs, Delay, Disposal);
52	+#else
53	+ gdImageBigGifAnimAddCtx(im, out, LocalCM, LeftOfs, TopOfs, Delay, Disposal);
54	+#endif
55	+}
56	+
57	+void gdImageGifAnimAdd(gdImagePtr im, FILE *outFile, int LocalCM, int LeftOfs, int TopOfs, int Delay, int Disposal)
58	+{
59	+#ifdef LZW_LICENCED
60	+ gdImageLzwAnimAdd(im, outFile, LocalCM, LeftOfs, TopOfs, Delay, Disposal);
61	+#else
62	+ gdImageBigGifAnimAdd(im, outFile, LocalCM, LeftOfs, TopOfs, Delay, Disposal);
63	+#endif
64	+}
65	+
66	+void gdImageGifAnimAddPtr(gdImagePtr im, int size, int LocalCM, int LeftOfs, int TopOfs, int Delay, int Disposal)
67	+{
68	+#ifdef LZW_LICENCED
69	+ return gdImageLzwAnimAddPtr(im, size, LocalCM, LeftOfs, TopOfs, Delay, Disposal);
70	+#else
71	+ return gdImageBigGifAnimAddPtr(im, size, LocalCM, LeftOfs, TopOfs, Delay, Disposal);
72	+#endif
73	+}