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"
|
2007-05-31 02:39:54 +04:00
|
|
|
#include "content/content.h"
|
|
|
|
#include "desktop/browser.h"
|
|
|
|
#include "desktop/options.h"
|
|
|
|
#include "desktop/plotters.h"
|
|
|
|
#include "image/bitmap.h"
|
|
|
|
#include "image/gif.h"
|
|
|
|
#include "utils/log.h"
|
|
|
|
#include "utils/messages.h"
|
|
|
|
#include "utils/utils.h"
|
2003-06-05 17:24:28 +04:00
|
|
|
|
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
|
|
|
static void nsgif_invalidate(void *bitmap, void *private_word);
|
2004-03-21 15:50:10 +03:00
|
|
|
static void nsgif_animate(void *p);
|
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
|
|
|
static gif_result nsgif_get_frame(struct content *c);
|
|
|
|
|
2008-08-24 16:40:35 +04:00
|
|
|
/* The Bitmap callbacks function table;
|
|
|
|
* necessary for interaction with nsgiflib.
|
|
|
|
*/
|
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
|
|
|
gif_bitmap_callback_vt gif_bitmap_callbacks = {
|
|
|
|
.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
|
|
|
|
|
|
|
|
2008-08-24 19:44:29 +04:00
|
|
|
bool nsgif_create(struct content *c, const char *params[])
|
|
|
|
{
|
2004-06-11 00:41:26 +04:00
|
|
|
union content_msg_data msg_data;
|
2008-08-24 16:40:35 +04:00
|
|
|
/* Initialise our data structure */
|
2004-12-09 13:30:44 +03:00
|
|
|
c->data.gif.gif = calloc(sizeof(gif_animation), 1);
|
|
|
|
if (!c->data.gif.gif) {
|
2004-06-11 00:41:26 +04:00
|
|
|
msg_data.error = messages_get("NoMemory");
|
|
|
|
content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
|
2004-12-09 13:30:44 +03: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
|
|
|
gif_create(c->data.gif.gif, &gif_bitmap_callbacks);
|
2004-06-11 00:41:26 +04:00
|
|
|
return true;
|
2004-03-19 21:14:50 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-08-24 19:44:29 +04:00
|
|
|
bool nsgif_convert(struct content *c, int iwidth, int iheight)
|
|
|
|
{
|
2004-06-11 00:41:26 +04:00
|
|
|
int res;
|
2004-04-07 03:13:25 +04:00
|
|
|
struct gif_animation *gif;
|
2004-06-11 00:41:26 +04:00
|
|
|
union content_msg_data msg_data;
|
2004-04-25 03:42:32 +04:00
|
|
|
|
2008-08-24 16:40:35 +04:00
|
|
|
/* Get the animation */
|
2004-04-07 03:13:25 +04:00
|
|
|
gif = c->data.gif.gif;
|
2004-04-25 03:42:32 +04:00
|
|
|
|
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 {
|
2008-08-24 16:40:35 +04:00
|
|
|
res = gif_initialise(gif, c->source_size,
|
|
|
|
(unsigned char *)c->source_data);
|
2008-12-30 16:23:36 +03:00
|
|
|
if (res != GIF_OK && res != GIF_WORKING && res != GIF_INSUFFICIENT_FRAME_DATA) {
|
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
|
|
|
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:
|
2008-08-24 19:44:29 +04:00
|
|
|
msg_data.error = messages_get(
|
|
|
|
"NoMemory");
|
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
|
|
|
break;
|
|
|
|
}
|
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 */
|
2004-06-11 00:41:26 +04:00
|
|
|
if ((gif->frame_count_partial == 0) || (gif->width == 0) ||
|
|
|
|
(gif->height == 0)) {
|
|
|
|
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 */
|
2004-04-07 03:13:25 +04:00
|
|
|
c->width = gif->width;
|
|
|
|
c->height = gif->height;
|
2004-06-12 00:59:53 +04:00
|
|
|
c->title = malloc(100);
|
2008-08-24 16:40:35 +04:00
|
|
|
if (c->title) {
|
|
|
|
snprintf(c->title, 100, messages_get("GIFTitle"), c->width,
|
|
|
|
c->height, c->source_size);
|
|
|
|
}
|
2004-06-24 20:54:28 +04:00
|
|
|
c->size += (gif->width * gif->height * 4) + 16 + 44 + 100;
|
2004-03-19 21:14:50 +03:00
|
|
|
|
2008-08-24 16:40:35 +04:00
|
|
|
/* Schedule the animation if we have one */
|
2006-01-25 02:06:36 +03:00
|
|
|
c->data.gif.current_frame = 0;
|
2004-12-09 13:30:44 +03:00
|
|
|
if (gif->frame_count_partial > 1)
|
2004-05-09 20:12:24 +04:00
|
|
|
schedule(gif->frames[0].frame_delay, nsgif_animate, c);
|
2006-02-22 04:58:19 +03:00
|
|
|
else
|
|
|
|
bitmap_set_suspendable(gif->frame_image, gif, nsgif_invalidate);
|
2004-03-19 21:14:50 +03:00
|
|
|
|
2008-08-24 16:40:35 +04:00
|
|
|
/* Exit as a success */
|
2004-10-05 03:54:42 +04:00
|
|
|
c->bitmap = gif->frame_image;
|
2004-04-07 03:13:25 +04:00
|
|
|
c->status = CONTENT_STATUS_DONE;
|
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
|
|
|
}
|
|
|
|
|
2008-08-24 19:44:29 +04:00
|
|
|
void nsgif_invalidate(void *bitmap, void *private_word)
|
|
|
|
{
|
2006-02-22 04:58:19 +03:00
|
|
|
struct gif_animation *gif = (struct gif_animation *)private_word;
|
2006-11-27 18:35:18 +03:00
|
|
|
|
2006-02-22 04:58:19 +03:00
|
|
|
gif->decoded_frame = -1;
|
|
|
|
}
|
2003-06-05 17:24:28 +04:00
|
|
|
|
2004-08-11 20:26:13 +04:00
|
|
|
bool nsgif_redraw(struct content *c, int x, int y,
|
2004-06-11 00:41:26 +04:00
|
|
|
int width, int height,
|
|
|
|
int clip_x0, int clip_y0, int clip_x1, int clip_y1,
|
2008-09-29 02:37:13 +04:00
|
|
|
float scale, colour background_colour)
|
2008-08-24 19:44:29 +04:00
|
|
|
{
|
2004-12-09 13:30:44 +03:00
|
|
|
if (c->data.gif.current_frame != c->data.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;
|
2004-10-05 03:54:42 +04:00
|
|
|
c->bitmap = c->data.gif.gif->frame_image;
|
2008-08-24 19:44:29 +04:00
|
|
|
return plot.bitmap(x, y, width, height, c->bitmap,
|
|
|
|
background_colour, c);
|
2004-03-18 00:05:44 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-02-21 23:49:12 +03:00
|
|
|
bool nsgif_redraw_tiled(struct content *c, int x, int y,
|
|
|
|
int width, int height,
|
|
|
|
int clip_x0, int clip_y0, int clip_x1, int clip_y1,
|
2008-09-29 02:37:13 +04:00
|
|
|
float scale, colour background_colour,
|
2008-08-24 19:44:29 +04:00
|
|
|
bool repeat_x, bool repeat_y)
|
|
|
|
{
|
2006-02-21 23:49:12 +03:00
|
|
|
if (c->data.gif.current_frame != c->data.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;
|
2006-02-21 23:49:12 +03:00
|
|
|
c->bitmap = c->data.gif.gif->frame_image;
|
2008-08-24 16:40:35 +04:00
|
|
|
return plot.bitmap_tile(x, y, width, height, c->bitmap,
|
|
|
|
background_colour, repeat_x, repeat_y, c);
|
2006-02-21 23:49:12 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-03-21 15:57:14 +03:00
|
|
|
void nsgif_destroy(struct 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);
|
2004-04-07 03:13:25 +04:00
|
|
|
gif_finalise(c->data.gif.gif);
|
2004-06-11 00:41:26 +04:00
|
|
|
free(c->data.gif.gif);
|
2004-10-05 19:42:15 +04:00
|
|
|
free(c->title);
|
2004-03-18 00:05:44 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-11-10 02:34:01 +03:00
|
|
|
/**
|
|
|
|
* Updates the GIF bitmap to display the current frame
|
|
|
|
*
|
|
|
|
* \param c the content to update
|
|
|
|
*/
|
2008-08-24 19:44:29 +04:00
|
|
|
gif_result nsgif_get_frame(struct content *c)
|
|
|
|
{
|
2004-12-09 13:30:44 +03:00
|
|
|
int previous_frame, current_frame, frame;
|
2008-08-24 16:52:38 +04:00
|
|
|
gif_result res = GIF_OK;
|
2004-11-10 02:34:01 +03:00
|
|
|
|
|
|
|
current_frame = c->data.gif.current_frame;
|
2004-12-09 13:30:44 +03:00
|
|
|
if (!option_animate_images)
|
|
|
|
current_frame = 0;
|
|
|
|
if (current_frame < c->data.gif.gif->decoded_frame)
|
2004-11-10 02:34:01 +03:00
|
|
|
previous_frame = 0;
|
2004-12-09 13:30:44 +03:00
|
|
|
else
|
2004-11-10 02:34:01 +03:00
|
|
|
previous_frame = c->data.gif.gif->decoded_frame + 1;
|
|
|
|
for (frame = previous_frame; frame <= current_frame; frame++)
|
2008-08-24 16:52:38 +04:00
|
|
|
res = gif_decode_frame(c->data.gif.gif, frame);
|
|
|
|
|
|
|
|
return res;
|
2004-11-10 02:34:01 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-08-24 16:40:35 +04:00
|
|
|
/**
|
|
|
|
* Performs any necessary animation.
|
|
|
|
*
|
|
|
|
* \param p The content to animate
|
2004-03-13 21:22:22 +03:00
|
|
|
*/
|
2004-03-21 15:50:10 +03:00
|
|
|
void nsgif_animate(void *p)
|
|
|
|
{
|
|
|
|
struct content *c = p;
|
2004-04-25 03:42:32 +04:00
|
|
|
union content_msg_data data;
|
2005-02-01 04:00:31 +03:00
|
|
|
struct gif_animation *gif;
|
2004-05-25 00:50:57 +04:00
|
|
|
int delay;
|
2005-02-01 04:00:31 +03:00
|
|
|
int f;
|
2006-11-27 18:35:18 +03:00
|
|
|
|
2008-08-24 16:40:35 +04:00
|
|
|
/* Advance by a frame, updating the loop count accordingly */
|
2005-02-01 04:00:31 +03:00
|
|
|
gif = c->data.gif.gif;
|
2004-03-21 15:50:10 +03:00
|
|
|
c->data.gif.current_frame++;
|
2005-02-01 04:00:31 +03:00
|
|
|
if (c->data.gif.current_frame == (int)gif->frame_count_partial) {
|
2004-05-10 01:05:24 +04:00
|
|
|
c->data.gif.current_frame = 0;
|
2004-05-11 02:53:36 +04:00
|
|
|
|
2008-08-24 16:40:35 +04:00
|
|
|
/* A loop count of 0 has a special meaning of infinite */
|
2005-02-01 19:55:11 +03:00
|
|
|
if (gif->loop_count != 0) {
|
2005-02-01 04:00:31 +03:00
|
|
|
gif->loop_count--;
|
|
|
|
if (gif->loop_count == 0) {
|
2008-08-24 16:40:35 +04:00
|
|
|
c->data.gif.current_frame =
|
|
|
|
gif->frame_count_partial - 1;
|
2005-02-01 04:00:31 +03:00
|
|
|
gif->loop_count = -1;
|
2004-05-11 02:14:33 +04:00
|
|
|
}
|
|
|
|
}
|
2004-03-21 15:50:10 +03:00
|
|
|
}
|
|
|
|
|
2008-08-24 16:40:35 +04:00
|
|
|
/* Continue animating if we should */
|
2005-02-01 19:55:11 +03:00
|
|
|
if (gif->loop_count >= 0) {
|
2005-02-01 04:00:31 +03:00
|
|
|
delay = gif->frames[c->data.gif.current_frame].frame_delay;
|
2004-12-09 13:30:44 +03:00
|
|
|
if (delay < option_minimum_gif_delay)
|
|
|
|
delay = option_minimum_gif_delay;
|
2004-05-25 00:50:57 +04:00
|
|
|
schedule(delay, nsgif_animate, c);
|
2004-05-11 02:14:33 +04:00
|
|
|
}
|
2004-03-21 15:50:10 +03:00
|
|
|
|
2008-08-24 16:40:35 +04:00
|
|
|
if ((!option_animate_images) ||
|
|
|
|
(!gif->frames[c->data.gif.current_frame].display))
|
2004-12-09 13:30:44 +03:00
|
|
|
return;
|
|
|
|
|
2004-05-10 01:05:24 +04:00
|
|
|
/* area within gif to redraw */
|
2005-02-01 04:00:31 +03:00
|
|
|
f = c->data.gif.current_frame;
|
|
|
|
data.redraw.x = gif->frames[f].redraw_x;
|
|
|
|
data.redraw.y = gif->frames[f].redraw_y;
|
|
|
|
data.redraw.width = gif->frames[f].redraw_width;
|
|
|
|
data.redraw.height = gif->frames[f].redraw_height;
|
2004-04-25 03:42:32 +04:00
|
|
|
|
|
|
|
/* redraw background (true) or plot on top (false) */
|
2004-07-27 02:23:40 +04:00
|
|
|
if (c->data.gif.current_frame > 0) {
|
2005-02-01 04:00:31 +03:00
|
|
|
data.redraw.full_redraw = gif->frames[f - 1].redraw_required;
|
2008-08-24 16:40:35 +04:00
|
|
|
/* previous frame needed clearing: expand the redraw area to
|
|
|
|
* cover it */
|
2005-02-01 04:00:31 +03:00
|
|
|
if (data.redraw.full_redraw) {
|
|
|
|
if (data.redraw.x > gif->frames[f - 1].redraw_x) {
|
2008-08-24 16:40:35 +04:00
|
|
|
data.redraw.width += data.redraw.x -
|
|
|
|
gif->frames[f - 1].redraw_x;
|
2005-02-01 04:00:31 +03:00
|
|
|
data.redraw.x = gif->frames[f - 1].redraw_x;
|
|
|
|
}
|
|
|
|
if (data.redraw.y > gif->frames[f - 1].redraw_y) {
|
2008-08-24 16:40:35 +04:00
|
|
|
data.redraw.height += (data.redraw.y -
|
|
|
|
gif->frames[f - 1].redraw_y);
|
2005-02-01 04:00:31 +03:00
|
|
|
data.redraw.y = gif->frames[f - 1].redraw_y;
|
|
|
|
}
|
2008-08-24 16:40:35 +04:00
|
|
|
if ((gif->frames[f - 1].redraw_x +
|
|
|
|
gif->frames[f - 1].redraw_width) >
|
2005-02-01 04:00:31 +03:00
|
|
|
(data.redraw.x + data.redraw.width))
|
2008-08-24 16:40:35 +04:00
|
|
|
data.redraw.width =
|
|
|
|
gif->frames[f - 1].redraw_x -
|
|
|
|
data.redraw.x +
|
2005-02-01 04:00:31 +03:00
|
|
|
gif->frames[f - 1].redraw_width;
|
2008-08-24 16:40:35 +04:00
|
|
|
if ((gif->frames[f - 1].redraw_y +
|
|
|
|
gif->frames[f - 1].redraw_height) >
|
2005-02-01 04:00:31 +03:00
|
|
|
(data.redraw.y + data.redraw.height))
|
2008-08-24 16:40:35 +04:00
|
|
|
data.redraw.height =
|
|
|
|
gif->frames[f - 1].redraw_y -
|
|
|
|
data.redraw.y +
|
2008-08-24 19:44:29 +04:00
|
|
|
gif->frames[f - 1].
|
|
|
|
redraw_height;
|
2005-02-01 04:00:31 +03:00
|
|
|
}
|
2004-07-27 02:23:40 +04:00
|
|
|
} else {
|
2004-11-10 22:51:32 +03:00
|
|
|
/* do advanced check */
|
2005-01-23 18:20:45 +03:00
|
|
|
if ((data.redraw.x == 0) && (data.redraw.y == 0) &&
|
2005-02-01 19:55:11 +03:00
|
|
|
(data.redraw.width == gif->width) &&
|
|
|
|
(data.redraw.height == gif->height)) {
|
|
|
|
data.redraw.full_redraw = !gif->frames[f].opaque;
|
|
|
|
} else {
|
2005-01-23 18:20:45 +03:00
|
|
|
data.redraw.full_redraw = true;
|
|
|
|
data.redraw.x = 0;
|
|
|
|
data.redraw.y = 0;
|
2005-02-01 19:55:11 +03:00
|
|
|
data.redraw.width = gif->width;
|
|
|
|
data.redraw.height = gif->height;
|
2005-01-23 18:20:45 +03:00
|
|
|
}
|
2004-07-27 02:23:40 +04:00
|
|
|
}
|
2004-04-25 03:42:32 +04:00
|
|
|
|
|
|
|
/* other data */
|
|
|
|
data.redraw.object = c;
|
|
|
|
data.redraw.object_x = 0;
|
|
|
|
data.redraw.object_y = 0;
|
2004-04-26 17:47:51 +04:00
|
|
|
data.redraw.object_width = c->width;
|
|
|
|
data.redraw.object_height = c->height;
|
2004-05-25 00:50:57 +04:00
|
|
|
|
2004-04-25 03:42:32 +04:00
|
|
|
content_broadcast(c, CONTENT_MSG_REDRAW, data);
|
2004-03-21 15:50:10 +03:00
|
|
|
}
|
|
|
|
|
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
|
|
|
|
|
|
|
/**
|
|
|
|
* 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
|
|
|
|
*/
|
2008-08-24 19:44:29 +04:00
|
|
|
void *nsgif_bitmap_create(int width, int height)
|
|
|
|
{
|
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
|
|
|
return bitmap_create(width, height, BITMAP_NEW);
|
|
|
|
}
|
|
|
|
|
2004-01-05 05:10:59 +03:00
|
|
|
#endif
|