fixed FS#227

tabe · tabe · commit db10f301fff5 · 2010-08-24T18:33:02.000+09:00
diff --git a/src/gd_gif_out.c b/src/gd_gif_out.c
@@ -191,7 +191,7 @@ BGD_DECLARE(void) gdImageGifAnimBeginCtx(gdImagePtr im, gdIOCtxPtr out, int Glob
 	B = GlobalCM ? 0x80 : 0;
 
 	/* OR in the resolution */
-	B |= (Resolution - 1) << 5;
+	B |= (Resolution - 1) << 4;
 
 	/* OR in the Bits per Pixel */
 	B |= (BitsPerPixel - 1);
@@ -640,7 +640,7 @@ static void GIFEncode(gdIOCtxPtr fp, int GWidth, int GHeight, int GInterlace, in
 	B = 0x80;
 
 	/* OR in the resolution */
-	B |= (Resolution - 1) << 5;
+	B |= (Resolution - 1) << 4;
 
 	/* OR in the Bits per Pixel */
 	B |= (BitsPerPixel - 1);
diff --git a/tests/gif/CMakeLists.txt b/tests/gif/CMakeLists.txt
@@ -8,6 +8,7 @@ SET(TESTS_FILES
 	bug00060
 	bug00066
 	bug00181
+	bug00227
 )
 
 FOREACH(test_name ${TESTS_FILES})
diff --git a/tests/gif/Makefile.am b/tests/gif/Makefile.am
@@ -1,3 +1,3 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 
-EXTRA_DIST = CMakeLists.txt gif_im2im.c gif_null.c bug00005_0.gif bug00005_2.c bug00005_2.gif bug00005.c bug00060.c bug00066.c bug00066.gif bug00005_1.gif  bug00005_2_exp.png  bug00005_3.gif  bug00006.c  bug00060.gif  bug00066_exp.png bug00181.c
+EXTRA_DIST = CMakeLists.txt gif_im2im.c gif_null.c bug00005_0.gif bug00005_2.c bug00005_2.gif bug00005.c bug00060.c bug00066.c bug00066.gif bug00005_1.gif  bug00005_2_exp.png  bug00005_3.gif  bug00006.c  bug00060.gif  bug00066_exp.png bug00181.c bug00227.c
diff --git a/tests/gif/bug00227.c b/tests/gif/bug00227.c
@@ -0,0 +1,66 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <gd.h>
+#include <gdtest.h>
+
+#define WIDTH 150
+#define HEIGHT 1
+#define DELAY 100
+#define PROBE_SIZE 11
+
+int main()
+{
+	FILE *fp;
+	gdImagePtr im0, im1, im2;
+	int file, i;
+	char *buf;
+
+	/* generate a GIF animation */
+	im0 = gdImageCreate(WIDTH, HEIGHT);
+	if (!im0) return 1;
+	for (i = 0; i < WIDTH; i++) {
+		int c = gdImageColorAllocate(im0, i, 0xff, 0xff);
+		gdImageSetPixel(im0, i, 0, c);
+	}
+
+	fp = fopen("bug00227.gif", "wb");
+	if (!fp) return 1;
+
+	gdImageGifAnimBegin(im0, fp, 0, 0);
+
+	gdImageGifAnimAdd(im0, fp, 1, 0, 0, DELAY, 1, NULL);
+
+	im1 = gdImageCreate(WIDTH, HEIGHT);
+	if (!im1) return 1;
+	for (i = 0; i < WIDTH; i++) {
+		int c = gdImageColorAllocate(im1, i, 0x00, 0xff);
+		gdImageSetPixel(im1, i, 0, c);
+	}
+	gdImageGifAnimAdd(im1, fp, 1, 0, 0, DELAY, 1, im0);
+
+	im2 = gdImageCreate(WIDTH, HEIGHT);
+	if (!im2) return 1;
+	for (i = 0; i < WIDTH; i++) {
+		int c = gdImageColorAllocate(im2, i, 0xff, 0x00);
+		gdImageSetPixel(im2, i, 0, c);
+	}
+	gdImageGifAnimAdd(im2, fp, 1, 0, 0, DELAY, 1, im1);
+
+	gdImageGifAnimEnd(fp);
+
+	fclose(fp);
+
+	gdImageDestroy(im0);
+	gdImageDestroy(im1);
+	gdImageDestroy(im2);
+
+	/* check the Global Color Table flag */
+	fp = fopen("bug00227.gif", "rb");
+	if (!fp) return 1;
+	buf = malloc(PROBE_SIZE);
+	if (!buf) return 1;
+	if (PROBE_SIZE != fread(buf, 1, PROBE_SIZE, fp)) return 1;
+	if (buf[PROBE_SIZE-1] & 0x80) return 1;
+	fclose(fp);
+	return 0;
+}

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ SET(TESTS_FILES`
`8`	`8`	`bug00060`
`9`	`9`	`bug00066`
`10`	`10`	`bug00181`
	`11`	`+ bug00227`
`11`	`12`	`)`
`12`	`13`
`13`	`14`	`FOREACH(test_name ${TESTS_FILES})`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`## Process this file with automake to produce Makefile.in --Makefile--`
`2`	`2`
`3`		`-EXTRA_DIST = CMakeLists.txt gif_im2im.c gif_null.c bug00005_0.gif bug00005_2.c bug00005_2.gif bug00005.c bug00060.c bug00066.c bug00066.gif bug00005_1.gif bug00005_2_exp.png bug00005_3.gif bug00006.c bug00060.gif bug00066_exp.png bug00181.c`
	`3`	`+EXTRA_DIST = CMakeLists.txt gif_im2im.c gif_null.c bug00005_0.gif bug00005_2.c bug00005_2.gif bug00005.c bug00060.c bug00066.c bug00066.gif bug00005_1.gif bug00005_2_exp.png bug00005_3.gif bug00006.c bug00060.gif bug00066_exp.png bug00181.c bug00227.c`