1999-12-04 18:17:52 +00:00
|
|
|
|
/* GdkPixbuf library - Windows Icon/Cursor image loader
|
1999-11-29 16:49:39 +00:00
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 1999 The Free Software Foundation
|
|
|
|
|
*
|
|
|
|
|
* Authors: Arjan van de Ven <arjan@fenrus.demon.nl>
|
|
|
|
|
* Federico Mena-Quintero <federico@gimp.org>
|
|
|
|
|
*
|
|
|
|
|
* Based on io-bmp.c
|
|
|
|
|
*
|
|
|
|
|
* This library is free software; you can redistribute it and/or
|
2000-07-26 11:33:08 +00:00
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
1999-11-29 16:49:39 +00:00
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This library 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
|
2000-07-26 11:33:08 +00:00
|
|
|
|
* Lesser General Public License for more details.
|
1999-11-29 16:49:39 +00:00
|
|
|
|
*
|
2000-07-26 11:33:08 +00:00
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
1999-11-29 16:49:39 +00:00
|
|
|
|
* License along with this library; if not, write to the
|
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
|
* Boston, MA 02111-1307, USA.
|
|
|
|
|
*/
|
|
|
|
|
|
1999-12-04 18:17:52 +00:00
|
|
|
|
#undef DUMPBIH
|
1999-11-29 16:49:39 +00:00
|
|
|
|
/*
|
|
|
|
|
|
|
|
|
|
Icons are just like BMP's, except for the header.
|
|
|
|
|
|
|
|
|
|
Known bugs:
|
|
|
|
|
* bi-tonal files aren't tested
|
|
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#include <stdio.h>
|
2000-08-01 21:43:56 +00:00
|
|
|
|
#ifdef HAVE_UNISTD_H
|
1999-11-29 16:49:39 +00:00
|
|
|
|
#include <unistd.h>
|
2000-08-01 21:43:56 +00:00
|
|
|
|
#endif
|
1999-12-07 18:17:01 +00:00
|
|
|
|
#include <string.h>
|
2000-04-11 07:03:25 +00:00
|
|
|
|
#include "gdk-pixbuf-private.h"
|
1999-12-02 20:44:43 +00:00
|
|
|
|
#include "gdk-pixbuf-io.h"
|
1999-11-29 16:49:39 +00:00
|
|
|
|
|
2000-04-11 07:03:25 +00:00
|
|
|
|
|
1999-11-29 16:49:39 +00:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
|
|
|
|
These structures are actually dummies. These are according to
|
1999-12-04 18:17:52 +00:00
|
|
|
|
the "Windows API reference guide volume II" as written by
|
|
|
|
|
Borland International, but GCC fiddles with the alignment of
|
|
|
|
|
the internal members.
|
1999-11-29 16:49:39 +00:00
|
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
struct BitmapFileHeader {
|
|
|
|
|
gushort bfType;
|
|
|
|
|
guint bfSize;
|
|
|
|
|
guint reserverd;
|
|
|
|
|
guint bfOffbits;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct BitmapInfoHeader {
|
|
|
|
|
guint biSize;
|
|
|
|
|
guint biWidth;
|
|
|
|
|
guint biHeight;
|
|
|
|
|
gushort biPlanes;
|
|
|
|
|
gushort biBitCount;
|
|
|
|
|
guint biCompression;
|
|
|
|
|
guint biSizeImage;
|
|
|
|
|
guint biXPelsPerMeter;
|
|
|
|
|
guint biYPelsPerMeter;
|
|
|
|
|
guint biClrUsed;
|
|
|
|
|
guint biClrImportant;
|
|
|
|
|
};
|
|
|
|
|
|
1999-12-04 18:17:52 +00:00
|
|
|
|
#ifdef DUMPBIH
|
|
|
|
|
/*
|
|
|
|
|
|
|
|
|
|
DumpBIH printf's the values in a BitmapInfoHeader to the screen, for
|
|
|
|
|
debugging purposes.
|
|
|
|
|
|
|
|
|
|
*/
|
1999-11-29 16:49:39 +00:00
|
|
|
|
static void DumpBIH(unsigned char *BIH)
|
1999-12-04 18:17:52 +00:00
|
|
|
|
{
|
1999-11-29 16:49:39 +00:00
|
|
|
|
printf("biSize = %i \n",
|
1999-12-04 18:17:52 +00:00
|
|
|
|
(int)(BIH[3] << 24) + (BIH[2] << 16) + (BIH[1] << 8) + (BIH[0]));
|
1999-11-29 16:49:39 +00:00
|
|
|
|
printf("biWidth = %i \n",
|
1999-12-04 18:17:52 +00:00
|
|
|
|
(int)(BIH[7] << 24) + (BIH[6] << 16) + (BIH[5] << 8) + (BIH[4]));
|
1999-11-29 16:49:39 +00:00
|
|
|
|
printf("biHeight = %i \n",
|
1999-12-04 18:17:52 +00:00
|
|
|
|
(int)(BIH[11] << 24) + (BIH[10] << 16) + (BIH[9] << 8) +
|
1999-11-29 16:49:39 +00:00
|
|
|
|
(BIH[8]));
|
1999-12-04 18:17:52 +00:00
|
|
|
|
printf("biPlanes = %i \n", (int)(BIH[13] << 8) + (BIH[12]));
|
|
|
|
|
printf("biBitCount = %i \n", (int)(BIH[15] << 8) + (BIH[14]));
|
1999-11-29 16:49:39 +00:00
|
|
|
|
printf("biCompress = %i \n",
|
1999-12-04 18:17:52 +00:00
|
|
|
|
(int)(BIH[19] << 24) + (BIH[18] << 16) + (BIH[17] << 8) +
|
1999-11-29 16:49:39 +00:00
|
|
|
|
(BIH[16]));
|
|
|
|
|
printf("biSizeImage = %i \n",
|
1999-12-04 18:17:52 +00:00
|
|
|
|
(int)(BIH[23] << 24) + (BIH[22] << 16) + (BIH[21] << 8) +
|
1999-11-29 16:49:39 +00:00
|
|
|
|
(BIH[20]));
|
|
|
|
|
printf("biXPels = %i \n",
|
1999-12-04 18:17:52 +00:00
|
|
|
|
(int)(BIH[27] << 24) + (BIH[26] << 16) + (BIH[25] << 8) +
|
1999-11-29 16:49:39 +00:00
|
|
|
|
(BIH[24]));
|
|
|
|
|
printf("biYPels = %i \n",
|
1999-12-04 18:17:52 +00:00
|
|
|
|
(int)(BIH[31] << 24) + (BIH[30] << 16) + (BIH[29] << 8) +
|
1999-11-29 16:49:39 +00:00
|
|
|
|
(BIH[28]));
|
|
|
|
|
printf("biClrUsed = %i \n",
|
1999-12-04 18:17:52 +00:00
|
|
|
|
(int)(BIH[35] << 24) + (BIH[34] << 16) + (BIH[33] << 8) +
|
1999-11-29 16:49:39 +00:00
|
|
|
|
(BIH[32]));
|
|
|
|
|
printf("biClrImprtnt= %i \n",
|
1999-12-04 18:17:52 +00:00
|
|
|
|
(int)(BIH[39] << 24) + (BIH[38] << 16) + (BIH[37] << 8) +
|
1999-11-29 16:49:39 +00:00
|
|
|
|
(BIH[36]));
|
|
|
|
|
}
|
1999-12-04 18:17:52 +00:00
|
|
|
|
#endif
|
1999-11-29 16:49:39 +00:00
|
|
|
|
|
|
|
|
|
/* Progressive loading */
|
1999-12-04 18:17:52 +00:00
|
|
|
|
struct headerpair {
|
|
|
|
|
guint width;
|
|
|
|
|
guint height;
|
|
|
|
|
guint depth;
|
|
|
|
|
guint Negative; /* Negative = 1 -> top down BMP,
|
|
|
|
|
Negative = 0 -> bottom up BMP */
|
|
|
|
|
};
|
1999-11-29 16:49:39 +00:00
|
|
|
|
|
|
|
|
|
struct ico_progressive_state {
|
|
|
|
|
ModulePreparedNotifyFunc prepared_func;
|
|
|
|
|
ModuleUpdatedNotifyFunc updated_func;
|
|
|
|
|
gpointer user_data;
|
|
|
|
|
|
|
|
|
|
gint HeaderSize; /* The size of the header-part (incl colormap) */
|
|
|
|
|
guchar *HeaderBuf; /* The buffer for the header (incl colormap) */
|
|
|
|
|
gint BytesInHeaderBuf; /* The size of the allocated HeaderBuf */
|
|
|
|
|
gint HeaderDone; /* The nr of bytes actually in HeaderBuf */
|
|
|
|
|
|
|
|
|
|
gint LineWidth; /* The width of a line in bytes */
|
|
|
|
|
guchar *LineBuf; /* Buffer for 1 line */
|
|
|
|
|
gint LineDone; /* # of bytes in LineBuf */
|
|
|
|
|
gint Lines; /* # of finished lines */
|
|
|
|
|
|
|
|
|
|
gint Type; /*
|
|
|
|
|
24 = RGB
|
|
|
|
|
8 = 8 bit colormapped
|
|
|
|
|
1 = 1 bit bitonal
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
struct headerpair Header; /* Decoded (BE->CPU) header */
|
|
|
|
|
|
|
|
|
|
gint DIBoffset;
|
|
|
|
|
gint ImageScore;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
GdkPixbuf *pixbuf; /* Our "target" */
|
|
|
|
|
};
|
|
|
|
|
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
static gpointer
|
2000-02-22 00:29:00 +00:00
|
|
|
|
gdk_pixbuf__ico_image_begin_load(ModulePreparedNotifyFunc prepared_func,
|
|
|
|
|
ModuleUpdatedNotifyFunc updated_func,
|
|
|
|
|
ModuleFrameDoneNotifyFunc frame_done_func,
|
|
|
|
|
ModuleAnimationDoneNotifyFunc anim_done_func,
|
2000-10-18 18:42:54 +00:00
|
|
|
|
gpointer user_data,
|
|
|
|
|
GError **error);
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
static gboolean gdk_pixbuf__ico_image_stop_load(gpointer data, GError **error);
|
|
|
|
|
static gboolean gdk_pixbuf__ico_image_load_increment(gpointer data,
|
|
|
|
|
const guchar * buf, guint size,
|
|
|
|
|
GError **error);
|
1999-11-29 16:49:39 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-12-04 18:17:52 +00:00
|
|
|
|
/* Shared library entry point --> Can go when generic_image_load
|
|
|
|
|
enters gdk-pixbuf-io */
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
static GdkPixbuf *
|
2000-10-18 18:42:54 +00:00
|
|
|
|
gdk_pixbuf__ico_image_load(FILE * f, GError **error)
|
1999-11-29 16:49:39 +00:00
|
|
|
|
{
|
|
|
|
|
guchar *membuf;
|
|
|
|
|
size_t length;
|
|
|
|
|
struct ico_progressive_state *State;
|
|
|
|
|
|
|
|
|
|
GdkPixbuf *pb;
|
|
|
|
|
|
2000-10-18 18:42:54 +00:00
|
|
|
|
State = gdk_pixbuf__ico_image_begin_load(NULL, NULL, NULL,
|
|
|
|
|
NULL, NULL, error);
|
|
|
|
|
if (State == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
1999-11-29 16:49:39 +00:00
|
|
|
|
membuf = g_malloc(4096);
|
|
|
|
|
|
|
|
|
|
g_assert(membuf != NULL);
|
|
|
|
|
|
|
|
|
|
while (feof(f) == 0) {
|
|
|
|
|
length = fread(membuf, 1, 4096, f);
|
|
|
|
|
if (length > 0)
|
2000-10-18 18:42:54 +00:00
|
|
|
|
if (!gdk_pixbuf__ico_image_load_increment(State, membuf, length,
|
|
|
|
|
error)) {
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
gdk_pixbuf__ico_image_stop_load (State, NULL);
|
2000-10-18 18:42:54 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
1999-11-29 16:49:39 +00:00
|
|
|
|
}
|
|
|
|
|
g_free(membuf);
|
|
|
|
|
if (State->pixbuf != NULL)
|
|
|
|
|
gdk_pixbuf_ref(State->pixbuf);
|
|
|
|
|
|
|
|
|
|
pb = State->pixbuf;
|
|
|
|
|
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
gdk_pixbuf__ico_image_stop_load(State, NULL);
|
1999-12-04 18:17:52 +00:00
|
|
|
|
return pb;
|
1999-11-29 16:49:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void DecodeHeader(guchar *Data, gint Bytes,
|
|
|
|
|
struct ico_progressive_state *State)
|
|
|
|
|
{
|
|
|
|
|
/* For ICO's we have to be very clever. There are multiple images possible
|
|
|
|
|
in an .ICO. For now, we select (in order of priority):
|
|
|
|
|
1) The one with the highest number of colors
|
|
|
|
|
2) The largest one
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
gint IconCount = 0; /* The number of icon-versions in the file */
|
|
|
|
|
guchar *BIH; /* The DIB for the used icon */
|
|
|
|
|
guchar *Ptr;
|
|
|
|
|
gint I;
|
|
|
|
|
|
|
|
|
|
/* Step 1: The ICO header */
|
|
|
|
|
|
|
|
|
|
IconCount = (Data[5] << 8) + (Data[4]);
|
|
|
|
|
|
|
|
|
|
State->HeaderSize = 6 + IconCount*16;
|
|
|
|
|
|
|
|
|
|
if (State->HeaderSize>State->BytesInHeaderBuf) {
|
|
|
|
|
State->HeaderBuf=g_realloc(State->HeaderBuf,State->HeaderSize);
|
|
|
|
|
State->BytesInHeaderBuf = State->HeaderSize;
|
|
|
|
|
}
|
|
|
|
|
if (Bytes < State->HeaderSize)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
/* We now have all the "short-specs" of the versions
|
|
|
|
|
So we iterate through them and select the best one */
|
|
|
|
|
|
|
|
|
|
State->ImageScore = 0;
|
|
|
|
|
State->DIBoffset = 0;
|
|
|
|
|
Ptr = Data + 6;
|
|
|
|
|
for (I=0;I<IconCount;I++) {
|
|
|
|
|
int ThisWidth, ThisHeight,ThisColors;
|
|
|
|
|
int ThisScore;
|
|
|
|
|
|
|
|
|
|
ThisWidth = Ptr[0];
|
|
|
|
|
ThisHeight = Ptr[1];
|
|
|
|
|
ThisColors = (Ptr[2]);
|
|
|
|
|
if (ThisColors==0)
|
1999-12-04 18:17:52 +00:00
|
|
|
|
ThisColors=256; /* Yes, this is in the spec, ugh */
|
1999-11-29 16:49:39 +00:00
|
|
|
|
|
|
|
|
|
ThisScore = ThisColors*1024+ThisWidth*ThisHeight;
|
|
|
|
|
|
|
|
|
|
if (ThisScore>State->ImageScore) {
|
|
|
|
|
State->ImageScore = ThisScore;
|
|
|
|
|
State->DIBoffset = (Ptr[15]<<24)+(Ptr[14]<<16)+
|
|
|
|
|
(Ptr[13]<<8) + (Ptr[12]);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Ptr += 16;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We now have a winner, pointed to in State->DIBoffset,
|
|
|
|
|
so we know how many bytes are in the "header" part. */
|
|
|
|
|
|
|
|
|
|
State->HeaderSize = State->DIBoffset + 40; /* 40 = sizeof(InfoHeader) */
|
|
|
|
|
|
|
|
|
|
if (State->HeaderSize>State->BytesInHeaderBuf) {
|
|
|
|
|
State->HeaderBuf=g_realloc(State->HeaderBuf,State->HeaderSize);
|
|
|
|
|
State->BytesInHeaderBuf = State->HeaderSize;
|
|
|
|
|
}
|
|
|
|
|
if (Bytes<State->HeaderSize)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
BIH = Data+State->DIBoffset;
|
|
|
|
|
|
1999-12-04 18:17:52 +00:00
|
|
|
|
#ifdef DUMPBIH
|
|
|
|
|
DumpBIH(BIH);
|
|
|
|
|
#endif
|
1999-11-29 16:49:39 +00:00
|
|
|
|
|
|
|
|
|
/* Add the palette to the headersize */
|
|
|
|
|
|
|
|
|
|
State->Header.width =
|
1999-12-04 18:17:52 +00:00
|
|
|
|
(int)(BIH[7] << 24) + (BIH[6] << 16) + (BIH[5] << 8) + (BIH[4]);
|
1999-11-29 16:49:39 +00:00
|
|
|
|
State->Header.height =
|
1999-12-04 18:17:52 +00:00
|
|
|
|
(int)(BIH[11] << 24) + (BIH[10] << 16) + (BIH[9] << 8) + (BIH[8])/2;
|
1999-11-29 16:49:39 +00:00
|
|
|
|
/* /2 because the BIH height includes the transparency mask */
|
|
|
|
|
State->Header.depth = (BIH[15] << 8) + (BIH[14]);;
|
|
|
|
|
|
1999-12-04 18:17:52 +00:00
|
|
|
|
State->Type = State->Header.depth;
|
1999-11-29 22:00:45 +00:00
|
|
|
|
if (State->Lines>=State->Header.height)
|
1999-12-04 18:17:52 +00:00
|
|
|
|
State->Type = 1; /* The transparency mask is 1 bpp */
|
|
|
|
|
|
1999-11-29 16:49:39 +00:00
|
|
|
|
|
1999-12-04 18:17:52 +00:00
|
|
|
|
|
|
|
|
|
/* Determine the palette size. If the header indicates 0, it
|
|
|
|
|
is actually the maximum for the bpp. You have to love the
|
|
|
|
|
guys who made the spec. */
|
1999-12-05 13:47:26 +00:00
|
|
|
|
I = (int)(BIH[35] << 24) + (BIH[34] << 16) + (BIH[33] << 8) + (BIH[32]);
|
|
|
|
|
I = I*4;
|
1999-11-29 16:49:39 +00:00
|
|
|
|
if ((I==0)&&(State->Type==1))
|
|
|
|
|
I = 2*4;
|
|
|
|
|
if ((I==0)&&(State->Type==4))
|
|
|
|
|
I = 16*4;
|
|
|
|
|
if ((I==0)&&(State->Type==8))
|
|
|
|
|
I = 256*4;
|
|
|
|
|
|
|
|
|
|
State->HeaderSize+=I;
|
|
|
|
|
|
|
|
|
|
if (State->HeaderSize>State->BytesInHeaderBuf) {
|
|
|
|
|
State->HeaderBuf=g_realloc(State->HeaderBuf,State->HeaderSize);
|
|
|
|
|
State->BytesInHeaderBuf = State->HeaderSize;
|
|
|
|
|
}
|
|
|
|
|
if (Bytes < State->HeaderSize)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
if ((BIH[16] != 0) || (BIH[17] != 0) || (BIH[18] != 0)
|
|
|
|
|
|| (BIH[19] != 0)) {
|
|
|
|
|
g_assert(0); /* Compressed icons aren't allowed */
|
|
|
|
|
}
|
|
|
|
|
|
1999-12-04 18:17:52 +00:00
|
|
|
|
/* Negative heights mean top-down pixel-order */
|
1999-11-29 16:49:39 +00:00
|
|
|
|
if (State->Header.height < 0) {
|
|
|
|
|
State->Header.height = -State->Header.height;
|
|
|
|
|
State->Header.Negative = 1;
|
|
|
|
|
}
|
|
|
|
|
if (State->Header.width < 0) {
|
|
|
|
|
State->Header.width = -State->Header.width;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (State->Type == 24)
|
|
|
|
|
State->LineWidth = State->Header.width * 3;
|
|
|
|
|
if (State->Type == 8)
|
|
|
|
|
State->LineWidth = State->Header.width * 1;
|
|
|
|
|
if (State->Type == 4) {
|
1999-12-04 18:17:52 +00:00
|
|
|
|
State->LineWidth = (State->Header.width+1)/2;
|
1999-11-29 16:49:39 +00:00
|
|
|
|
}
|
|
|
|
|
if (State->Type == 1) {
|
|
|
|
|
State->LineWidth = State->Header.width / 8;
|
|
|
|
|
if ((State->Header.width & 7) != 0)
|
|
|
|
|
State->LineWidth++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Pad to a 32 bit boundary */
|
|
|
|
|
if (((State->LineWidth % 4) > 0))
|
1999-12-04 18:17:52 +00:00
|
|
|
|
State->LineWidth = (State->LineWidth / 4) * 4 + 4;
|
1999-11-29 16:49:39 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (State->LineBuf == NULL)
|
|
|
|
|
State->LineBuf = g_malloc(State->LineWidth);
|
|
|
|
|
|
|
|
|
|
g_assert(State->LineBuf != NULL);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (State->pixbuf == NULL) {
|
|
|
|
|
State->pixbuf =
|
2000-04-11 07:03:25 +00:00
|
|
|
|
gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8,
|
1999-11-29 16:49:39 +00:00
|
|
|
|
(gint) State->Header.width,
|
|
|
|
|
(gint) State->Header.height);
|
|
|
|
|
|
|
|
|
|
if (State->prepared_func != NULL)
|
|
|
|
|
/* Notify the client that we are ready to go */
|
|
|
|
|
(*State->prepared_func) (State->pixbuf,
|
|
|
|
|
State->user_data);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* func - called when we have pixmap created (but no image data)
|
|
|
|
|
* user_data - passed as arg 1 to func
|
|
|
|
|
* return context (opaque to user)
|
|
|
|
|
*/
|
|
|
|
|
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
static gpointer
|
2000-02-22 00:29:00 +00:00
|
|
|
|
gdk_pixbuf__ico_image_begin_load(ModulePreparedNotifyFunc prepared_func,
|
|
|
|
|
ModuleUpdatedNotifyFunc updated_func,
|
|
|
|
|
ModuleFrameDoneNotifyFunc frame_done_func,
|
|
|
|
|
ModuleAnimationDoneNotifyFunc anim_done_func,
|
2000-10-18 18:42:54 +00:00
|
|
|
|
gpointer user_data,
|
|
|
|
|
GError **error)
|
1999-11-29 16:49:39 +00:00
|
|
|
|
{
|
|
|
|
|
struct ico_progressive_state *context;
|
|
|
|
|
|
|
|
|
|
context = g_new0(struct ico_progressive_state, 1);
|
|
|
|
|
context->prepared_func = prepared_func;
|
|
|
|
|
context->updated_func = updated_func;
|
|
|
|
|
context->user_data = user_data;
|
|
|
|
|
|
|
|
|
|
context->HeaderSize = 54;
|
|
|
|
|
context->HeaderBuf = g_malloc(14 + 40 + 4*256 + 512);
|
|
|
|
|
/* 4*256 for the colormap */
|
|
|
|
|
context->BytesInHeaderBuf = 14 + 40 + 4*256 + 512 ;
|
|
|
|
|
context->HeaderDone = 0;
|
|
|
|
|
|
|
|
|
|
context->LineWidth = 0;
|
|
|
|
|
context->LineBuf = NULL;
|
|
|
|
|
context->LineDone = 0;
|
|
|
|
|
context->Lines = 0;
|
|
|
|
|
|
|
|
|
|
context->Type = 0;
|
|
|
|
|
|
|
|
|
|
memset(&context->Header, 0, sizeof(struct headerpair));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
context->pixbuf = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return (gpointer) context;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* context - returned from image_begin_load
|
|
|
|
|
*
|
|
|
|
|
* free context, unref gdk_pixbuf
|
|
|
|
|
*/
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
gboolean gdk_pixbuf__ico_image_stop_load(gpointer data,
|
|
|
|
|
GError **error)
|
1999-11-29 16:49:39 +00:00
|
|
|
|
{
|
|
|
|
|
struct ico_progressive_state *context =
|
|
|
|
|
(struct ico_progressive_state *) data;
|
|
|
|
|
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
/* FIXME this thing needs to report errors if
|
|
|
|
|
* we have unused image data
|
|
|
|
|
*/
|
1999-11-29 16:49:39 +00:00
|
|
|
|
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
g_return_val_if_fail(context != NULL, TRUE);
|
1999-11-29 16:49:39 +00:00
|
|
|
|
|
|
|
|
|
if (context->LineBuf != NULL)
|
|
|
|
|
g_free(context->LineBuf);
|
|
|
|
|
context->LineBuf = NULL;
|
|
|
|
|
if (context->HeaderBuf != NULL)
|
|
|
|
|
g_free(context->HeaderBuf);
|
|
|
|
|
|
|
|
|
|
if (context->pixbuf)
|
|
|
|
|
gdk_pixbuf_unref(context->pixbuf);
|
|
|
|
|
|
|
|
|
|
g_free(context);
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
|
|
|
|
|
return TRUE;
|
1999-11-29 16:49:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void OneLine24(struct ico_progressive_state *context)
|
|
|
|
|
{
|
|
|
|
|
gint X;
|
|
|
|
|
guchar *Pixels;
|
|
|
|
|
|
|
|
|
|
X = 0;
|
|
|
|
|
if (context->Header.Negative == 0)
|
2000-04-11 07:03:25 +00:00
|
|
|
|
Pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride *
|
|
|
|
|
(context->Header.height - context->Lines - 1));
|
1999-11-29 16:49:39 +00:00
|
|
|
|
else
|
2000-04-11 07:03:25 +00:00
|
|
|
|
Pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride *
|
|
|
|
|
context->Lines);
|
1999-11-29 16:49:39 +00:00
|
|
|
|
while (X < context->Header.width) {
|
|
|
|
|
Pixels[X * 4 + 0] = context->LineBuf[X * 3 + 2];
|
|
|
|
|
Pixels[X * 4 + 1] = context->LineBuf[X * 3 + 1];
|
|
|
|
|
Pixels[X * 4 + 2] = context->LineBuf[X * 3 + 0];
|
|
|
|
|
X++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void OneLine8(struct ico_progressive_state *context)
|
|
|
|
|
{
|
|
|
|
|
gint X;
|
|
|
|
|
guchar *Pixels;
|
|
|
|
|
|
|
|
|
|
X = 0;
|
|
|
|
|
if (context->Header.Negative == 0)
|
2000-04-11 07:03:25 +00:00
|
|
|
|
Pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride *
|
|
|
|
|
(context->Header.height - context->Lines - 1));
|
1999-11-29 16:49:39 +00:00
|
|
|
|
else
|
2000-04-11 07:03:25 +00:00
|
|
|
|
Pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride *
|
|
|
|
|
context->Lines);
|
1999-11-29 16:49:39 +00:00
|
|
|
|
while (X < context->Header.width) {
|
|
|
|
|
/* The joys of having a BGR byteorder */
|
|
|
|
|
Pixels[X * 4 + 0] =
|
|
|
|
|
context->HeaderBuf[4 * context->LineBuf[X] + 42+context->DIBoffset];
|
|
|
|
|
Pixels[X * 4 + 1] =
|
|
|
|
|
context->HeaderBuf[4 * context->LineBuf[X] + 41+context->DIBoffset];
|
|
|
|
|
Pixels[X * 4 + 2] =
|
|
|
|
|
context->HeaderBuf[4 * context->LineBuf[X] + 40+context->DIBoffset];
|
|
|
|
|
X++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
static void OneLine4(struct ico_progressive_state *context)
|
|
|
|
|
{
|
|
|
|
|
gint X;
|
|
|
|
|
guchar *Pixels;
|
|
|
|
|
|
|
|
|
|
X = 0;
|
|
|
|
|
if (context->Header.Negative == 0)
|
2000-04-11 07:03:25 +00:00
|
|
|
|
Pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride *
|
|
|
|
|
(context->Header.height - context->Lines - 1));
|
1999-11-29 16:49:39 +00:00
|
|
|
|
else
|
2000-04-11 07:03:25 +00:00
|
|
|
|
Pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride *
|
|
|
|
|
context->Lines);
|
1999-11-29 16:49:39 +00:00
|
|
|
|
|
|
|
|
|
while (X < context->Header.width) {
|
|
|
|
|
guchar Pix;
|
|
|
|
|
|
|
|
|
|
Pix = context->LineBuf[X/2];
|
|
|
|
|
|
|
|
|
|
Pixels[X * 4 + 0] =
|
|
|
|
|
context->HeaderBuf[4 * (Pix>>4) + 42+context->DIBoffset];
|
|
|
|
|
Pixels[X * 4 + 1] =
|
|
|
|
|
context->HeaderBuf[4 * (Pix>>4) + 41+context->DIBoffset];
|
|
|
|
|
Pixels[X * 4 + 2] =
|
|
|
|
|
context->HeaderBuf[4 * (Pix>>4) + 40+context->DIBoffset];
|
|
|
|
|
X++;
|
|
|
|
|
if (X<context->Header.width) {
|
|
|
|
|
/* Handle the other 4 bit pixel only when there is one */
|
|
|
|
|
Pixels[X * 4 + 0] =
|
|
|
|
|
context->HeaderBuf[4 * (Pix&15) + 42+context->DIBoffset];
|
|
|
|
|
Pixels[X * 4 + 1] =
|
|
|
|
|
context->HeaderBuf[4 * (Pix&15) + 41+context->DIBoffset];
|
|
|
|
|
Pixels[X * 4 + 2] =
|
|
|
|
|
context->HeaderBuf[4 * (Pix&15) + 40+context->DIBoffset];
|
|
|
|
|
X++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void OneLine1(struct ico_progressive_state *context)
|
|
|
|
|
{
|
|
|
|
|
gint X;
|
|
|
|
|
guchar *Pixels;
|
|
|
|
|
|
|
|
|
|
X = 0;
|
|
|
|
|
if (context->Header.Negative == 0)
|
2000-04-11 07:03:25 +00:00
|
|
|
|
Pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride *
|
|
|
|
|
(context->Header.height - context->Lines - 1));
|
1999-11-29 16:49:39 +00:00
|
|
|
|
else
|
2000-04-11 07:03:25 +00:00
|
|
|
|
Pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride *
|
|
|
|
|
context->Lines);
|
1999-11-29 16:49:39 +00:00
|
|
|
|
while (X < context->Header.width) {
|
|
|
|
|
int Bit;
|
|
|
|
|
|
|
|
|
|
Bit = (context->LineBuf[X / 8]) >> (7 - (X & 7));
|
|
|
|
|
Bit = Bit & 1;
|
|
|
|
|
/* The joys of having a BGR byteorder */
|
1999-12-04 18:17:52 +00:00
|
|
|
|
Pixels[X * 4 + 0] = Bit*255;
|
|
|
|
|
Pixels[X * 4 + 1] = Bit*255;
|
|
|
|
|
Pixels[X * 4 + 2] = Bit*255;
|
1999-11-29 16:49:39 +00:00
|
|
|
|
X++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void OneLineTransp(struct ico_progressive_state *context)
|
|
|
|
|
{
|
|
|
|
|
gint X;
|
|
|
|
|
guchar *Pixels;
|
|
|
|
|
|
|
|
|
|
X = 0;
|
|
|
|
|
if (context->Header.Negative == 0)
|
2000-04-11 07:03:25 +00:00
|
|
|
|
Pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride *
|
|
|
|
|
(2*context->Header.height - context->Lines - 1));
|
1999-11-29 16:49:39 +00:00
|
|
|
|
else
|
2000-04-11 07:03:25 +00:00
|
|
|
|
Pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride *
|
|
|
|
|
(context->Lines-context->Header.height));
|
1999-11-29 16:49:39 +00:00
|
|
|
|
while (X < context->Header.width) {
|
|
|
|
|
int Bit;
|
|
|
|
|
|
|
|
|
|
Bit = (context->LineBuf[X / 8]) >> (7 - (X & 7));
|
|
|
|
|
Bit = Bit & 1;
|
|
|
|
|
/* The joys of having a BGR byteorder */
|
|
|
|
|
Pixels[X * 4 + 3] = 255-Bit*255;
|
1999-11-29 22:00:45 +00:00
|
|
|
|
#if 0
|
1999-11-29 16:49:39 +00:00
|
|
|
|
if (Bit){
|
|
|
|
|
Pixels[X*4+0] = 255;
|
|
|
|
|
Pixels[X*4+1] = 255;
|
|
|
|
|
} else {
|
|
|
|
|
Pixels[X*4+0] = 0;
|
|
|
|
|
Pixels[X*4+1] = 0;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
X++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void OneLine(struct ico_progressive_state *context)
|
|
|
|
|
{
|
|
|
|
|
context->LineDone = 0;
|
|
|
|
|
|
|
|
|
|
if (context->Lines >= context->Header.height*2) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (context->Lines <context->Header.height) {
|
|
|
|
|
|
|
|
|
|
if (context->Type == 24)
|
|
|
|
|
OneLine24(context);
|
|
|
|
|
if (context->Type == 8)
|
|
|
|
|
OneLine8(context);
|
|
|
|
|
if (context->Type == 4)
|
|
|
|
|
OneLine4(context);
|
|
|
|
|
if (context->Type == 1)
|
|
|
|
|
OneLine1(context);
|
|
|
|
|
} else
|
|
|
|
|
{
|
|
|
|
|
OneLineTransp(context);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
context->Lines++;
|
|
|
|
|
if (context->Lines>=context->Header.height) {
|
|
|
|
|
context->Type = 1;
|
|
|
|
|
context->LineWidth = context->Header.width / 8;
|
|
|
|
|
if ((context->Header.width & 7) != 0)
|
|
|
|
|
context->LineWidth++;
|
|
|
|
|
/* Pad to a 32 bit boundary */
|
|
|
|
|
if (((context->LineWidth % 4) > 0))
|
|
|
|
|
context->LineWidth = (context->LineWidth / 4) * 4 + 4;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (context->updated_func != NULL) {
|
|
|
|
|
(*context->updated_func) (context->pixbuf,
|
|
|
|
|
0,
|
|
|
|
|
context->Lines,
|
|
|
|
|
context->Header.width,
|
2000-01-05 23:06:13 +00:00
|
|
|
|
context->Header.height,
|
|
|
|
|
context->user_data);
|
1999-11-29 16:49:39 +00:00
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* context - from image_begin_load
|
|
|
|
|
* buf - new image data
|
|
|
|
|
* size - length of new image data
|
|
|
|
|
*
|
|
|
|
|
* append image data onto inrecrementally built output image
|
|
|
|
|
*/
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
static gboolean
|
|
|
|
|
gdk_pixbuf__ico_image_load_increment(gpointer data,
|
|
|
|
|
const guchar * buf,
|
|
|
|
|
guint size,
|
2000-10-18 18:42:54 +00:00
|
|
|
|
GError **error)
|
1999-11-29 16:49:39 +00:00
|
|
|
|
{
|
|
|
|
|
struct ico_progressive_state *context =
|
|
|
|
|
(struct ico_progressive_state *) data;
|
|
|
|
|
|
|
|
|
|
gint BytesToCopy;
|
|
|
|
|
|
|
|
|
|
while (size > 0) {
|
|
|
|
|
g_assert(context->LineDone >= 0);
|
|
|
|
|
if (context->HeaderDone < context->HeaderSize) { /* We still
|
|
|
|
|
have headerbytes to do */
|
|
|
|
|
BytesToCopy =
|
|
|
|
|
context->HeaderSize - context->HeaderDone;
|
|
|
|
|
if (BytesToCopy > size)
|
|
|
|
|
BytesToCopy = size;
|
|
|
|
|
|
1999-12-04 18:17:52 +00:00
|
|
|
|
memmove(context->HeaderBuf + context->HeaderDone,
|
1999-11-29 16:49:39 +00:00
|
|
|
|
buf, BytesToCopy);
|
|
|
|
|
|
|
|
|
|
size -= BytesToCopy;
|
|
|
|
|
buf += BytesToCopy;
|
|
|
|
|
context->HeaderDone += BytesToCopy;
|
|
|
|
|
|
|
|
|
|
} else
|
|
|
|
|
{
|
|
|
|
|
BytesToCopy =
|
|
|
|
|
context->LineWidth - context->LineDone;
|
|
|
|
|
if (BytesToCopy > size)
|
|
|
|
|
BytesToCopy = size;
|
|
|
|
|
|
|
|
|
|
if (BytesToCopy > 0) {
|
1999-12-04 18:17:52 +00:00
|
|
|
|
memmove(context->LineBuf +
|
1999-11-29 16:49:39 +00:00
|
|
|
|
context->LineDone, buf,
|
|
|
|
|
BytesToCopy);
|
|
|
|
|
|
|
|
|
|
size -= BytesToCopy;
|
|
|
|
|
buf += BytesToCopy;
|
|
|
|
|
context->LineDone += BytesToCopy;
|
|
|
|
|
}
|
|
|
|
|
if ((context->LineDone >= context->LineWidth) &&
|
|
|
|
|
(context->LineWidth > 0))
|
|
|
|
|
OneLine(context);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (context->HeaderDone >= 6)
|
|
|
|
|
DecodeHeader(context->HeaderBuf,
|
|
|
|
|
context->HeaderDone, context);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
gdk_pixbuf__ico_fill_vtable (GdkPixbufModule *module)
|
|
|
|
|
{
|
|
|
|
|
module->load = gdk_pixbuf__ico_image_load;
|
|
|
|
|
module->begin_load = gdk_pixbuf__ico_image_begin_load;
|
|
|
|
|
module->stop_load = gdk_pixbuf__ico_image_stop_load;
|
|
|
|
|
module->load_increment = gdk_pixbuf__ico_image_load_increment;
|
|
|
|
|
}
|