mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[project @ 2004-10-05 14:36:44 by jmb] 

Lose RISC OS specific includes from GIF code.
Fix jpegs for the gtk build.
Allow use of gifs in gtk build.

svn path=/import/netsurf/; revision=1303
This commit is contained in:
John Mark Bell 2004-10-05 14:36:44 +00:00
parent 60949d1aee
commit 93f8d3badc
4 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
image/gif.c
View File

@ -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"

15
image/gifread.c
View File

@ -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) {

2
image/jpeg.c
View File

@ -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);

4
utils/config.h
View File

@ -26,9 +26,7 @@
#define WITH_JPEG
#define WITH_MNG
#define WITH_PNG
#if defined(riscos) || defined(ncos) || defined(debug)
#define WITH_GIF
#endif
#define WITH_GIF
#if defined(riscos) || defined(ncos)
#define WITH_DRAW
#define WITH_SPRITE