sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove stray bitmap_create call

Browse Source 
missed this one in the delay gif alloc patch
This commit is contained in:
John Cupitt 2021-04-03 12:28:41 +01:00
parent 07e73475c1
commit f726edb7f7
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libvips/foreign/libnsgif/libnsgif.c
View File

@ -1106,14 +1106,6 @@ gif_result gif_initialise(gif_animation *gif, size_t size, unsigned char *data)
}
gif->frame_holders = 1;
/* Initialise the bitmap header */
assert(gif->bitmap_callbacks.bitmap_create);
gif->frame_image = gif->bitmap_callbacks.bitmap_create(gif->width, gif->height);
if (gif->frame_image == NULL) {
gif_finalise(gif);
return GIF_INSUFFICIENT_MEMORY;
}
/* Remember we've done this now */
gif->buffer_position = gif_data - gif->gif_data;
}

19
libvips/foreign/libnsgif/patches/delay-alloc.patch
View File

@ -1,5 +1,5 @@
--- libnsgif-orig.c 2021-04-02 11:59:38.120048459 +0100
+++ libnsgif.c 2021-04-02 11:59:44.439972362 +0100
--- libnsgif-orig.c 2021-04-03 12:23:43.700260070 +0100
+++ libnsgif.c 2021-04-03 12:24:44.079567702 +0100
@@ -79,34 +79,17 @@
unsigned int width,
unsigned int height)
@ -69,3 +69,18 @@
/* Decode the flags */
flags = gif_data[9];
colour_table_size = 2 << (flags & GIF_COLOUR_TABLE_SIZE_MASK);
@@ -1115,14 +1106,6 @@
}
gif->frame_holders = 1;
- /* Initialise the bitmap header */
- assert(gif->bitmap_callbacks.bitmap_create);
- gif->frame_image = gif->bitmap_callbacks.bitmap_create(gif->width, gif->height);
- if (gif->frame_image == NULL) {
- gif_finalise(gif);
- return GIF_INSUFFICIENT_MEMORY;
- }
-
/* Remember we've done this now */
gif->buffer_position = gif_data - gif->gif_data;
}