cvs: gd /playground/gdbmp gd-20x-bmp.patch

scottmac		Sat May 31 20:06:50 2008 UTC

  Added files:                 
    /gd/playground/gdbmp	gd-20x-bmp.patch 
  Log:
  Add patch for those wanting to use the code with GD 2.0.x
  

http://cvs.php.net/viewvc.cgi/gd/playground/gdbmp/gd-20x-bmp.patch?view=markup&rev=1.1
Index: gd/playground/gdbmp/gd-20x-bmp.patch
+++ gd/playground/gdbmp/gd-20x-bmp.patch
Index: Makefile.am
===================================================================
RCS file: /repository/gd/libgd/src/Makefile.am,v
retrieving revision 1.8.2.6
diff -u -r1.8.2.6 Makefile.am
--- Makefile.am	11 Mar 2008 10:38:53 -0000	1.8.2.6
+++ Makefile.am	31 May 2008 20:03:07 -0000
@@ -17,7 +17,7 @@
 
 lib_LTLIBRARIES = libgd.la
 
-libgd_la_SOURCES = gd.c gdfx.c gd_security.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_gif_in.c gd_gif_out.c gd_io_file.c gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h gdkanji.c gdtables.c gdxpm.c jisx0208.h wbmp.c wbmp.h
+libgd_la_SOURCES = gd.c gdfx.c gd_security.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_gif_in.c gd_gif_out.c gd_io_file.c gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h gdkanji.c gdtables.c gdxpm.c jisx0208.h wbmp.c wbmp.h gd_bmp.c bmp.h
 
 libgd_la_LDFLAGS = -version-info 2:0:0 $(XTRA_LDFLAGS)
 
Index: gd.h
===================================================================
RCS file: /repository/gd/libgd/src/gd.h,v
retrieving revision 1.34.2.8
diff -u -r1.34.2.8 gd.h
--- gd.h	18 Nov 2007 20:16:00 -0000	1.34.2.8
+++ gd.h	31 May 2008 20:01:11 -0000
@@ -288,6 +288,10 @@
 BGD_DECLARE(gdImagePtr) gdImageCreateFromJpegCtx (gdIOCtx * infile);
 BGD_DECLARE(gdImagePtr) gdImageCreateFromJpegPtr (int size, void *data);
 
+BGD_DECLARE(gdImagePtr) gdImageCreateFromBmp (FILE * inFile);
+BGD_DECLARE(gdImagePtr) gdImageCreateFromBmpPtr (int size, void *data);
+BGD_DECLARE(gdImagePtr) gdImageCreateFromBmpCtx (gdIOCtxPtr infile);
+
 /* A custom data source. */
 /* The source function must return -1 on error, otherwise the number
         of bytes fetched. 0 is EOF, not an error! */
@@ -561,6 +565,10 @@
 BGD_DECLARE(void) gdImagePngCtx (gdImagePtr im, gdIOCtx * out);
 BGD_DECLARE(void) gdImageGifCtx (gdImagePtr im, gdIOCtx * out);
 
+BGD_DECLARE(void *) gdImageBmpPtr(gdImagePtr im, int *size, int compression);
+BGD_DECLARE(void) gdImageBmp(gdImagePtr im, FILE *outFile, int compression);
+BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression);
+
 /* 2.0.12: Compression level: 0-9 or -1, where 0 is NO COMPRESSION at all,
   1 is FASTEST but produces larger files, 9 provides the best
   compression (smallest files) but takes a long time to compress, and