=cut
*/
+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
+#define POST_SET_VERSION
+#define myDGifOpen(userPtr, readFunc, Error) DGifOpen((userPtr), (readFunc), (Error))
+#define myEGifOpen(userPtr, readFunc, Error) EGifOpen((userPtr), (readFunc), (Error))
+#define myGifError(gif) ((gif)->Error)
+#define MakeMapObject GifMakeMapObject
+#define FreeMapObject GifFreeMapObject
+#define gif_mutex_lock(mutex)
+#define gif_mutex_unlock(mutex)
+#else
+#define PRE_SET_VERSION
+static GifFileType *
+myDGifOpen(void *userPtr, InputFunc readFunc, int *error) {
+ GifFileType *result = DGifOpen(userPtr, readFunc);
+ if (!result)
+ *error = GifLastError();
+
+ return result;
+}
+static GifFileType *
+myEGifOpen(void *userPtr, OutputFunc outputFunc, int *error) {
+ GifFileType *result = EGifOpen(userPtr, outputFunc);
+ if (!result)
+ *error = GifLastError();
+
+ return result;
+}
+#define myGifError(gif) GifLastError()
+#define gif_mutex_lock(mutex) i_mutex_lock(mutex)
+#define gif_mutex_unlock(mutex) i_mutex_unlock(mutex)
+
+#endif
+
static char const *gif_error_msg(int code);
-static void gif_push_error(void);
+static void gif_push_error(int code);
/* Make some variables global, so we could access them faster: */
-static int
+static const int
InterlacedOffset[] = { 0, 4, 2, 1 }, /* The way Interlaced image should. */
InterlacedJumps[] = { 8, 8, 4, 2 }; /* be read - offsets and jumps... */
+#if !defined(GIFLIB_MAJOR) || GIFLIB_MAJOR < 5
+static i_mutex_t mutex;
+#endif
+void
+i_init_gif(void) {
+#if !defined(GIFLIB_MAJOR) || GIFLIB_MAJOR < 5
+ mutex = i_mutex_new();
+#endif
+}
static
void
i_readgif_low(GifFileType *GifFile, int **colour_table, int *colours) {
i_img *im;
int i, j, Size, Row, Col, Width, Height, ExtCode, Count, x;
- int cmapcnt = 0, ImageNum = 0, BackGround = 0, ColorMapSize = 0;
+ int cmapcnt = 0, ImageNum = 0;
ColorMapObject *ColorMap;
GifRecordType RecordType;
GifByteType *Extension;
GifRowType GifRow;
- static GifColorType *ColorMapEntry;
+ GifColorType *ColorMapEntry;
i_color col;
mm_log((1,"i_readgif_low(GifFile %p, colour_table %p, colours %p)\n", GifFile, colour_table, colours));
*/
if (colour_table) *colour_table = NULL;
- BackGround = GifFile->SBackGroundColor;
ColorMap = (GifFile->Image.ColorMap ? GifFile->Image.ColorMap : GifFile->SColorMap);
if (ColorMap) {
- ColorMapSize = ColorMap->ColorCount;
i_colortable_copy(colour_table, colours, ColorMap);
cmapcnt++;
}
/* Scan the content of the GIF file and load the image(s) in: */
do {
if (DGifGetRecordType(GifFile, &RecordType) == GIF_ERROR) {
- gif_push_error();
+ gif_push_error(myGifError(GifFile));
i_push_error(0, "Unable to get record type");
if (colour_table && *colour_table) {
myfree(*colour_table);
switch (RecordType) {
case IMAGE_DESC_RECORD_TYPE:
if (DGifGetImageDesc(GifFile) == GIF_ERROR) {
- gif_push_error();
+ gif_push_error(myGifError(GifFile));
i_push_error(0, "Unable to get image descriptor");
if (colour_table && *colour_table) {
myfree(*colour_table);
if (( ColorMap = (GifFile->Image.ColorMap ? GifFile->Image.ColorMap : GifFile->SColorMap) )) {
mm_log((1, "Adding local colormap\n"));
- ColorMapSize = ColorMap->ColorCount;
if ( cmapcnt == 0) {
i_colortable_copy(colour_table, colours, ColorMap);
cmapcnt++;
for (Count = i = 0; i < 4; i++) for (j = Row + InterlacedOffset[i]; j < Row + Height; j += InterlacedJumps[i]) {
Count++;
if (DGifGetLine(GifFile, GifRow, Width) == GIF_ERROR) {
- gif_push_error();
+ gif_push_error(myGifError(GifFile));
i_push_error(0, "Reading GIF line");
if (colour_table && *colour_table) {
myfree(*colour_table);
else {
for (i = 0; i < Height; i++) {
if (DGifGetLine(GifFile, GifRow, Width) == GIF_ERROR) {
- gif_push_error();
+ gif_push_error(myGifError(GifFile));
i_push_error(0, "Reading GIF line");
if (colour_table && *colour_table) {
myfree(*colour_table);
case EXTENSION_RECORD_TYPE:
/* Skip any extension blocks in file: */
if (DGifGetExtension(GifFile, &ExtCode, &Extension) == GIF_ERROR) {
- gif_push_error();
+ gif_push_error(myGifError(GifFile));
i_push_error(0, "Reading extension record");
if (colour_table && *colour_table) {
myfree(*colour_table);
}
while (Extension != NULL) {
if (DGifGetExtensionNext(GifFile, &Extension) == GIF_ERROR) {
- gif_push_error();
+ gif_push_error(myGifError(GifFile));
i_push_error(0, "reading next block of extension");
if (colour_table && *colour_table) {
myfree(*colour_table);
myfree(GifRow);
if (DGifCloseFile(GifFile) == GIF_ERROR) {
- gif_push_error();
+ gif_push_error(myGifError(GifFile));
i_push_error(0, "Closing GIF file object");
if (colour_table && *colour_table) {
myfree(*colour_table);
Internal function called by i_readgif_multi_low() in error handling
*/
-static void free_images(i_img **imgs, int count) {
+static void
+free_images(i_img **imgs, int count) {
int i;
if (count) {
=cut
*/
-i_img **i_readgif_multi_low(GifFileType *GifFile, int *count, int page) {
+i_img **
+i_readgif_multi_low(GifFileType *GifFile, int *count, int page) {
i_img *img;
int i, j, Size, Width, Height, ExtCode, Count;
- int ImageNum = 0, BackGround = 0, ColorMapSize = 0;
+ int ImageNum = 0, ColorMapSize = 0;
ColorMapObject *ColorMap;
GifRecordType RecordType;
mm_log((1,"i_readgif_multi_low(GifFile %p, , count %p)\n", GifFile, count));
- BackGround = GifFile->SBackGroundColor;
-
Size = GifFile->SWidth * sizeof(GifPixelType);
GifRow = (GifRowType) mymalloc(Size);
/* Scan the content of the GIF file and load the image(s) in: */
do {
if (DGifGetRecordType(GifFile, &RecordType) == GIF_ERROR) {
- gif_push_error();
+ gif_push_error(myGifError(GifFile));
i_push_error(0, "Unable to get record type");
free_images(results, *count);
DGifCloseFile(GifFile);
switch (RecordType) {
case IMAGE_DESC_RECORD_TYPE:
if (DGifGetImageDesc(GifFile) == GIF_ERROR) {
- gif_push_error();
+ gif_push_error(myGifError(GifFile));
i_push_error(0, "Unable to get image descriptor");
free_images(results, *count);
DGifCloseFile(GifFile);
j += InterlacedJumps[i]) {
Count++;
if (DGifGetLine(GifFile, GifRow, Width) == GIF_ERROR) {
- gif_push_error();
+ gif_push_error(myGifError(GifFile));
i_push_error(0, "Reading GIF line");
free_images(results, *count);
DGifCloseFile(GifFile);
else {
for (i = 0; i < Height; i++) {
if (DGifGetLine(GifFile, GifRow, Width) == GIF_ERROR) {
- gif_push_error();
+ gif_push_error(myGifError(GifFile));
i_push_error(0, "Reading GIF line");
free_images(results, *count);
DGifCloseFile(GifFile);
/* giflib does't have an interface to skip the image data */
for (i = 0; i < Height; i++) {
if (DGifGetLine(GifFile, GifRow, Width) == GIF_ERROR) {
- gif_push_error();
+ gif_push_error(myGifError(GifFile));
i_push_error(0, "Reading GIF line");
free_images(results, *count);
myfree(GifRow);
case EXTENSION_RECORD_TYPE:
/* Skip any extension blocks in file: */
if (DGifGetExtension(GifFile, &ExtCode, &Extension) == GIF_ERROR) {
- gif_push_error();
+ gif_push_error(myGifError(GifFile));
i_push_error(0, "Reading extension record");
free_images(results, *count);
myfree(GifRow);
if (ExtCode == 0xFF && *Extension == 11) {
if (memcmp(Extension+1, "NETSCAPE2.0", 11) == 0) {
if (DGifGetExtensionNext(GifFile, &Extension) == GIF_ERROR) {
- gif_push_error();
+ gif_push_error(myGifError(GifFile));
i_push_error(0, "reading loop extension");
free_images(results, *count);
myfree(GifRow);
}
while (Extension != NULL) {
if (DGifGetExtensionNext(GifFile, &Extension) == GIF_ERROR) {
- gif_push_error();
+ gif_push_error(myGifError(GifFile));
i_push_error(0, "reading next block of extension");
free_images(results, *count);
myfree(GifRow);
myfree(GifRow);
if (DGifCloseFile(GifFile) == GIF_ERROR) {
- gif_push_error();
+ gif_push_error(myGifError(GifFile));
i_push_error(0, "Closing GIF file object");
free_images(results, *count);
return NULL;
i_img **
i_readgif_multi_wiol(io_glue *ig, int *count) {
GifFileType *GifFile;
-
+ int gif_error;
+ i_img **result;
+
+ gif_mutex_lock(mutex);
+
i_clear_error();
- if ((GifFile = DGifOpen((void *)ig, io_glue_read_cb )) == NULL) {
- gif_push_error();
+ if ((GifFile = myDGifOpen((void *)ig, io_glue_read_cb, &gif_error )) == NULL) {
+ gif_push_error(gif_error);
i_push_error(0, "Cannot create giflib callback object");
mm_log((1,"i_readgif_multi_wiol: Unable to open callback datasource.\n"));
+ gif_mutex_unlock(mutex);
return NULL;
}
- return i_readgif_multi_low(GifFile, count, -1);
+ result = i_readgif_multi_low(GifFile, count, -1);
+
+ gif_mutex_unlock(mutex);
+
+ return result;
}
static int
i_img *
i_readgif_wiol(io_glue *ig, int **color_table, int *colors) {
GifFileType *GifFile;
+ int gif_error;
+ i_img *result;
+
+ gif_mutex_lock(mutex);
i_clear_error();
- if ((GifFile = DGifOpen((void *)ig, io_glue_read_cb )) == NULL) {
- gif_push_error();
+ if ((GifFile = myDGifOpen((void *)ig, io_glue_read_cb, &gif_error )) == NULL) {
+ gif_push_error(gif_error);
i_push_error(0, "Cannot create giflib callback object");
mm_log((1,"i_readgif_wiol: Unable to open callback datasource.\n"));
+ gif_mutex_unlock(mutex);
return NULL;
}
- return i_readgif_low(GifFile, color_table, colors);
+ result = i_readgif_low(GifFile, color_table, colors);
+
+ gif_mutex_unlock(mutex);
+
+ return result;
}
/*
i_img *
i_readgif_single_wiol(io_glue *ig, int page) {
- i_clear_error();
+ GifFileType *GifFile;
+ int gif_error;
+ i_img *result;
+ i_clear_error();
if (page < 0) {
i_push_error(0, "page must be non-negative");
return NULL;
}
- GifFileType *GifFile;
+ gif_mutex_lock(mutex);
- if ((GifFile = DGifOpen((void *)ig, io_glue_read_cb )) == NULL) {
- gif_push_error();
+ if ((GifFile = myDGifOpen((void *)ig, io_glue_read_cb, &gif_error )) == NULL) {
+ gif_push_error(gif_error);
i_push_error(0, "Cannot create giflib callback object");
mm_log((1,"i_readgif_wiol: Unable to open callback datasource.\n"));
+ gif_mutex_unlock(mutex);
return NULL;
}
- return i_readgif_single_low(GifFile, page);
+ result = i_readgif_single_low(GifFile, page);
+
+ gif_mutex_unlock(mutex);
+
+ return result;
}
/*
for (i = 0; i < 4; ++i) {
for (j = InterlacedOffset[i]; j < img->ysize; j += InterlacedJumps[i]) {
if (EGifPutLine(gf, data+j*img->xsize, img->xsize) == GIF_ERROR) {
- gif_push_error();
+ gif_push_error(myGifError(gf));
i_push_error(0, "Could not save image data:");
mm_log((1, "Error in EGifPutLine\n"));
EGifCloseFile(gf);
int y;
for (y = 0; y < img->ysize; ++y) {
if (EGifPutLine(gf, data, img->xsize) == GIF_ERROR) {
- gif_push_error();
+ gif_push_error(myGifError(gf));
i_push_error(0, "Could not save image data:");
mm_log((1, "Error in EGifPutLine\n"));
EGifCloseFile(gf);
=cut
*/
-static int do_gce(GifFileType *gf, i_img *img, int want_trans, int trans_index)
+
+static int
+do_gce(GifFileType *gf, i_img *img, int want_trans, int trans_index)
{
unsigned char gce[4] = {0};
int want_gce = 0;
}
if (want_gce) {
if (EGifPutExtension(gf, 0xF9, sizeof(gce), gce) == GIF_ERROR) {
- gif_push_error();
+ gif_push_error(myGifError(gf));
i_push_error(0, "Could not save GCE");
}
}
=cut
*/
-static int do_comments(GifFileType *gf, i_img *img) {
+
+static int
+do_comments(GifFileType *gf, i_img *img) {
int pos = -1;
while (i_tags_find(&img->tags, "gif_comment", pos+1, &pos)) {
=cut
*/
-static int do_ns_loop(GifFileType *gf, i_img *img)
+
+static int
+do_ns_loop(GifFileType *gf, i_img *img)
{
/* EGifPutExtension() doesn't appear to handle application
extension blocks in any way
if (i_tags_get_int(&img->tags, "gif_loop", 0, &loop_count)) {
unsigned char nsle[12] = "NETSCAPE2.0";
unsigned char subblock[3];
+
+ subblock[0] = 1;
+ subblock[1] = loop_count % 256;
+ subblock[2] = loop_count / 256;
+
+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
+ if (EGifPutExtensionLeader(gf, APPLICATION_EXT_FUNC_CODE) == GIF_ERROR
+ || EGifPutExtensionBlock(gf, 11, nsle) == GIF_ERROR
+ || EGifPutExtensionBlock(gf, 3, subblock) == GIF_ERROR
+ || EGifPutExtensionTrailer(gf) == GIF_ERROR) {
+ gif_push_error(myGifError(gf));
+ i_push_error(0, "writing loop extension");
+ return 0;
+ }
+
+#else
if (EGifPutExtensionFirst(gf, APPLICATION_EXT_FUNC_CODE, 11, nsle) == GIF_ERROR) {
- gif_push_error();
+ gif_push_error(myGifError(gf));
i_push_error(0, "writing loop extension");
return 0;
}
- subblock[0] = 1;
- subblock[1] = loop_count % 256;
- subblock[2] = loop_count / 256;
if (EGifPutExtensionLast(gf, APPLICATION_EXT_FUNC_CODE, 3, subblock) == GIF_ERROR) {
- gif_push_error();
+ gif_push_error(myGifError(gf));
i_push_error(0, "writing loop extension sub-block");
return 0;
}
+#endif
}
return 1;
=cut
*/
-static ColorMapObject *make_gif_map(i_quantize *quant, i_img *img,
- int want_trans) {
+static ColorMapObject *
+make_gif_map(i_quantize *quant, i_img *img, int want_trans) {
GifColorType colors[256];
int i;
int size = quant->mc_count;
map = MakeMapObject(map_size, colors);
mm_log((1, "XXX map is at %p and colors at %p\n", map, map->Colors));
if (!map) {
- gif_push_error();
i_push_error(0, "Could not create color map object");
return NULL;
}
+#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
+ map->SortFlag = 0;
+#endif
return map;
}
/*
-=item gif_set_version(i_quantize *quant, i_img *imgs, int count)
-
-We need to call EGifSetGifVersion() before opening the file - put that
-common code here.
-
-Unfortunately giflib 4.1.0 crashes when we use this. Internally
-giflib 4.1.0 has code:
-
- static char *GifVersionPrefix = GIF87_STAMP;
-
-and the code that sets the version internally does:
-
- strncpy(&GifVersionPrefix[3], Version, 3);
-
-which is very broken.
-
-Failing to set the correct GIF version doesn't seem to cause a problem
-with readers.
-
-Modern versions (4.1.4 anyway) of giflib/libungif handle
-EGifSetGifVersion correctly.
-
-If t/t105gif.t crashes here then run Makefile.PL with
---nogifsetversion, eg.:
+=item need_version_89a(i_quantize *quant, i_img *imgs, int count)
- perl Makefile.PL --nogifsetversion
-
-or install a less buggy giflib.
+Return true if the file we're creating on these images needs a GIF89a
+header.
=cut
*/
-static void gif_set_version(i_quantize *quant, i_img **imgs, int count) {
+static int
+need_version_89a(i_quantize *quant, i_img **imgs, int count) {
int need_89a = 0;
int temp;
int i;
- if (quant->transp != tr_none)
- need_89a = 1;
- else {
- for (i = 0; i < count; ++i) {
- if (i_tags_get_int(&imgs[i]->tags, "gif_delay", 0, &temp)) {
- need_89a = 1;
- break;
- }
- if (i_tags_get_int(&imgs[i]->tags, "gif_user_input", 0, &temp) && temp) {
- need_89a = 1;
- break;
- }
- if (i_tags_get_int(&imgs[i]->tags, "gif_disposal", 0, &temp)) {
- need_89a = 1;
- break;
- }
- if (i_tags_get_int(&imgs[i]->tags, "gif_loop", 0, &temp)) {
- need_89a = 1;
- break;
- }
+ for (i = 0; i < count; ++i) {
+ if (quant->transp != tr_none &&
+ (imgs[i]->channels == 2 || imgs[i]->channels == 4)) {
+ need_89a = 1;
+ break;
+ }
+ if (i_tags_get_int(&imgs[i]->tags, "gif_delay", 0, &temp)) {
+ need_89a = 1;
+ break;
+ }
+ if (i_tags_get_int(&imgs[i]->tags, "gif_user_input", 0, &temp) && temp) {
+ need_89a = 1;
+ break;
+ }
+ if (i_tags_get_int(&imgs[i]->tags, "gif_disposal", 0, &temp)) {
+ need_89a = 1;
+ break;
+ }
+ if (i_tags_get_int(&imgs[i]->tags, "gif_loop", 0, &temp)) {
+ need_89a = 1;
+ break;
}
}
- if (need_89a)
- EGifSetGifVersion("89a");
- else
- EGifSetGifVersion("87a");
+
+ return need_89a;
}
static int
myfree(localmaps);
myfree(glob_imgs);
quant->mc_colors = orig_colors;
- gif_push_error();
+ gif_push_error(myGifError(gf));
i_push_error(0, "Could not save screen descriptor");
FreeMapObject(map);
myfree(result);
myfree(localmaps);
myfree(glob_imgs);
quant->mc_colors = orig_colors;
- gif_push_error();
+ gif_push_error(myGifError(gf));
i_push_error(0, "Could not save image descriptor");
EGifCloseFile(gf);
mm_log((1, "Error in EGifPutImageDesc."));
myfree(localmaps);
myfree(glob_imgs);
quant->mc_colors = orig_colors;
- gif_push_error();
+ gif_push_error(myGifError(gf));
i_push_error(0, "Could not save image descriptor");
myfree(result);
if (map)
myfree(glob_colors);
myfree(localmaps);
myfree(glob_imgs);
- gif_push_error();
+ gif_push_error(myGifError(gf));
i_push_error(0, "Could not close GIF file");
mm_log((1, "Error in EGifCloseFile\n"));
return 0;
i_writegif_wiol(io_glue *ig, i_quantize *quant, i_img **imgs,
int count) {
GifFileType *GifFile;
+ int gif_error;
int result;
+ gif_mutex_lock(mutex);
+
i_clear_error();
- gif_set_version(quant, imgs, count);
+#ifdef PRE_SET_VERSION
+ EGifSetGifVersion(need_version_89a(quant, imgs, count) ? "89a" : "87a");
+#endif
- if ((GifFile = EGifOpen((void *)ig, io_glue_write_cb )) == NULL) {
- gif_push_error();
+ if ((GifFile = myEGifOpen((void *)ig, io_glue_write_cb, &gif_error )) == NULL) {
+ gif_push_error(gif_error);
i_push_error(0, "Cannot create giflib callback object");
mm_log((1,"i_writegif_wiol: Unable to open callback datasource.\n"));
+ gif_mutex_unlock(mutex);
return 0;
}
+#ifdef POST_SET_VERSION
+ EGifSetGifVersion(GifFile, need_version_89a(quant, imgs, count));
+#endif
+
result = i_writegif_low(quant, GifFile, imgs, count);
+ gif_mutex_unlock(mutex);
+
if (i_io_close(ig))
return 0;
Grabs the most recent giflib error code from GifLastError() and
returns a string that describes that error.
-The returned pointer points to a static buffer, either from a literal
-C string or a static buffer.
+Returns NULL for unknown error codes.
=cut
*/
-static char const *gif_error_msg(int code) {
- static char msg[80];
-
+static char const *
+gif_error_msg(int code) {
+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
+ return GifErrorString(code);
+#else
switch (code) {
case E_GIF_ERR_OPEN_FAILED: /* should not see this */
return "Failed to open given file";
return "Unexpected EOF - invalid file";
default:
-#ifdef IMAGER_SNPRINTF
- snprintf(msg, sizeof(msg), "Unknown giflib error code %d", code);
-#else
- sprintf(msg, "Unknown giflib error code %d", code);
-#endif
- return msg;
+ return NULL;
}
+#endif
}
/*
-=item gif_push_error()
+=item gif_push_error(code)
Utility function that takes the current GIF error code, converts it to
an error message and pushes it on the error stack.
=cut
*/
-static void gif_push_error(void) {
- int code = GifLastError(); /* clears saved error */
-
- i_push_error(code, gif_error_msg(code));
+static void
+gif_push_error(int code) {
+ const char *msg = gif_error_msg(code);
+ if (msg)
+ i_push_error(code, msg);
+ else
+ i_push_errorf(code, "Unknown GIF error %d", code);
}
/*
-=head1 BUGS
-
-The Netscape loop extension isn't implemented. Giflib's extension
-writing code doesn't seem to support writing named extensions in this
-form.
-
-A bug in giflib is tickled by the i_writegif_callback(). This isn't a
-problem on ungiflib, but causes a SEGV on giflib. A patch is provided
-in t/t10formats.t
-
-The GIF file tag (GIF87a vs GIF89a) currently isn't set. Using the
-supplied interface in giflib 4.1.0 causes a SEGV in
-EGifSetGifVersion(). See L<gif_set_version> for an explanation.
-
=head1 AUTHOR
Arnar M. Hrafnkelsson, addi@umich.edu
+Tony Cook <tonyc@cpan.org>
+
=head1 SEE ALSO
perl(1), Imager(3)
projects / imager.git / blobdiff