2003-06-30 16:44:03 +04:00
|
|
|
/*
|
2003-07-19 01:02:29 +04:00
|
|
|
* Copyright 2003 John M Bell <jmb202@ecs.soton.ac.uk>
|
2004-10-05 03:54:42 +04:00
|
|
|
* Copyright 2004 Richard Wilson <not_ginger_matt@users.sourceforge.net>
|
Merged revisions 4345-4346,4350-4351,4389,4391,4395,4401-4403,4423,4485-4486 via svnmerge from
svn://semichrome.net/branches/dynis/netsurf
........
r4345 | dynis | 2008-06-15 18:37:23 -0500 (Sun, 15 Jun 2008) | 1 line
Move NetSurf's gifread.h to libnsgif
........
r4346 | dynis | 2008-06-15 18:38:38 -0500 (Sun, 15 Jun 2008) | 1 line
Remove NetSurf's gifread.c (replaced by libnsgif)
........
r4350 | dynis | 2008-06-15 18:57:17 -0500 (Sun, 15 Jun 2008) | 1 line
Added references to libnsgif where necessary; corrected function calls where callbacks were implemented
........
r4351 | dynis | 2008-06-15 19:00:33 -0500 (Sun, 15 Jun 2008) | 1 line
Updated Makefile to compile with libnsgif
........
r4389 | dynis | 2008-06-18 13:58:51 -0500 (Wed, 18 Jun 2008) | 1 line
Altered bitmap callback table name for gif images to avoid ambiguity when bmp image library is created
........
r4391 | dynis | 2008-06-18 14:08:39 -0500 (Wed, 18 Jun 2008) | 1 line
Updated netsurf branch to use new bitmap callback table structure name that was altered in libnsgif
........
r4395 | dynis | 2008-06-18 14:54:51 -0500 (Wed, 18 Jun 2008) | 1 line
Corrected param comments for bitmap_set_suspendable()
........
r4401 | dynis | 2008-06-18 18:39:50 -0500 (Wed, 18 Jun 2008) | 1 line
Added references to libnsbmp where necessary; corrected function calls where callbacks were implemented
........
r4402 | dynis | 2008-06-18 18:40:47 -0500 (Wed, 18 Jun 2008) | 1 line
Updated Makefile to compile with libnsbmp
........
r4403 | dynis | 2008-06-18 18:41:53 -0500 (Wed, 18 Jun 2008) | 1 line
Remove NetSurf's bmpread.c and bmpread.h (replaced by libnsbmp)
........
r4423 | dynis | 2008-06-22 14:21:30 -0500 (Sun, 22 Jun 2008) | 1 line
Correct a silly mistake in nsbmp_bitmap_create
........
r4485 | dynis | 2008-07-01 04:13:48 -0500 (Tue, 01 Jul 2008) | 1 line
Integrated the latest versions of libnsgif and libnsbmp into NetSurf
........
r4486 | dynis | 2008-07-01 05:27:10 -0500 (Tue, 01 Jul 2008) | 1 line
Altered bitmap functions to receive void pointers for proper utilisation of libnsgif and libnsbmp
........
svn path=/trunk/netsurf/; revision=5071
2008-08-12 07:49:34 +04:00
|
|
|
* Copyright 2008 Sean Fox <dyntryx@gmail.com>
|
2007-08-08 20:16:03 +04:00
|
|
|
*
|
|
|
|
* This file is part of NetSurf, http://www.netsurf-browser.org/
|
|
|
|
*
|
|
|
|
* NetSurf is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; version 2 of the License.
|
|
|
|
*
|
|
|
|
* NetSurf is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
2003-06-05 17:24:28 +04:00
|
|
|
*/
|
|
|
|
|
2008-08-24 19:44:29 +04:00
|
|
|
/** \file
|
|
|
|
* Content for image/gif (implementation)
|
|
|
|
*
|
|
|
|
* All GIFs are dynamically decompressed using the routines that gifread.c
|
|
|
|
* provides. Whilst this allows support for progressive decoding, it is
|
|
|
|
* not implemented here as NetSurf currently does not provide such support.
|
|
|
|
*
|
|
|
|
* [rjw] - Sun 4th April 2004
|
|
|
|
*/
|
|
|
|
|
2008-07-27 03:42:24 +04:00
|
|
|
#include "utils/config.h"
|
|
|
|
#ifdef WITH_GIF
|
|
|
|
|
2003-06-05 17:24:28 +04:00
|
|
|
#include <assert.h>
|
|
|
|
#include <string.h>
|
2003-07-19 01:02:29 +04:00
|
|
|
#include <stdbool.h>
|
2003-06-05 17:24:28 +04:00
|
|
|
#include <stdlib.h>
|
Merged revisions 4345-4346,4350-4351,4389,4391,4395,4401-4403,4423,4485-4486 via svnmerge from
svn://semichrome.net/branches/dynis/netsurf
........
r4345 | dynis | 2008-06-15 18:37:23 -0500 (Sun, 15 Jun 2008) | 1 line
Move NetSurf's gifread.h to libnsgif
........
r4346 | dynis | 2008-06-15 18:38:38 -0500 (Sun, 15 Jun 2008) | 1 line
Remove NetSurf's gifread.c (replaced by libnsgif)
........
r4350 | dynis | 2008-06-15 18:57:17 -0500 (Sun, 15 Jun 2008) | 1 line
Added references to libnsgif where necessary; corrected function calls where callbacks were implemented
........
r4351 | dynis | 2008-06-15 19:00:33 -0500 (Sun, 15 Jun 2008) | 1 line
Updated Makefile to compile with libnsgif
........
r4389 | dynis | 2008-06-18 13:58:51 -0500 (Wed, 18 Jun 2008) | 1 line
Altered bitmap callback table name for gif images to avoid ambiguity when bmp image library is created
........
r4391 | dynis | 2008-06-18 14:08:39 -0500 (Wed, 18 Jun 2008) | 1 line
Updated netsurf branch to use new bitmap callback table structure name that was altered in libnsgif
........
r4395 | dynis | 2008-06-18 14:54:51 -0500 (Wed, 18 Jun 2008) | 1 line
Corrected param comments for bitmap_set_suspendable()
........
r4401 | dynis | 2008-06-18 18:39:50 -0500 (Wed, 18 Jun 2008) | 1 line
Added references to libnsbmp where necessary; corrected function calls where callbacks were implemented
........
r4402 | dynis | 2008-06-18 18:40:47 -0500 (Wed, 18 Jun 2008) | 1 line
Updated Makefile to compile with libnsbmp
........
r4403 | dynis | 2008-06-18 18:41:53 -0500 (Wed, 18 Jun 2008) | 1 line
Remove NetSurf's bmpread.c and bmpread.h (replaced by libnsbmp)
........
r4423 | dynis | 2008-06-22 14:21:30 -0500 (Sun, 22 Jun 2008) | 1 line
Correct a silly mistake in nsbmp_bitmap_create
........
r4485 | dynis | 2008-07-01 04:13:48 -0500 (Tue, 01 Jul 2008) | 1 line
Integrated the latest versions of libnsgif and libnsbmp into NetSurf
........
r4486 | dynis | 2008-07-01 05:27:10 -0500 (Tue, 01 Jul 2008) | 1 line
Altered bitmap functions to receive void pointers for proper utilisation of libnsgif and libnsbmp
........
svn path=/trunk/netsurf/; revision=5071
2008-08-12 07:49:34 +04:00
|
|
|
#include <libnsgif.h>
|
|
|
|
#include "utils/config.h"
|
2010-03-28 16:56:39 +04:00
|
|
|
#include "content/content_protected.h"
|
2011-05-07 00:40:09 +04:00
|
|
|
#include "content/hlcache.h"
|
2007-05-31 02:39:54 +04:00
|
|
|
#include "desktop/options.h"
|
|
|
|
#include "desktop/plotters.h"
|
|
|
|
#include "image/bitmap.h"
|
|
|
|
#include "image/gif.h"
|
|
|
|
#include "utils/log.h"
|
|
|
|
#include "utils/messages.h"
|
2011-03-14 01:50:54 +03:00
|
|
|
#include "utils/schedule.h"
|
2011-05-07 00:40:09 +04:00
|
|
|
#include "utils/talloc.h"
|
2007-05-31 02:39:54 +04:00
|
|
|
#include "utils/utils.h"
|
2003-06-05 17:24:28 +04:00
|
|
|
|
2011-05-07 00:40:09 +04:00
|
|
|
typedef struct nsgif_content {
|
|
|
|
struct content base;
|
|
|
|
|
|
|
|
struct gif_animation *gif; /**< GIF animation data */
|
|
|
|
int current_frame; /**< current frame to display [0...(max-1)] */
|
|
|
|
} nsgif_content;
|
|
|
|
|
2011-05-08 23:54:35 +04:00
|
|
|
static const char *nsgif_types[] = {
|
|
|
|
"image/gif"
|
|
|
|
};
|
2011-05-07 00:40:09 +04:00
|
|
|
|
2011-05-08 23:54:35 +04:00
|
|
|
static lwc_string *nsgif_mime_types[NOF_ELEMENTS(nsgif_types)];
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Callback for libnsgif; forwards the call to bitmap_create()
|
|
|
|
*
|
|
|
|
* \param width width of image in pixels
|
|
|
|
* \param height width of image in pixels
|
|
|
|
* \return an opaque struct bitmap, or NULL on memory exhaustion
|
|
|
|
*/
|
|
|
|
static void *nsgif_bitmap_create(int width, int height)
|
|
|
|
{
|
|
|
|
return bitmap_create(width, height, BITMAP_NEW);
|
|
|
|
}
|
Merged revisions 4345-4346,4350-4351,4389,4391,4395,4401-4403,4423,4485-4486 via svnmerge from
svn://semichrome.net/branches/dynis/netsurf
........
r4345 | dynis | 2008-06-15 18:37:23 -0500 (Sun, 15 Jun 2008) | 1 line
Move NetSurf's gifread.h to libnsgif
........
r4346 | dynis | 2008-06-15 18:38:38 -0500 (Sun, 15 Jun 2008) | 1 line
Remove NetSurf's gifread.c (replaced by libnsgif)
........
r4350 | dynis | 2008-06-15 18:57:17 -0500 (Sun, 15 Jun 2008) | 1 line
Added references to libnsgif where necessary; corrected function calls where callbacks were implemented
........
r4351 | dynis | 2008-06-15 19:00:33 -0500 (Sun, 15 Jun 2008) | 1 line
Updated Makefile to compile with libnsgif
........
r4389 | dynis | 2008-06-18 13:58:51 -0500 (Wed, 18 Jun 2008) | 1 line
Altered bitmap callback table name for gif images to avoid ambiguity when bmp image library is created
........
r4391 | dynis | 2008-06-18 14:08:39 -0500 (Wed, 18 Jun 2008) | 1 line
Updated netsurf branch to use new bitmap callback table structure name that was altered in libnsgif
........
r4395 | dynis | 2008-06-18 14:54:51 -0500 (Wed, 18 Jun 2008) | 1 line
Corrected param comments for bitmap_set_suspendable()
........
r4401 | dynis | 2008-06-18 18:39:50 -0500 (Wed, 18 Jun 2008) | 1 line
Added references to libnsbmp where necessary; corrected function calls where callbacks were implemented
........
r4402 | dynis | 2008-06-18 18:40:47 -0500 (Wed, 18 Jun 2008) | 1 line
Updated Makefile to compile with libnsbmp
........
r4403 | dynis | 2008-06-18 18:41:53 -0500 (Wed, 18 Jun 2008) | 1 line
Remove NetSurf's bmpread.c and bmpread.h (replaced by libnsbmp)
........
r4423 | dynis | 2008-06-22 14:21:30 -0500 (Sun, 22 Jun 2008) | 1 line
Correct a silly mistake in nsbmp_bitmap_create
........
r4485 | dynis | 2008-07-01 04:13:48 -0500 (Tue, 01 Jul 2008) | 1 line
Integrated the latest versions of libnsgif and libnsbmp into NetSurf
........
r4486 | dynis | 2008-07-01 05:27:10 -0500 (Tue, 01 Jul 2008) | 1 line
Altered bitmap functions to receive void pointers for proper utilisation of libnsgif and libnsbmp
........
svn path=/trunk/netsurf/; revision=5071
2008-08-12 07:49:34 +04:00
|
|
|
|
2008-08-24 16:40:35 +04:00
|
|
|
/* The Bitmap callbacks function table;
|
|
|
|
* necessary for interaction with nsgiflib.
|
|
|
|
*/
|
2011-05-08 23:54:35 +04:00
|
|
|
static gif_bitmap_callback_vt gif_bitmap_callbacks = {
|
Merged revisions 4345-4346,4350-4351,4389,4391,4395,4401-4403,4423,4485-4486 via svnmerge from
svn://semichrome.net/branches/dynis/netsurf
........
r4345 | dynis | 2008-06-15 18:37:23 -0500 (Sun, 15 Jun 2008) | 1 line
Move NetSurf's gifread.h to libnsgif
........
r4346 | dynis | 2008-06-15 18:38:38 -0500 (Sun, 15 Jun 2008) | 1 line
Remove NetSurf's gifread.c (replaced by libnsgif)
........
r4350 | dynis | 2008-06-15 18:57:17 -0500 (Sun, 15 Jun 2008) | 1 line
Added references to libnsgif where necessary; corrected function calls where callbacks were implemented
........
r4351 | dynis | 2008-06-15 19:00:33 -0500 (Sun, 15 Jun 2008) | 1 line
Updated Makefile to compile with libnsgif
........
r4389 | dynis | 2008-06-18 13:58:51 -0500 (Wed, 18 Jun 2008) | 1 line
Altered bitmap callback table name for gif images to avoid ambiguity when bmp image library is created
........
r4391 | dynis | 2008-06-18 14:08:39 -0500 (Wed, 18 Jun 2008) | 1 line
Updated netsurf branch to use new bitmap callback table structure name that was altered in libnsgif
........
r4395 | dynis | 2008-06-18 14:54:51 -0500 (Wed, 18 Jun 2008) | 1 line
Corrected param comments for bitmap_set_suspendable()
........
r4401 | dynis | 2008-06-18 18:39:50 -0500 (Wed, 18 Jun 2008) | 1 line
Added references to libnsbmp where necessary; corrected function calls where callbacks were implemented
........
r4402 | dynis | 2008-06-18 18:40:47 -0500 (Wed, 18 Jun 2008) | 1 line
Updated Makefile to compile with libnsbmp
........
r4403 | dynis | 2008-06-18 18:41:53 -0500 (Wed, 18 Jun 2008) | 1 line
Remove NetSurf's bmpread.c and bmpread.h (replaced by libnsbmp)
........
r4423 | dynis | 2008-06-22 14:21:30 -0500 (Sun, 22 Jun 2008) | 1 line
Correct a silly mistake in nsbmp_bitmap_create
........
r4485 | dynis | 2008-07-01 04:13:48 -0500 (Tue, 01 Jul 2008) | 1 line
Integrated the latest versions of libnsgif and libnsbmp into NetSurf
........
r4486 | dynis | 2008-07-01 05:27:10 -0500 (Tue, 01 Jul 2008) | 1 line
Altered bitmap functions to receive void pointers for proper utilisation of libnsgif and libnsbmp
........
svn path=/trunk/netsurf/; revision=5071
2008-08-12 07:49:34 +04:00
|
|
|
.bitmap_create = nsgif_bitmap_create,
|
|
|
|
.bitmap_destroy = bitmap_destroy,
|
|
|
|
.bitmap_get_buffer = bitmap_get_buffer,
|
|
|
|
.bitmap_set_opaque = bitmap_set_opaque,
|
|
|
|
.bitmap_test_opaque = bitmap_test_opaque,
|
|
|
|
.bitmap_modified = bitmap_modified
|
|
|
|
};
|
2003-06-05 17:24:28 +04:00
|
|
|
|
2011-05-08 23:54:35 +04:00
|
|
|
static nserror nsgif_create_gif_data(nsgif_content *c)
|
2011-05-07 00:40:09 +04:00
|
|
|
{
|
2011-05-08 23:54:35 +04:00
|
|
|
union content_msg_data msg_data;
|
2011-05-07 00:40:09 +04:00
|
|
|
|
2011-05-08 23:54:35 +04:00
|
|
|
/* Initialise our data structure */
|
|
|
|
c->gif = calloc(sizeof(gif_animation), 1);
|
|
|
|
if (c->gif == NULL) {
|
|
|
|
msg_data.error = messages_get("NoMemory");
|
|
|
|
content_broadcast(&c->base, CONTENT_MSG_ERROR, msg_data);
|
|
|
|
return NSERROR_NOMEM;
|
2011-05-07 00:40:09 +04:00
|
|
|
}
|
2011-05-08 23:54:35 +04:00
|
|
|
gif_create(c->gif, &gif_bitmap_callbacks);
|
2011-05-07 00:40:09 +04:00
|
|
|
return NSERROR_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-05-08 23:54:35 +04:00
|
|
|
static nserror nsgif_create(const content_handler *handler,
|
2011-05-07 00:40:09 +04:00
|
|
|
lwc_string *imime_type, const struct http_parameter *params,
|
|
|
|
llcache_handle *llcache, const char *fallback_charset,
|
|
|
|
bool quirks, struct content **c)
|
|
|
|
{
|
|
|
|
nsgif_content *result;
|
|
|
|
nserror error;
|
|
|
|
|
|
|
|
result = talloc_zero(0, nsgif_content);
|
|
|
|
if (result == NULL)
|
|
|
|
return NSERROR_NOMEM;
|
|
|
|
|
|
|
|
error = content__init(&result->base, handler, imime_type, params,
|
|
|
|
llcache, fallback_charset, quirks);
|
|
|
|
if (error != NSERROR_OK) {
|
|
|
|
talloc_free(result);
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
error = nsgif_create_gif_data(result);
|
|
|
|
if (error != NSERROR_OK) {
|
|
|
|
talloc_free(result);
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
*c = (struct content *) result;
|
|
|
|
|
|
|
|
return NSERROR_OK;
|
|
|
|
}
|
|
|
|
|
2011-05-08 23:54:35 +04:00
|
|
|
/**
|
|
|
|
* Performs any necessary animation.
|
|
|
|
*
|
|
|
|
* \param p The content to animate
|
|
|
|
*/
|
|
|
|
static void nsgif_animate(void *p)
|
2008-08-24 19:44:29 +04:00
|
|
|
{
|
2011-05-08 23:54:35 +04:00
|
|
|
nsgif_content *gif = p;
|
|
|
|
union content_msg_data data;
|
|
|
|
int delay;
|
|
|
|
int f;
|
2011-05-07 00:40:09 +04:00
|
|
|
|
2011-05-08 23:54:35 +04:00
|
|
|
/* Advance by a frame, updating the loop count accordingly */
|
|
|
|
gif->current_frame++;
|
|
|
|
if (gif->current_frame == (int)gif->gif->frame_count_partial) {
|
|
|
|
gif->current_frame = 0;
|
|
|
|
|
|
|
|
/* A loop count of 0 has a special meaning of infinite */
|
|
|
|
if (gif->gif->loop_count != 0) {
|
|
|
|
gif->gif->loop_count--;
|
|
|
|
if (gif->gif->loop_count == 0) {
|
|
|
|
gif->current_frame =
|
|
|
|
gif->gif->frame_count_partial - 1;
|
|
|
|
gif->gif->loop_count = -1;
|
|
|
|
}
|
|
|
|
}
|
2004-12-09 13:30:44 +03:00
|
|
|
}
|
2011-05-08 23:54:35 +04:00
|
|
|
|
|
|
|
/* Continue animating if we should */
|
|
|
|
if (gif->gif->loop_count >= 0) {
|
|
|
|
delay = gif->gif->frames[gif->current_frame].frame_delay;
|
|
|
|
if (delay < option_minimum_gif_delay)
|
|
|
|
delay = option_minimum_gif_delay;
|
|
|
|
schedule(delay, nsgif_animate, gif);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((!option_animate_images) ||
|
|
|
|
(!gif->gif->frames[gif->current_frame].display))
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* area within gif to redraw */
|
|
|
|
f = gif->current_frame;
|
|
|
|
data.redraw.x = gif->gif->frames[f].redraw_x;
|
|
|
|
data.redraw.y = gif->gif->frames[f].redraw_y;
|
|
|
|
data.redraw.width = gif->gif->frames[f].redraw_width;
|
|
|
|
data.redraw.height = gif->gif->frames[f].redraw_height;
|
|
|
|
|
|
|
|
/* redraw background (true) or plot on top (false) */
|
|
|
|
if (gif->current_frame > 0) {
|
|
|
|
data.redraw.full_redraw =
|
|
|
|
gif->gif->frames[f - 1].redraw_required;
|
|
|
|
/* previous frame needed clearing: expand the redraw area to
|
|
|
|
* cover it */
|
|
|
|
if (data.redraw.full_redraw) {
|
|
|
|
if (data.redraw.x >
|
|
|
|
(int)(gif->gif->frames[f - 1].redraw_x)) {
|
|
|
|
data.redraw.width += data.redraw.x -
|
|
|
|
gif->gif->frames[f - 1].redraw_x;
|
|
|
|
data.redraw.x =
|
|
|
|
gif->gif->frames[f - 1].redraw_x;
|
|
|
|
}
|
|
|
|
if (data.redraw.y >
|
|
|
|
(int)(gif->gif->frames[f - 1].redraw_y)) {
|
|
|
|
data.redraw.height += (data.redraw.y -
|
|
|
|
gif->gif->frames[f - 1].redraw_y);
|
|
|
|
data.redraw.y =
|
|
|
|
gif->gif->frames[f - 1].redraw_y;
|
|
|
|
}
|
|
|
|
if ((int)(gif->gif->frames[f - 1].redraw_x +
|
|
|
|
gif->gif->frames[f - 1].redraw_width) >
|
|
|
|
(data.redraw.x + data.redraw.width))
|
|
|
|
data.redraw.width =
|
|
|
|
gif->gif->frames[f - 1].redraw_x -
|
|
|
|
data.redraw.x +
|
|
|
|
gif->gif->frames[f - 1].redraw_width;
|
|
|
|
if ((int)(gif->gif->frames[f - 1].redraw_y +
|
|
|
|
gif->gif->frames[f - 1].redraw_height) >
|
|
|
|
(data.redraw.y + data.redraw.height))
|
|
|
|
data.redraw.height =
|
|
|
|
gif->gif->frames[f - 1].redraw_y -
|
|
|
|
data.redraw.y +
|
|
|
|
gif->gif->frames[f - 1].redraw_height;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* do advanced check */
|
|
|
|
if ((data.redraw.x == 0) && (data.redraw.y == 0) &&
|
|
|
|
(data.redraw.width == (int)(gif->gif->width)) &&
|
|
|
|
(data.redraw.height == (int)(gif->gif->height))) {
|
|
|
|
data.redraw.full_redraw = !gif->gif->frames[f].opaque;
|
|
|
|
} else {
|
|
|
|
data.redraw.full_redraw = true;
|
|
|
|
data.redraw.x = 0;
|
|
|
|
data.redraw.y = 0;
|
|
|
|
data.redraw.width = gif->gif->width;
|
|
|
|
data.redraw.height = gif->gif->height;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* other data */
|
|
|
|
data.redraw.object = (struct content *) gif;
|
|
|
|
data.redraw.object_x = 0;
|
|
|
|
data.redraw.object_y = 0;
|
|
|
|
data.redraw.object_width = gif->base.width;
|
|
|
|
data.redraw.object_height = gif->base.height;
|
|
|
|
|
|
|
|
content_broadcast(&gif->base, CONTENT_MSG_REDRAW, data);
|
2004-03-19 21:14:50 +03:00
|
|
|
}
|
|
|
|
|
2011-05-08 23:54:35 +04:00
|
|
|
static void nsgif_invalidate(void *bitmap, void *private_word)
|
|
|
|
{
|
|
|
|
struct gif_animation *gif = (struct gif_animation *)private_word;
|
|
|
|
|
|
|
|
gif->decoded_frame = -1;
|
|
|
|
}
|
2004-03-19 21:14:50 +03:00
|
|
|
|
2011-05-08 23:54:35 +04:00
|
|
|
static bool nsgif_convert(struct content *c)
|
2008-08-24 19:44:29 +04:00
|
|
|
{
|
2011-05-07 00:40:09 +04:00
|
|
|
nsgif_content *gif = (nsgif_content *) c;
|
2004-06-11 00:41:26 +04:00
|
|
|
int res;
|
|
|
|
union content_msg_data msg_data;
|
2010-03-28 16:56:39 +04:00
|
|
|
const char *data;
|
|
|
|
unsigned long size;
|
2010-04-03 15:55:28 +04:00
|
|
|
char title[100];
|
2004-04-25 03:42:32 +04:00
|
|
|
|
2008-08-24 16:40:35 +04:00
|
|
|
/* Get the animation */
|
2010-03-28 16:56:39 +04:00
|
|
|
data = content__get_source_data(c, &size);
|
|
|
|
|
2008-08-24 16:40:35 +04:00
|
|
|
/* Initialise the GIF */
|
Merged revisions 4345-4346,4350-4351,4389,4391,4395,4401-4403,4423,4485-4486 via svnmerge from
svn://semichrome.net/branches/dynis/netsurf
........
r4345 | dynis | 2008-06-15 18:37:23 -0500 (Sun, 15 Jun 2008) | 1 line
Move NetSurf's gifread.h to libnsgif
........
r4346 | dynis | 2008-06-15 18:38:38 -0500 (Sun, 15 Jun 2008) | 1 line
Remove NetSurf's gifread.c (replaced by libnsgif)
........
r4350 | dynis | 2008-06-15 18:57:17 -0500 (Sun, 15 Jun 2008) | 1 line
Added references to libnsgif where necessary; corrected function calls where callbacks were implemented
........
r4351 | dynis | 2008-06-15 19:00:33 -0500 (Sun, 15 Jun 2008) | 1 line
Updated Makefile to compile with libnsgif
........
r4389 | dynis | 2008-06-18 13:58:51 -0500 (Wed, 18 Jun 2008) | 1 line
Altered bitmap callback table name for gif images to avoid ambiguity when bmp image library is created
........
r4391 | dynis | 2008-06-18 14:08:39 -0500 (Wed, 18 Jun 2008) | 1 line
Updated netsurf branch to use new bitmap callback table structure name that was altered in libnsgif
........
r4395 | dynis | 2008-06-18 14:54:51 -0500 (Wed, 18 Jun 2008) | 1 line
Corrected param comments for bitmap_set_suspendable()
........
r4401 | dynis | 2008-06-18 18:39:50 -0500 (Wed, 18 Jun 2008) | 1 line
Added references to libnsbmp where necessary; corrected function calls where callbacks were implemented
........
r4402 | dynis | 2008-06-18 18:40:47 -0500 (Wed, 18 Jun 2008) | 1 line
Updated Makefile to compile with libnsbmp
........
r4403 | dynis | 2008-06-18 18:41:53 -0500 (Wed, 18 Jun 2008) | 1 line
Remove NetSurf's bmpread.c and bmpread.h (replaced by libnsbmp)
........
r4423 | dynis | 2008-06-22 14:21:30 -0500 (Sun, 22 Jun 2008) | 1 line
Correct a silly mistake in nsbmp_bitmap_create
........
r4485 | dynis | 2008-07-01 04:13:48 -0500 (Tue, 01 Jul 2008) | 1 line
Integrated the latest versions of libnsgif and libnsbmp into NetSurf
........
r4486 | dynis | 2008-07-01 05:27:10 -0500 (Tue, 01 Jul 2008) | 1 line
Altered bitmap functions to receive void pointers for proper utilisation of libnsgif and libnsbmp
........
svn path=/trunk/netsurf/; revision=5071
2008-08-12 07:49:34 +04:00
|
|
|
do {
|
2011-05-07 00:40:09 +04:00
|
|
|
res = gif_initialise(gif->gif, size, (unsigned char *) data);
|
2010-03-28 16:56:39 +04:00
|
|
|
if (res != GIF_OK && res != GIF_WORKING &&
|
|
|
|
res != GIF_INSUFFICIENT_FRAME_DATA) {
|
|
|
|
switch (res) {
|
|
|
|
case GIF_FRAME_DATA_ERROR:
|
|
|
|
case GIF_INSUFFICIENT_DATA:
|
|
|
|
case GIF_DATA_ERROR:
|
|
|
|
msg_data.error = messages_get("BadGIF");
|
|
|
|
break;
|
|
|
|
case GIF_INSUFFICIENT_MEMORY:
|
|
|
|
msg_data.error = messages_get("NoMemory");
|
|
|
|
break;
|
Merged revisions 4345-4346,4350-4351,4389,4391,4395,4401-4403,4423,4485-4486 via svnmerge from
svn://semichrome.net/branches/dynis/netsurf
........
r4345 | dynis | 2008-06-15 18:37:23 -0500 (Sun, 15 Jun 2008) | 1 line
Move NetSurf's gifread.h to libnsgif
........
r4346 | dynis | 2008-06-15 18:38:38 -0500 (Sun, 15 Jun 2008) | 1 line
Remove NetSurf's gifread.c (replaced by libnsgif)
........
r4350 | dynis | 2008-06-15 18:57:17 -0500 (Sun, 15 Jun 2008) | 1 line
Added references to libnsgif where necessary; corrected function calls where callbacks were implemented
........
r4351 | dynis | 2008-06-15 19:00:33 -0500 (Sun, 15 Jun 2008) | 1 line
Updated Makefile to compile with libnsgif
........
r4389 | dynis | 2008-06-18 13:58:51 -0500 (Wed, 18 Jun 2008) | 1 line
Altered bitmap callback table name for gif images to avoid ambiguity when bmp image library is created
........
r4391 | dynis | 2008-06-18 14:08:39 -0500 (Wed, 18 Jun 2008) | 1 line
Updated netsurf branch to use new bitmap callback table structure name that was altered in libnsgif
........
r4395 | dynis | 2008-06-18 14:54:51 -0500 (Wed, 18 Jun 2008) | 1 line
Corrected param comments for bitmap_set_suspendable()
........
r4401 | dynis | 2008-06-18 18:39:50 -0500 (Wed, 18 Jun 2008) | 1 line
Added references to libnsbmp where necessary; corrected function calls where callbacks were implemented
........
r4402 | dynis | 2008-06-18 18:40:47 -0500 (Wed, 18 Jun 2008) | 1 line
Updated Makefile to compile with libnsbmp
........
r4403 | dynis | 2008-06-18 18:41:53 -0500 (Wed, 18 Jun 2008) | 1 line
Remove NetSurf's bmpread.c and bmpread.h (replaced by libnsbmp)
........
r4423 | dynis | 2008-06-22 14:21:30 -0500 (Sun, 22 Jun 2008) | 1 line
Correct a silly mistake in nsbmp_bitmap_create
........
r4485 | dynis | 2008-07-01 04:13:48 -0500 (Tue, 01 Jul 2008) | 1 line
Integrated the latest versions of libnsgif and libnsbmp into NetSurf
........
r4486 | dynis | 2008-07-01 05:27:10 -0500 (Tue, 01 Jul 2008) | 1 line
Altered bitmap functions to receive void pointers for proper utilisation of libnsgif and libnsbmp
........
svn path=/trunk/netsurf/; revision=5071
2008-08-12 07:49:34 +04:00
|
|
|
}
|
2004-06-11 00:41:26 +04:00
|
|
|
content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
|
2004-06-12 00:59:53 +04:00
|
|
|
return false;
|
Merged revisions 4345-4346,4350-4351,4389,4391,4395,4401-4403,4423,4485-4486 via svnmerge from
svn://semichrome.net/branches/dynis/netsurf
........
r4345 | dynis | 2008-06-15 18:37:23 -0500 (Sun, 15 Jun 2008) | 1 line
Move NetSurf's gifread.h to libnsgif
........
r4346 | dynis | 2008-06-15 18:38:38 -0500 (Sun, 15 Jun 2008) | 1 line
Remove NetSurf's gifread.c (replaced by libnsgif)
........
r4350 | dynis | 2008-06-15 18:57:17 -0500 (Sun, 15 Jun 2008) | 1 line
Added references to libnsgif where necessary; corrected function calls where callbacks were implemented
........
r4351 | dynis | 2008-06-15 19:00:33 -0500 (Sun, 15 Jun 2008) | 1 line
Updated Makefile to compile with libnsgif
........
r4389 | dynis | 2008-06-18 13:58:51 -0500 (Wed, 18 Jun 2008) | 1 line
Altered bitmap callback table name for gif images to avoid ambiguity when bmp image library is created
........
r4391 | dynis | 2008-06-18 14:08:39 -0500 (Wed, 18 Jun 2008) | 1 line
Updated netsurf branch to use new bitmap callback table structure name that was altered in libnsgif
........
r4395 | dynis | 2008-06-18 14:54:51 -0500 (Wed, 18 Jun 2008) | 1 line
Corrected param comments for bitmap_set_suspendable()
........
r4401 | dynis | 2008-06-18 18:39:50 -0500 (Wed, 18 Jun 2008) | 1 line
Added references to libnsbmp where necessary; corrected function calls where callbacks were implemented
........
r4402 | dynis | 2008-06-18 18:40:47 -0500 (Wed, 18 Jun 2008) | 1 line
Updated Makefile to compile with libnsbmp
........
r4403 | dynis | 2008-06-18 18:41:53 -0500 (Wed, 18 Jun 2008) | 1 line
Remove NetSurf's bmpread.c and bmpread.h (replaced by libnsbmp)
........
r4423 | dynis | 2008-06-22 14:21:30 -0500 (Sun, 22 Jun 2008) | 1 line
Correct a silly mistake in nsbmp_bitmap_create
........
r4485 | dynis | 2008-07-01 04:13:48 -0500 (Tue, 01 Jul 2008) | 1 line
Integrated the latest versions of libnsgif and libnsbmp into NetSurf
........
r4486 | dynis | 2008-07-01 05:27:10 -0500 (Tue, 01 Jul 2008) | 1 line
Altered bitmap functions to receive void pointers for proper utilisation of libnsgif and libnsbmp
........
svn path=/trunk/netsurf/; revision=5071
2008-08-12 07:49:34 +04:00
|
|
|
}
|
2008-12-30 16:23:36 +03:00
|
|
|
} while (res != GIF_OK && res != GIF_INSUFFICIENT_FRAME_DATA);
|
2004-04-25 03:42:32 +04:00
|
|
|
|
2008-08-24 16:40:35 +04:00
|
|
|
/* Abort on bad GIFs */
|
2011-05-07 00:40:09 +04:00
|
|
|
if ((gif->gif->frame_count_partial == 0) || (gif->gif->width == 0) ||
|
|
|
|
(gif->gif->height == 0)) {
|
2004-06-11 00:41:26 +04:00
|
|
|
msg_data.error = messages_get("BadGIF");
|
|
|
|
content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
|
|
|
|
return false;
|
|
|
|
}
|
2004-05-09 20:12:24 +04:00
|
|
|
|
2008-08-24 16:40:35 +04:00
|
|
|
/* Store our content width and description */
|
2011-05-07 00:40:09 +04:00
|
|
|
c->width = gif->gif->width;
|
|
|
|
c->height = gif->gif->height;
|
2010-04-03 15:55:28 +04:00
|
|
|
snprintf(title, sizeof(title), messages_get("GIFTitle"),
|
|
|
|
c->width, c->height, size);
|
|
|
|
content__set_title(c, title);
|
2011-05-07 00:40:09 +04:00
|
|
|
c->size += (gif->gif->width * gif->gif->height * 4) + 16 + 44;
|
2004-03-19 21:14:50 +03:00
|
|
|
|
2008-08-24 16:40:35 +04:00
|
|
|
/* Schedule the animation if we have one */
|
2011-05-07 00:40:09 +04:00
|
|
|
gif->current_frame = 0;
|
|
|
|
if (gif->gif->frame_count_partial > 1)
|
|
|
|
schedule(gif->gif->frames[0].frame_delay, nsgif_animate, c);
|
2006-02-22 04:58:19 +03:00
|
|
|
else
|
2011-05-07 00:40:09 +04:00
|
|
|
bitmap_set_suspendable(gif->gif->frame_image, gif->gif,
|
|
|
|
nsgif_invalidate);
|
2004-03-19 21:14:50 +03:00
|
|
|
|
2008-08-24 16:40:35 +04:00
|
|
|
/* Exit as a success */
|
2011-05-07 00:40:09 +04:00
|
|
|
c->bitmap = gif->gif->frame_image;
|
2011-02-27 23:11:39 +03:00
|
|
|
content_set_ready(c);
|
|
|
|
content_set_done(c);
|
2008-03-10 15:41:41 +03:00
|
|
|
/* Done: update status bar */
|
|
|
|
content_set_status(c, "");
|
2004-06-11 00:41:26 +04:00
|
|
|
return true;
|
2003-06-05 17:24:28 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-05-08 23:54:35 +04:00
|
|
|
/**
|
|
|
|
* Updates the GIF bitmap to display the current frame
|
|
|
|
*
|
|
|
|
* \param c the content to update
|
|
|
|
*/
|
|
|
|
static gif_result nsgif_get_frame(struct content *c)
|
2008-08-24 19:44:29 +04:00
|
|
|
{
|
2011-05-07 00:40:09 +04:00
|
|
|
nsgif_content *gif = (nsgif_content *) c;
|
2011-05-08 23:54:35 +04:00
|
|
|
int previous_frame, current_frame, frame;
|
|
|
|
gif_result res = GIF_OK;
|
2011-05-07 00:40:09 +04:00
|
|
|
|
2011-05-08 23:54:35 +04:00
|
|
|
current_frame = gif->current_frame;
|
|
|
|
if (!option_animate_images)
|
|
|
|
current_frame = 0;
|
|
|
|
if (current_frame < gif->gif->decoded_frame)
|
|
|
|
previous_frame = 0;
|
|
|
|
else
|
|
|
|
previous_frame = gif->gif->decoded_frame + 1;
|
|
|
|
for (frame = previous_frame; frame <= current_frame; frame++)
|
|
|
|
res = gif_decode_frame(gif->gif, frame);
|
2004-03-18 00:05:44 +03:00
|
|
|
|
2011-05-08 23:54:35 +04:00
|
|
|
return res;
|
|
|
|
}
|
2004-03-18 00:05:44 +03:00
|
|
|
|
2011-06-29 00:17:39 +04:00
|
|
|
static bool nsgif_redraw(struct content *c, struct content_redraw_data *data,
|
2011-06-30 19:48:07 +04:00
|
|
|
const struct rect *clip, const struct redraw_context *ctx)
|
2008-08-24 19:44:29 +04:00
|
|
|
{
|
2011-05-07 00:40:09 +04:00
|
|
|
nsgif_content *gif = (nsgif_content *) c;
|
2009-06-30 17:02:23 +04:00
|
|
|
bitmap_flags_t flags = BITMAPF_NONE;
|
|
|
|
|
2011-05-07 00:40:09 +04:00
|
|
|
if (gif->current_frame != gif->gif->decoded_frame)
|
Merged revisions 4345-4346,4350-4351,4389,4391,4395,4401-4403,4423,4485-4486 via svnmerge from
svn://semichrome.net/branches/dynis/netsurf
........
r4345 | dynis | 2008-06-15 18:37:23 -0500 (Sun, 15 Jun 2008) | 1 line
Move NetSurf's gifread.h to libnsgif
........
r4346 | dynis | 2008-06-15 18:38:38 -0500 (Sun, 15 Jun 2008) | 1 line
Remove NetSurf's gifread.c (replaced by libnsgif)
........
r4350 | dynis | 2008-06-15 18:57:17 -0500 (Sun, 15 Jun 2008) | 1 line
Added references to libnsgif where necessary; corrected function calls where callbacks were implemented
........
r4351 | dynis | 2008-06-15 19:00:33 -0500 (Sun, 15 Jun 2008) | 1 line
Updated Makefile to compile with libnsgif
........
r4389 | dynis | 2008-06-18 13:58:51 -0500 (Wed, 18 Jun 2008) | 1 line
Altered bitmap callback table name for gif images to avoid ambiguity when bmp image library is created
........
r4391 | dynis | 2008-06-18 14:08:39 -0500 (Wed, 18 Jun 2008) | 1 line
Updated netsurf branch to use new bitmap callback table structure name that was altered in libnsgif
........
r4395 | dynis | 2008-06-18 14:54:51 -0500 (Wed, 18 Jun 2008) | 1 line
Corrected param comments for bitmap_set_suspendable()
........
r4401 | dynis | 2008-06-18 18:39:50 -0500 (Wed, 18 Jun 2008) | 1 line
Added references to libnsbmp where necessary; corrected function calls where callbacks were implemented
........
r4402 | dynis | 2008-06-18 18:40:47 -0500 (Wed, 18 Jun 2008) | 1 line
Updated Makefile to compile with libnsbmp
........
r4403 | dynis | 2008-06-18 18:41:53 -0500 (Wed, 18 Jun 2008) | 1 line
Remove NetSurf's bmpread.c and bmpread.h (replaced by libnsbmp)
........
r4423 | dynis | 2008-06-22 14:21:30 -0500 (Sun, 22 Jun 2008) | 1 line
Correct a silly mistake in nsbmp_bitmap_create
........
r4485 | dynis | 2008-07-01 04:13:48 -0500 (Tue, 01 Jul 2008) | 1 line
Integrated the latest versions of libnsgif and libnsbmp into NetSurf
........
r4486 | dynis | 2008-07-01 05:27:10 -0500 (Tue, 01 Jul 2008) | 1 line
Altered bitmap functions to receive void pointers for proper utilisation of libnsgif and libnsbmp
........
svn path=/trunk/netsurf/; revision=5071
2008-08-12 07:49:34 +04:00
|
|
|
if (nsgif_get_frame(c) != GIF_OK)
|
|
|
|
return false;
|
2009-06-30 17:02:23 +04:00
|
|
|
|
2011-05-07 00:40:09 +04:00
|
|
|
c->bitmap = gif->gif->frame_image;
|
2011-05-08 23:54:35 +04:00
|
|
|
|
2011-06-29 00:17:39 +04:00
|
|
|
if ((data->width == -1) && (data->height == -1))
|
2011-05-08 23:54:35 +04:00
|
|
|
return true;
|
2009-06-30 17:02:23 +04:00
|
|
|
|
2011-06-29 00:17:39 +04:00
|
|
|
if (data->repeat_x)
|
2009-06-30 17:02:23 +04:00
|
|
|
flags |= BITMAPF_REPEAT_X;
|
2011-06-29 00:17:39 +04:00
|
|
|
if (data->repeat_y)
|
2009-06-30 17:02:23 +04:00
|
|
|
flags |= BITMAPF_REPEAT_Y;
|
|
|
|
|
2011-06-30 19:48:07 +04:00
|
|
|
return ctx->plot->bitmap(data->x, data->y, data->width, data->height,
|
2011-06-29 00:17:39 +04:00
|
|
|
c->bitmap, data->background_colour, flags);
|
2006-02-21 23:49:12 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-05-08 23:54:35 +04:00
|
|
|
static void nsgif_destroy(struct content *c)
|
2004-03-21 15:57:14 +03:00
|
|
|
{
|
2011-05-07 00:40:09 +04:00
|
|
|
nsgif_content *gif = (nsgif_content *) c;
|
|
|
|
|
2008-08-24 16:40:35 +04:00
|
|
|
/* Free all the associated memory buffers */
|
2004-03-21 15:57:14 +03:00
|
|
|
schedule_remove(nsgif_animate, c);
|
2011-05-07 00:40:09 +04:00
|
|
|
gif_finalise(gif->gif);
|
|
|
|
free(gif->gif);
|
2004-03-18 00:05:44 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-05-08 23:54:35 +04:00
|
|
|
static nserror nsgif_clone(const struct content *old, struct content **newc)
|
2010-04-04 16:41:19 +04:00
|
|
|
{
|
2011-05-07 00:40:09 +04:00
|
|
|
nsgif_content *gif;
|
|
|
|
nserror error;
|
|
|
|
|
|
|
|
gif = talloc_zero(0, nsgif_content);
|
|
|
|
if (gif == NULL)
|
|
|
|
return NSERROR_NOMEM;
|
|
|
|
|
|
|
|
error = content__clone(old, &gif->base);
|
|
|
|
if (error != NSERROR_OK) {
|
|
|
|
content_destroy(&gif->base);
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2010-04-04 16:41:19 +04:00
|
|
|
/* Simply replay creation and conversion of content */
|
2011-05-07 00:40:09 +04:00
|
|
|
error = nsgif_create_gif_data(gif);
|
|
|
|
if (error != NSERROR_OK) {
|
|
|
|
content_destroy(&gif->base);
|
|
|
|
return error;
|
|
|
|
}
|
2010-04-04 16:41:19 +04:00
|
|
|
|
|
|
|
if (old->status == CONTENT_STATUS_READY ||
|
|
|
|
old->status == CONTENT_STATUS_DONE) {
|
2011-05-07 00:40:09 +04:00
|
|
|
if (nsgif_convert(&gif->base) == false) {
|
|
|
|
content_destroy(&gif->base);
|
|
|
|
return NSERROR_CLONE_FAILED;
|
|
|
|
}
|
2010-04-04 16:41:19 +04:00
|
|
|
}
|
|
|
|
|
2011-05-07 00:40:09 +04:00
|
|
|
*newc = (struct content *) gif;
|
|
|
|
|
|
|
|
return NSERROR_OK;
|
2010-04-04 16:41:19 +04:00
|
|
|
}
|
|
|
|
|
2011-05-08 23:54:35 +04:00
|
|
|
static content_type nsgif_content_type(lwc_string *mime_type)
|
2011-05-07 00:40:09 +04:00
|
|
|
{
|
|
|
|
return CONTENT_IMAGE;
|
|
|
|
}
|
2010-04-04 16:41:19 +04:00
|
|
|
|
2004-11-10 02:34:01 +03:00
|
|
|
|
2011-05-08 23:54:35 +04:00
|
|
|
static const content_handler nsgif_content_handler = {
|
2011-05-09 19:32:34 +04:00
|
|
|
.create = nsgif_create,
|
|
|
|
.data_complete = nsgif_convert,
|
|
|
|
.destroy = nsgif_destroy,
|
|
|
|
.redraw = nsgif_redraw,
|
|
|
|
.clone = nsgif_clone,
|
|
|
|
.type = nsgif_content_type,
|
|
|
|
.no_share = false,
|
2011-05-08 23:54:35 +04:00
|
|
|
};
|
2004-11-10 02:34:01 +03:00
|
|
|
|
2011-05-08 23:54:35 +04:00
|
|
|
nserror nsgif_init(void)
|
2004-03-21 15:50:10 +03:00
|
|
|
{
|
2011-05-08 23:54:35 +04:00
|
|
|
uint32_t i;
|
|
|
|
lwc_error lerror;
|
|
|
|
nserror error;
|
2004-05-11 02:53:36 +04:00
|
|
|
|
2011-05-08 23:54:35 +04:00
|
|
|
for (i = 0; i < NOF_ELEMENTS(nsgif_mime_types); i++) {
|
|
|
|
lerror = lwc_intern_string(nsgif_types[i],
|
|
|
|
strlen(nsgif_types[i]),
|
|
|
|
&nsgif_mime_types[i]);
|
|
|
|
if (lerror != lwc_error_ok) {
|
|
|
|
error = NSERROR_NOMEM;
|
|
|
|
goto error;
|
2004-05-11 02:14:33 +04:00
|
|
|
}
|
2004-03-21 15:50:10 +03:00
|
|
|
|
2011-05-08 23:54:35 +04:00
|
|
|
error = content_factory_register_handler(nsgif_mime_types[i],
|
|
|
|
&nsgif_content_handler);
|
|
|
|
if (error != NSERROR_OK)
|
|
|
|
goto error;
|
2004-05-11 02:14:33 +04:00
|
|
|
}
|
2004-03-21 15:50:10 +03:00
|
|
|
|
2011-05-08 23:54:35 +04:00
|
|
|
return NSERROR_OK;
|
2004-04-25 03:42:32 +04:00
|
|
|
|
2011-05-08 23:54:35 +04:00
|
|
|
error:
|
|
|
|
nsgif_fini();
|
2004-05-25 00:50:57 +04:00
|
|
|
|
2011-05-08 23:54:35 +04:00
|
|
|
return error;
|
2004-03-21 15:50:10 +03:00
|
|
|
}
|
|
|
|
|
2011-05-08 23:54:35 +04:00
|
|
|
void nsgif_fini(void)
|
2008-08-24 19:44:29 +04:00
|
|
|
{
|
2011-05-08 23:54:35 +04:00
|
|
|
uint32_t i;
|
|
|
|
|
|
|
|
for (i = 0; i < NOF_ELEMENTS(nsgif_mime_types); i++) {
|
|
|
|
if (nsgif_mime_types[i] != NULL)
|
|
|
|
lwc_string_unref(nsgif_mime_types[i]);
|
|
|
|
}
|
Merged revisions 4345-4346,4350-4351,4389,4391,4395,4401-4403,4423,4485-4486 via svnmerge from
svn://semichrome.net/branches/dynis/netsurf
........
r4345 | dynis | 2008-06-15 18:37:23 -0500 (Sun, 15 Jun 2008) | 1 line
Move NetSurf's gifread.h to libnsgif
........
r4346 | dynis | 2008-06-15 18:38:38 -0500 (Sun, 15 Jun 2008) | 1 line
Remove NetSurf's gifread.c (replaced by libnsgif)
........
r4350 | dynis | 2008-06-15 18:57:17 -0500 (Sun, 15 Jun 2008) | 1 line
Added references to libnsgif where necessary; corrected function calls where callbacks were implemented
........
r4351 | dynis | 2008-06-15 19:00:33 -0500 (Sun, 15 Jun 2008) | 1 line
Updated Makefile to compile with libnsgif
........
r4389 | dynis | 2008-06-18 13:58:51 -0500 (Wed, 18 Jun 2008) | 1 line
Altered bitmap callback table name for gif images to avoid ambiguity when bmp image library is created
........
r4391 | dynis | 2008-06-18 14:08:39 -0500 (Wed, 18 Jun 2008) | 1 line
Updated netsurf branch to use new bitmap callback table structure name that was altered in libnsgif
........
r4395 | dynis | 2008-06-18 14:54:51 -0500 (Wed, 18 Jun 2008) | 1 line
Corrected param comments for bitmap_set_suspendable()
........
r4401 | dynis | 2008-06-18 18:39:50 -0500 (Wed, 18 Jun 2008) | 1 line
Added references to libnsbmp where necessary; corrected function calls where callbacks were implemented
........
r4402 | dynis | 2008-06-18 18:40:47 -0500 (Wed, 18 Jun 2008) | 1 line
Updated Makefile to compile with libnsbmp
........
r4403 | dynis | 2008-06-18 18:41:53 -0500 (Wed, 18 Jun 2008) | 1 line
Remove NetSurf's bmpread.c and bmpread.h (replaced by libnsbmp)
........
r4423 | dynis | 2008-06-22 14:21:30 -0500 (Sun, 22 Jun 2008) | 1 line
Correct a silly mistake in nsbmp_bitmap_create
........
r4485 | dynis | 2008-07-01 04:13:48 -0500 (Tue, 01 Jul 2008) | 1 line
Integrated the latest versions of libnsgif and libnsbmp into NetSurf
........
r4486 | dynis | 2008-07-01 05:27:10 -0500 (Tue, 01 Jul 2008) | 1 line
Altered bitmap functions to receive void pointers for proper utilisation of libnsgif and libnsbmp
........
svn path=/trunk/netsurf/; revision=5071
2008-08-12 07:49:34 +04:00
|
|
|
}
|
|
|
|
|
2004-01-05 05:10:59 +03:00
|
|
|
#endif
|