diff options
Diffstat (limited to 'image')
| -rw-r--r-- | image/gif.c | 2 | ||||
| -rw-r--r-- | image/gifread.c | 15 | ||||
| -rw-r--r-- | image/jpeg.c | 2 |
3 files changed, 7 insertions, 12 deletions
diff --git a/image/gif.c b/image/gif.c index 091c7c2ed..0480b77cd 100644 --- a/image/gif.c +++ b/image/gif.c @@ -10,8 +10,6 @@ #include <string.h> #include <stdbool.h> #include <stdlib.h> -#include "oslib/osfile.h" -#include "oslib/osspriteop.h" #include "netsurf/utils/config.h" #include "netsurf/content/content.h" #include "netsurf/desktop/browser.h" diff --git a/image/gifread.c b/image/gifread.c index fb6a7d2fa..cc3050a16 100644 --- a/image/gifread.c +++ b/image/gifread.c @@ -13,9 +13,6 @@ #include "gifread.h" #include "netsurf/image/bitmap.h" #include "netsurf/utils/log.h" -#include "oslib/osspriteop.h" -#include "oslib/osfile.h" - /* READING GIF FILES ================= @@ -87,11 +84,11 @@ static int max_code, max_code_size; static int clear_code, end_code; static int curbit, lastbit, get_done, last_byte; static int return_clear; -static int zero_data_block = FALSE; +static bool zero_data_block = false; /* Whether to clear the decoded image rather than plot */ -static int clear_image = FALSE; +static bool clear_image = false; /* Initialises any workspace held by the animation and attempts to decode @@ -166,7 +163,7 @@ int gif_initialise(struct gif_animation *gif) { gif->dirty_frame = -1; gif->loop_count = 1; gif_data += 7; - + /* Some broken GIFs report the size as the screen size they were created in. As such, we detect for the common cases and set the sizes as 0 if they are found which results in the GIF being the maximum size of the frames. @@ -615,9 +612,9 @@ int gif_decode_frame(struct gif_animation *gif, unsigned int frame) { */ if (!clear_image) { if (gif->decoded_frame == gif->dirty_frame) { - clear_image = TRUE; + clear_image = true; if (frame != 0) gif_decode_frame(gif, gif->dirty_frame); - clear_image = FALSE; + clear_image = false; } gif->dirty_frame = -1; } @@ -839,7 +836,7 @@ gif_decode_frame_exit: if ((gif_bytes < 1) || (gif_data[0] == 0x3b)) more_images = 0; gif->buffer_position++; } - + /* Check if we should test for optimisation */ if (gif->frames[frame].virgin) { diff --git a/image/jpeg.c b/image/jpeg.c index 01c075d4b..f607ebb14 100644 --- a/image/jpeg.c +++ b/image/jpeg.c @@ -121,7 +121,7 @@ bool nsjpeg_convert(struct content *c, int w, int h) scanlines[0][i * 4 + 0] = r; scanlines[0][i * 4 + 1] = g; scanlines[0][i * 4 + 2] = b; -/* scanlines[0][i * 4 + 3] = 0xff; */ + scanlines[0][i * 4 + 3] = 0xff; } #endif } while (cinfo.output_scanline != cinfo.output_height); |