Attachment 45910 Details for Bug 70638 – php5-gd.diff

[patch] php5-gd.diff

php5-gd.diff (text/plain), 5.83 KB, created by Olafur Osvaldsson on 2004-08-18 18:50:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olafur Osvaldsson

Created: 2004-08-18 18:50:24 UTC

Size: 5.83 KB

patch

obsolete

>diff -ruN php5-gd.orig/files/patch-config.m4 php5-gd/files/patch-config.m4
>--- php5-gd.orig/files/patch-config.m4	Wed Aug 18 17:42:08 2004
>+++ php5-gd/files/patch-config.m4	Wed Aug 18 17:42:28 2004
>@@ -1,5 +1,5 @@
>---- config.m4.orig	Thu Dec 25 23:33:02 2003
>-+++ config.m4	Wed Jul  7 14:37:18 2004
>+--- 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)
>@@ -10,7 +10,7 @@
>  dnl  
>  dnl Checks for the configure options 
>  dnl 
>-@@ -219,7 +222,7 @@
>+@@ -220,7 +223,7 @@
>      ],[
>        AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) 
>      ],[
>@@ -19,7 +19,7 @@
>      ])
>    fi
>  ])
>-@@ -236,6 +239,12 @@
>+@@ -237,6 +240,12 @@
>    fi
>  ])
>  
>@@ -32,23 +32,23 @@
>  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 ])
>-@@ -256,6 +265,7 @@
>+@@ -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 ])
>- ])
>-@@ -271,6 +281,7 @@
>+   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/gd_gif_out.c \
>-                  libgd/xbm.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
>-@@ -282,6 +293,7 @@
>+@@ -284,6 +295,7 @@
>  dnl Various checks for GD features
>    PHP_GD_TTSTR
>    PHP_GD_JISX0208
>@@ -56,17 +56,16 @@
>    PHP_GD_JPEG
>    PHP_GD_PNG
>    PHP_GD_XPM
>-@@ -305,6 +317,9 @@
>-   AC_DEFINE(HAVE_GD_XBM,              1, [ ])
>+@@ -308,6 +320,8 @@
>    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_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, [ ])
>  
>- dnl Make sure the libgd/ is first in the include path
>-@@ -336,6 +351,11 @@
>+@@ -340,6 +354,11 @@
>    if test -n "$USE_GD_JIS_CONV"; then
>      AC_DEFINE(USE_GD_JISX0208, 1, [ ])
>      GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208"
>diff -ruN php5-gd.orig/files/patch-libgd::gd_gif_out.c php5-gd/files/patch-libgd::gd_gif_out.c
>--- php5-gd.orig/files/patch-libgd::gd_gif_out.c	Wed Aug 18 17:42:08 2004
>+++ php5-gd/files/patch-libgd::gd_gif_out.c	Thu Jan  1 00:00:00 1970
>@@ -1,73 +0,0 @@
>---- 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
>-+}

Actions: View | Diff

Attachments on bug 70638: 45910