2002-10-03 22:39:51 +00:00
|
|
|
|
/* -*- mode: C; c-file-style: "linux" -*- */
|
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.
|
|
|
|
|
*/
|
|
|
|
|
|
2002-12-05 21:37:37 +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>
|
2003-07-03 23:37:34 +00:00
|
|
|
|
#include <stdlib.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"
|
2001-08-20 06:47:28 +00:00
|
|
|
|
#include <errno.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 {
|
2001-08-20 06:47:28 +00:00
|
|
|
|
gint width;
|
|
|
|
|
gint height;
|
1999-12-04 18:17:52 +00:00
|
|
|
|
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 {
|
2004-01-07 00:26:58 +00:00
|
|
|
|
GdkPixbufModuleSizeFunc size_func;
|
2002-10-03 22:39:51 +00:00
|
|
|
|
GdkPixbufModulePreparedFunc prepared_func;
|
|
|
|
|
GdkPixbufModuleUpdatedFunc updated_func;
|
1999-11-29 16:49:39 +00:00
|
|
|
|
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; /*
|
2002-02-01 23:43:07 +00:00
|
|
|
|
32 = RGBA
|
1999-11-29 16:49:39 +00:00
|
|
|
|
24 = RGB
|
2002-02-01 23:43:07 +00:00
|
|
|
|
16 = 555 RGB
|
1999-11-29 16:49:39 +00:00
|
|
|
|
8 = 8 bit colormapped
|
2002-02-01 23:43:07 +00:00
|
|
|
|
4 = 4 bpp colormapped
|
1999-11-29 16:49:39 +00:00
|
|
|
|
1 = 1 bit bitonal
|
|
|
|
|
*/
|
2002-09-06 21:09:49 +00:00
|
|
|
|
gboolean cursor;
|
|
|
|
|
gint x_hot;
|
|
|
|
|
gint y_hot;
|
1999-11-29 16:49:39 +00:00
|
|
|
|
|
|
|
|
|
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
|
2002-10-03 22:39:51 +00:00
|
|
|
|
gdk_pixbuf__ico_image_begin_load(GdkPixbufModuleSizeFunc size_func,
|
|
|
|
|
GdkPixbufModulePreparedFunc prepared_func,
|
|
|
|
|
GdkPixbufModuleUpdatedFunc updated_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
|
|
|
|
|
2001-08-20 06:47:28 +00:00
|
|
|
|
static void
|
|
|
|
|
context_free (struct ico_progressive_state *context)
|
|
|
|
|
{
|
2007-03-09 21:57:37 +00:00
|
|
|
|
g_free (context->LineBuf);
|
2001-08-20 06:47:28 +00:00
|
|
|
|
context->LineBuf = NULL;
|
2007-03-09 21:57:37 +00:00
|
|
|
|
g_free (context->HeaderBuf);
|
1999-11-29 16:49:39 +00:00
|
|
|
|
|
2001-08-20 06:47:28 +00:00
|
|
|
|
if (context->pixbuf)
|
Remove assorted G_OBJECT casts where unnecessary.
2001-12-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk-pixbuf-animation.c, gdk-pixbuf-loader.c, gdk-pixpuf.c,
io-gif-animation.c, io-gif.c, io-tiff.c, test-loaders.c: Remove
assorted G_OBJECT casts where unnecessary.
* gdk-pixbuf-loader.c: Call g_object_ref and g_object_unref
instead of gdk_pixbuf_animation_ref and gdk_pixbuf_animation_unref
resp.
* gdk-pixbuf-csource.c, io-bmp.c, io-gif-animation.c, io-ico.c,
io-jpeg.c, io-png.c, io-pnm.c, io-ras.c, io-tga.c, io-wbmp.c,
io-xbm.c, io-xpm.c, test-gdk-pixbuf.c: Dito for gdk_pixbuf_ref and
gdk_pixbuf_unref.
* Makefile.am, pixops/Makefile.am: Compile everything with
-DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED
* gdk-pixdata.c: Use g_ascii_strup() instead of g_strup().
* io-xpm.c: Use g_ascii_strcasecmp() instead of g_strcasecmp().
* demos/testpixbuf-drawable.c, demos/testpixbuf-save.c,
demos/testpixbuf-scale.c, demos/testpixbuf.c: Call g_object_ref
and g_object_unref instead of gdk_pixbuf_ref and gdk_pixbuf_unref
resp.
2001-12-13 21:22:12 +00:00
|
|
|
|
g_object_unref (context->pixbuf);
|
1999-11-29 16:49:39 +00:00
|
|
|
|
|
2001-08-20 06:47:28 +00:00
|
|
|
|
g_free (context);
|
|
|
|
|
}
|
1999-11-29 16:49:39 +00:00
|
|
|
|
|
|
|
|
|
static void DecodeHeader(guchar *Data, gint Bytes,
|
2001-08-20 06:47:28 +00:00
|
|
|
|
struct ico_progressive_state *State,
|
|
|
|
|
GError **error)
|
1999-11-29 16:49:39 +00:00
|
|
|
|
{
|
|
|
|
|
/* For ICO's we have to be very clever. There are multiple images possible
|
2003-06-28 20:04:18 +00:00
|
|
|
|
in an .ICO. As a simple heuristic, we select the image which occupies the
|
|
|
|
|
largest number of bytes.
|
1999-11-29 16:49:39 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
gint IconCount = 0; /* The number of icon-versions in the file */
|
|
|
|
|
guchar *BIH; /* The DIB for the used icon */
|
|
|
|
|
guchar *Ptr;
|
|
|
|
|
gint I;
|
2008-06-13 04:23:54 +00:00
|
|
|
|
guint16 imgtype; /* 1 = icon, 2 = cursor */
|
1999-11-29 16:49:39 +00:00
|
|
|
|
|
|
|
|
|
/* Step 1: The ICO header */
|
2002-09-03 23:43:21 +00:00
|
|
|
|
|
2008-06-13 04:23:54 +00:00
|
|
|
|
/* First word should be 0 according to specs */
|
|
|
|
|
if (((Data[1] << 8) + Data[0]) != 0) {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
|
_("Invalid header in icon"));
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
imgtype = (Data[3] << 8) + Data[2];
|
|
|
|
|
|
|
|
|
|
State->cursor = (imgtype == 2) ? TRUE : FALSE;
|
|
|
|
|
|
|
|
|
|
/* If it is not a cursor make sure it is actually an icon */
|
|
|
|
|
if (!State->cursor && imgtype != 1) {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
|
_("Invalid header in icon"));
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2002-09-06 21:09:49 +00:00
|
|
|
|
|
1999-11-29 16:49:39 +00:00
|
|
|
|
IconCount = (Data[5] << 8) + (Data[4]);
|
2002-02-01 23:43:07 +00:00
|
|
|
|
|
1999-11-29 16:49:39 +00:00
|
|
|
|
State->HeaderSize = 6 + IconCount*16;
|
2002-02-01 23:43:07 +00:00
|
|
|
|
|
1999-11-29 16:49:39 +00:00
|
|
|
|
if (State->HeaderSize>State->BytesInHeaderBuf) {
|
2002-09-03 23:43:21 +00:00
|
|
|
|
guchar *tmp=g_try_realloc(State->HeaderBuf,State->HeaderSize);
|
|
|
|
|
if (!tmp) {
|
2001-08-20 06:47:28 +00:00
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
|
|
|
|
|
_("Not enough memory to load icon"));
|
|
|
|
|
return;
|
|
|
|
|
}
|
2002-09-03 23:43:21 +00:00
|
|
|
|
State->HeaderBuf = tmp;
|
1999-11-29 16:49:39 +00:00
|
|
|
|
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 ThisScore;
|
|
|
|
|
|
2003-06-28 20:04:18 +00:00
|
|
|
|
ThisScore = (Ptr[11] << 24) + (Ptr[10] << 16) + (Ptr[9] << 8) + (Ptr[8]);
|
1999-11-29 16:49:39 +00:00
|
|
|
|
|
2003-06-28 20:04:18 +00:00
|
|
|
|
if (ThisScore>=State->ImageScore) {
|
1999-11-29 16:49:39 +00:00
|
|
|
|
State->ImageScore = ThisScore;
|
2002-09-06 21:09:49 +00:00
|
|
|
|
State->x_hot = (Ptr[5] << 8) + Ptr[4];
|
|
|
|
|
State->y_hot = (Ptr[7] << 8) + Ptr[6];
|
1999-11-29 16:49:39 +00:00
|
|
|
|
State->DIBoffset = (Ptr[15]<<24)+(Ptr[14]<<16)+
|
|
|
|
|
(Ptr[13]<<8) + (Ptr[12]);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Ptr += 16;
|
|
|
|
|
}
|
2002-02-10 21:06:15 +00:00
|
|
|
|
|
|
|
|
|
if (State->DIBoffset < 0) {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
|
_("Invalid header in icon"));
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
1999-11-29 16:49:39 +00:00
|
|
|
|
/* 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) */
|
2005-08-18 14:18:02 +00:00
|
|
|
|
|
|
|
|
|
if (State->HeaderSize < 0) {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
|
_("Invalid header in icon"));
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
1999-11-29 16:49:39 +00:00
|
|
|
|
if (State->HeaderSize>State->BytesInHeaderBuf) {
|
2002-09-03 23:43:21 +00:00
|
|
|
|
guchar *tmp=g_try_realloc(State->HeaderBuf,State->HeaderSize);
|
|
|
|
|
if (!tmp) {
|
2001-08-20 06:47:28 +00:00
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
|
|
|
|
|
_("Not enough memory to load icon"));
|
|
|
|
|
return;
|
|
|
|
|
}
|
2002-09-03 23:43:21 +00:00
|
|
|
|
State->HeaderBuf = tmp;
|
1999-11-29 16:49:39 +00:00
|
|
|
|
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]);
|
2001-08-20 06:47:28 +00:00
|
|
|
|
if (State->Header.width == 0) {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
|
_("Icon has zero width"));
|
|
|
|
|
return;
|
|
|
|
|
}
|
1999-11-29 16:49:39 +00:00
|
|
|
|
State->Header.height =
|
2002-07-06 23:54:50 +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 */
|
2001-08-20 06:47:28 +00:00
|
|
|
|
if (State->Header.height == 0) {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
|
_("Icon has zero height"));
|
|
|
|
|
return;
|
|
|
|
|
}
|
2002-09-03 23:43:21 +00:00
|
|
|
|
State->Header.depth = (BIH[15] << 8) + (BIH[14]);
|
1999-11-29 16:49:39 +00:00
|
|
|
|
|
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 */
|
|
|
|
|
|
|
|
|
|
/* 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;
|
|
|
|
|
|
2004-09-15 14:33:00 +00:00
|
|
|
|
if (State->HeaderSize < 0) {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
|
_("Invalid header in icon"));
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
1999-11-29 16:49:39 +00:00
|
|
|
|
if (State->HeaderSize>State->BytesInHeaderBuf) {
|
2002-09-03 23:43:21 +00:00
|
|
|
|
guchar *tmp=g_try_realloc(State->HeaderBuf,State->HeaderSize);
|
|
|
|
|
if (!tmp) {
|
2001-08-20 06:47:28 +00:00
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
|
|
|
|
|
_("Not enough memory to load icon"));
|
|
|
|
|
return;
|
|
|
|
|
}
|
2002-09-03 23:43:21 +00:00
|
|
|
|
State->HeaderBuf = tmp;
|
1999-11-29 16:49:39 +00:00
|
|
|
|
State->BytesInHeaderBuf = State->HeaderSize;
|
|
|
|
|
}
|
|
|
|
|
if (Bytes < State->HeaderSize)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
if ((BIH[16] != 0) || (BIH[17] != 0) || (BIH[18] != 0)
|
|
|
|
|
|| (BIH[19] != 0)) {
|
2001-08-20 06:47:28 +00:00
|
|
|
|
/* FIXME: is this the correct message? */
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
|
_("Compressed icons are not supported"));
|
|
|
|
|
return;
|
1999-11-29 16:49:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
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;
|
|
|
|
|
}
|
2001-08-20 06:47:28 +00:00
|
|
|
|
g_assert (State->Header.width > 0);
|
|
|
|
|
g_assert (State->Header.height > 0);
|
1999-11-29 16:49:39 +00:00
|
|
|
|
|
2002-02-01 23:43:07 +00:00
|
|
|
|
if (State->Type == 32)
|
|
|
|
|
State->LineWidth = State->Header.width * 4;
|
|
|
|
|
else if (State->Type == 24)
|
1999-11-29 16:49:39 +00:00
|
|
|
|
State->LineWidth = State->Header.width * 3;
|
2002-02-01 23:43:07 +00:00
|
|
|
|
else if (State->Type == 16)
|
2003-03-11 23:02:39 +00:00
|
|
|
|
State->LineWidth = State->Header.width * 2;
|
2002-02-01 23:43:07 +00:00
|
|
|
|
else if (State->Type == 8)
|
1999-11-29 16:49:39 +00:00
|
|
|
|
State->LineWidth = State->Header.width * 1;
|
2002-02-01 23:43:07 +00:00
|
|
|
|
else if (State->Type == 4)
|
1999-12-04 18:17:52 +00:00
|
|
|
|
State->LineWidth = (State->Header.width+1)/2;
|
2002-02-01 23:43:07 +00:00
|
|
|
|
else if (State->Type == 1) {
|
1999-11-29 16:49:39 +00:00
|
|
|
|
State->LineWidth = State->Header.width / 8;
|
|
|
|
|
if ((State->Header.width & 7) != 0)
|
|
|
|
|
State->LineWidth++;
|
2002-02-01 23:43:07 +00:00
|
|
|
|
} else {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
|
_("Unsupported icon type"));
|
|
|
|
|
return;
|
1999-11-29 16:49:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* 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
|
|
|
|
|
|
|
|
|
|
2001-08-20 06:47:28 +00:00
|
|
|
|
if (State->LineBuf == NULL) {
|
|
|
|
|
State->LineBuf = g_try_malloc(State->LineWidth);
|
|
|
|
|
if (!State->LineBuf) {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
|
|
|
|
|
_("Not enough memory to load icon"));
|
2002-02-01 23:43:07 +00:00
|
|
|
|
return;
|
2001-08-20 06:47:28 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
1999-11-29 16:49:39 +00:00
|
|
|
|
|
|
|
|
|
g_assert(State->LineBuf != NULL);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (State->pixbuf == NULL) {
|
2004-01-07 00:26:58 +00:00
|
|
|
|
#if 1
|
|
|
|
|
if (State->size_func) {
|
|
|
|
|
gint width = State->Header.width;
|
|
|
|
|
gint height = State->Header.height;
|
|
|
|
|
|
|
|
|
|
(*State->size_func) (&width, &height, State->user_data);
|
|
|
|
|
if (width == 0 || height == 0) {
|
|
|
|
|
State->LineWidth = 0;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
1999-11-29 16:49:39 +00:00
|
|
|
|
State->pixbuf =
|
2000-04-11 07:03:25 +00:00
|
|
|
|
gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8,
|
2001-08-20 06:47:28 +00:00
|
|
|
|
State->Header.width,
|
|
|
|
|
State->Header.height);
|
2002-02-12 23:28:05 +00:00
|
|
|
|
if (!State->pixbuf) {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
|
|
|
|
|
_("Not enough memory to load icon"));
|
|
|
|
|
return;
|
|
|
|
|
}
|
2002-09-06 21:09:49 +00:00
|
|
|
|
if (State->cursor) {
|
|
|
|
|
gchar hot[10];
|
|
|
|
|
g_snprintf (hot, 10, "%d", State->x_hot);
|
2002-09-19 21:00:52 +00:00
|
|
|
|
gdk_pixbuf_set_option (State->pixbuf, "x_hot", hot);
|
2002-09-06 21:09:49 +00:00
|
|
|
|
g_snprintf (hot, 10, "%d", State->y_hot);
|
2002-09-19 21:00:52 +00:00
|
|
|
|
gdk_pixbuf_set_option (State->pixbuf, "y_hot", hot);
|
2002-09-06 21:09:49 +00:00
|
|
|
|
}
|
1999-11-29 16:49:39 +00:00
|
|
|
|
|
|
|
|
|
if (State->prepared_func != NULL)
|
|
|
|
|
/* Notify the client that we are ready to go */
|
|
|
|
|
(*State->prepared_func) (State->pixbuf,
|
2001-05-07 15:58:47 +00:00
|
|
|
|
NULL,
|
1999-11-29 16:49:39 +00:00
|
|
|
|
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
|
2002-10-03 22:39:51 +00:00
|
|
|
|
gdk_pixbuf__ico_image_begin_load(GdkPixbufModuleSizeFunc size_func,
|
|
|
|
|
GdkPixbufModulePreparedFunc prepared_func,
|
|
|
|
|
GdkPixbufModuleUpdatedFunc updated_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);
|
2004-01-07 00:26:58 +00:00
|
|
|
|
context->size_func = size_func;
|
1999-11-29 16:49:39 +00:00
|
|
|
|
context->prepared_func = prepared_func;
|
|
|
|
|
context->updated_func = updated_func;
|
|
|
|
|
context->user_data = user_data;
|
|
|
|
|
|
|
|
|
|
context->HeaderSize = 54;
|
2001-08-20 06:47:28 +00:00
|
|
|
|
context->HeaderBuf = g_try_malloc(14 + 40 + 4*256 + 512);
|
|
|
|
|
if (!context->HeaderBuf) {
|
2002-09-27 22:06:47 +00:00
|
|
|
|
g_free (context);
|
2001-08-20 06:47:28 +00:00
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
|
|
|
|
|
_("Not enough memory to load ICO file"));
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
1999-11-29 16:49:39 +00:00
|
|
|
|
/* 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
|
|
|
|
|
*/
|
2003-03-21 00:13:17 +00:00
|
|
|
|
static 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);
|
2002-09-03 23:43:21 +00:00
|
|
|
|
|
2001-08-20 06:47:28 +00:00
|
|
|
|
context_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
|
|
|
|
}
|
|
|
|
|
|
2002-02-01 23:43:07 +00:00
|
|
|
|
static void
|
|
|
|
|
OneLine32 (struct ico_progressive_state *context)
|
|
|
|
|
{
|
|
|
|
|
gint X;
|
|
|
|
|
guchar *Pixels;
|
|
|
|
|
|
|
|
|
|
X = 0;
|
|
|
|
|
if (context->Header.Negative == 0)
|
|
|
|
|
Pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride *
|
|
|
|
|
(context->Header.height - context->Lines - 1));
|
|
|
|
|
else
|
|
|
|
|
Pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride *
|
|
|
|
|
context->Lines);
|
|
|
|
|
while (X < context->Header.width) {
|
|
|
|
|
Pixels[X * 4 + 0] = context->LineBuf[X * 4 + 2];
|
|
|
|
|
Pixels[X * 4 + 1] = context->LineBuf[X * 4 + 1];
|
|
|
|
|
Pixels[X * 4 + 2] = context->LineBuf[X * 4 + 0];
|
|
|
|
|
Pixels[X * 4 + 3] = context->LineBuf[X * 4 + 3];
|
|
|
|
|
X++;
|
|
|
|
|
}
|
|
|
|
|
}
|
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++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
2002-02-01 23:43:07 +00:00
|
|
|
|
static void
|
|
|
|
|
OneLine16 (struct ico_progressive_state *context)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
guchar *pixels;
|
|
|
|
|
guchar *src;
|
|
|
|
|
|
|
|
|
|
if (context->Header.Negative == 0)
|
|
|
|
|
pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride * (context->Header.height - context->Lines - 1));
|
|
|
|
|
else
|
|
|
|
|
pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride * context->Lines);
|
|
|
|
|
|
|
|
|
|
src = context->LineBuf;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < context->Header.width; i++) {
|
|
|
|
|
int v, r, g, b;
|
|
|
|
|
|
|
|
|
|
v = (int) src[0] | ((int) src[1] << 8);
|
|
|
|
|
src += 2;
|
|
|
|
|
|
|
|
|
|
/* Extract 5-bit RGB values */
|
|
|
|
|
|
|
|
|
|
r = (v >> 10) & 0x1f;
|
|
|
|
|
g = (v >> 5) & 0x1f;
|
|
|
|
|
b = v & 0x1f;
|
|
|
|
|
|
|
|
|
|
/* Fill the rightmost bits to form 8-bit values */
|
|
|
|
|
|
|
|
|
|
*pixels++ = (r << 3) | (r >> 2);
|
|
|
|
|
*pixels++ = (g << 3) | (g >> 2);
|
|
|
|
|
*pixels++ = (b << 3) | (b >> 2);
|
|
|
|
|
pixels++; /* skip alpha channel */
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1999-11-29 16:49:39 +00:00
|
|
|
|
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;
|
|
|
|
|
|
2003-06-28 20:04:18 +00:00
|
|
|
|
/* Ignore the XOR mask for XP style 32-bpp icons with alpha */
|
|
|
|
|
if (context->Header.depth == 32)
|
|
|
|
|
return;
|
|
|
|
|
|
1999-11-29 16:49:39 +00:00
|
|
|
|
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;
|
2002-09-03 23:43:21 +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) {
|
2002-02-01 23:43:07 +00:00
|
|
|
|
if (context->Type == 32)
|
|
|
|
|
OneLine32 (context);
|
|
|
|
|
else if (context->Type == 24)
|
1999-11-29 16:49:39 +00:00
|
|
|
|
OneLine24(context);
|
2002-02-01 23:43:07 +00:00
|
|
|
|
else if (context->Type == 16)
|
|
|
|
|
OneLine16 (context);
|
|
|
|
|
else if (context->Type == 8)
|
1999-11-29 16:49:39 +00:00
|
|
|
|
OneLine8(context);
|
2002-02-01 23:43:07 +00:00
|
|
|
|
else if (context->Type == 4)
|
1999-11-29 16:49:39 +00:00
|
|
|
|
OneLine4(context);
|
2002-02-01 23:43:07 +00:00
|
|
|
|
else if (context->Type == 1)
|
1999-11-29 16:49:39 +00:00
|
|
|
|
OneLine1(context);
|
2002-02-01 23:43:07 +00:00
|
|
|
|
else
|
|
|
|
|
g_assert_not_reached ();
|
1999-11-29 16:49:39 +00:00
|
|
|
|
} 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,
|
2002-07-06 23:54:50 +00:00
|
|
|
|
context->Lines % context->Header.height,
|
1999-11-29 16:49:39 +00:00
|
|
|
|
context->Header.width,
|
2002-07-06 23:54:50 +00:00
|
|
|
|
1,
|
2000-01-05 23:06:13 +00:00
|
|
|
|
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;
|
2001-08-20 06:47:28 +00:00
|
|
|
|
}
|
|
|
|
|
else {
|
1999-11-29 16:49:39 +00:00
|
|
|
|
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);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
2003-06-28 20:04:18 +00:00
|
|
|
|
if (context->HeaderDone >= 6 && context->pixbuf == NULL) {
|
2001-08-20 06:47:28 +00:00
|
|
|
|
GError *decode_err = NULL;
|
1999-11-29 16:49:39 +00:00
|
|
|
|
DecodeHeader(context->HeaderBuf,
|
2001-08-20 06:47:28 +00:00
|
|
|
|
context->HeaderDone, context, &decode_err);
|
2004-01-07 00:26:58 +00:00
|
|
|
|
if (context->LineBuf != NULL && context->LineWidth == 0)
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
2001-08-20 06:47:28 +00:00
|
|
|
|
if (decode_err) {
|
|
|
|
|
g_propagate_error (error, decode_err);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-11-29 16:49:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
2003-07-03 23:37:34 +00:00
|
|
|
|
/* saving ICOs */
|
|
|
|
|
|
|
|
|
|
static gint
|
|
|
|
|
write8 (FILE *f,
|
|
|
|
|
guint8 *data,
|
|
|
|
|
gint count)
|
|
|
|
|
{
|
|
|
|
|
gint bytes;
|
|
|
|
|
gint written;
|
|
|
|
|
|
|
|
|
|
written = 0;
|
|
|
|
|
while (count > 0)
|
|
|
|
|
{
|
|
|
|
|
bytes = fwrite ((char*) data, sizeof (char), count, f);
|
|
|
|
|
if (bytes <= 0)
|
|
|
|
|
break;
|
|
|
|
|
count -= bytes;
|
|
|
|
|
data += bytes;
|
|
|
|
|
written += bytes;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return written;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static gint
|
|
|
|
|
write16 (FILE *f,
|
|
|
|
|
guint16 *data,
|
|
|
|
|
gint count)
|
|
|
|
|
{
|
|
|
|
|
gint i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < count; i++)
|
|
|
|
|
data[i] = GUINT16_TO_LE (data[i]);
|
|
|
|
|
|
|
|
|
|
return write8 (f, (guint8*) data, count * 2);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static gint
|
|
|
|
|
write32 (FILE *f,
|
|
|
|
|
guint32 *data,
|
|
|
|
|
gint count)
|
|
|
|
|
{
|
|
|
|
|
gint i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < count; i++)
|
|
|
|
|
data[i] = GUINT32_TO_LE (data[i]);
|
|
|
|
|
|
|
|
|
|
return write8 (f, (guint8*) data, count * 4);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
typedef struct _IconEntry IconEntry;
|
|
|
|
|
struct _IconEntry {
|
|
|
|
|
gint width;
|
|
|
|
|
gint height;
|
|
|
|
|
gint depth;
|
|
|
|
|
gint hot_x;
|
|
|
|
|
gint hot_y;
|
|
|
|
|
|
|
|
|
|
guint8 n_colors;
|
|
|
|
|
guint32 *colors;
|
|
|
|
|
guint xor_rowstride;
|
|
|
|
|
guint8 *xor;
|
|
|
|
|
guint and_rowstride;
|
|
|
|
|
guint8 *and;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
|
fill_entry (IconEntry *icon,
|
|
|
|
|
GdkPixbuf *pixbuf,
|
|
|
|
|
gint hot_x,
|
|
|
|
|
gint hot_y,
|
|
|
|
|
GError **error)
|
|
|
|
|
{
|
|
|
|
|
guchar *p, *pixels, *and, *xor;
|
|
|
|
|
gint n_channels, v, x, y;
|
|
|
|
|
|
|
|
|
|
if (icon->width > 255 || icon->height > 255) {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_BAD_OPTION,
|
|
|
|
|
_("Image too large to be saved as ICO"));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (hot_x > -1 && hot_y > -1) {
|
|
|
|
|
icon->hot_x = hot_x;
|
2005-02-24 04:27:48 +00:00
|
|
|
|
icon->hot_y = hot_y;
|
2003-07-03 23:37:34 +00:00
|
|
|
|
if (icon->hot_x >= icon->width || icon->hot_y >= icon->height) {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_BAD_OPTION,
|
|
|
|
|
_("Cursor hotspot outside image"));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
icon->hot_x = -1;
|
|
|
|
|
icon->hot_y = -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch (icon->depth) {
|
|
|
|
|
case 32:
|
|
|
|
|
icon->xor_rowstride = icon->width * 4;
|
|
|
|
|
break;
|
|
|
|
|
case 24:
|
|
|
|
|
icon->xor_rowstride = icon->width * 3;
|
|
|
|
|
break;
|
|
|
|
|
case 16:
|
|
|
|
|
icon->xor_rowstride = icon->width * 2;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_BAD_OPTION,
|
|
|
|
|
_("Unsupported depth for ICO file: %d"), icon->depth);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ((icon->xor_rowstride % 4) != 0)
|
|
|
|
|
icon->xor_rowstride = 4 * ((icon->xor_rowstride / 4) + 1);
|
|
|
|
|
icon->xor = g_new0 (guchar, icon->xor_rowstride * icon->height);
|
|
|
|
|
|
|
|
|
|
icon->and_rowstride = icon->width / 8;
|
|
|
|
|
if ((icon->and_rowstride % 4) != 0)
|
|
|
|
|
icon->and_rowstride = 4 * ((icon->and_rowstride / 4) + 1);
|
|
|
|
|
icon->and = g_new0 (guchar, icon->and_rowstride * icon->height);
|
|
|
|
|
|
|
|
|
|
pixels = gdk_pixbuf_get_pixels (pixbuf);
|
|
|
|
|
n_channels = gdk_pixbuf_get_n_channels (pixbuf);
|
|
|
|
|
for (y = 0; y < icon->height; y++) {
|
|
|
|
|
p = pixels + gdk_pixbuf_get_rowstride (pixbuf) * (icon->height - 1 - y);
|
|
|
|
|
and = icon->and + icon->and_rowstride * y;
|
|
|
|
|
xor = icon->xor + icon->xor_rowstride * y;
|
|
|
|
|
for (x = 0; x < icon->width; x++) {
|
|
|
|
|
switch (icon->depth) {
|
|
|
|
|
case 32:
|
|
|
|
|
xor[0] = p[2];
|
|
|
|
|
xor[1] = p[1];
|
|
|
|
|
xor[2] = p[0];
|
|
|
|
|
xor[3] = 0xff;
|
|
|
|
|
if (n_channels == 4) {
|
|
|
|
|
xor[3] = p[3];
|
|
|
|
|
if (p[3] < 0x80)
|
|
|
|
|
*and |= 1 << (7 - x % 8);
|
|
|
|
|
}
|
|
|
|
|
xor += 4;
|
|
|
|
|
break;
|
|
|
|
|
case 24:
|
|
|
|
|
xor[0] = p[2];
|
|
|
|
|
xor[1] = p[1];
|
|
|
|
|
xor[2] = p[0];
|
|
|
|
|
if (n_channels == 4 && p[3] < 0x80)
|
|
|
|
|
*and |= 1 << (7 - x % 8);
|
|
|
|
|
xor += 3;
|
|
|
|
|
break;
|
|
|
|
|
case 16:
|
|
|
|
|
v = ((p[0] >> 3) << 10) | ((p[1] >> 3) << 5) | (p[2] >> 3);
|
|
|
|
|
xor[0] = v & 0xff;
|
|
|
|
|
xor[1] = v >> 8;
|
|
|
|
|
if (n_channels == 4 && p[3] < 0x80)
|
|
|
|
|
*and |= 1 << (7 - x % 8);
|
|
|
|
|
xor += 2;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
p += n_channels;
|
|
|
|
|
if (x % 8 == 7)
|
|
|
|
|
and++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
free_entry (IconEntry *icon)
|
|
|
|
|
{
|
|
|
|
|
g_free (icon->colors);
|
|
|
|
|
g_free (icon->and);
|
|
|
|
|
g_free (icon->xor);
|
|
|
|
|
g_free (icon);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
write_icon (FILE *f, GSList *entries)
|
|
|
|
|
{
|
|
|
|
|
IconEntry *icon;
|
|
|
|
|
GSList *entry;
|
|
|
|
|
guint8 bytes[4];
|
|
|
|
|
guint16 words[4];
|
|
|
|
|
guint32 dwords[6];
|
|
|
|
|
gint type;
|
|
|
|
|
gint n_entries;
|
|
|
|
|
gint offset;
|
|
|
|
|
gint size;
|
|
|
|
|
|
|
|
|
|
if (((IconEntry *)entries->data)->hot_x > -1)
|
|
|
|
|
type = 2;
|
|
|
|
|
else
|
|
|
|
|
type = 1;
|
|
|
|
|
n_entries = g_slist_length (entries);
|
|
|
|
|
|
|
|
|
|
/* header */
|
|
|
|
|
words[0] = 0;
|
|
|
|
|
words[1] = type;
|
|
|
|
|
words[2] = n_entries;
|
|
|
|
|
write16 (f, words, 3);
|
|
|
|
|
|
|
|
|
|
offset = 6 + 16 * n_entries;
|
|
|
|
|
|
|
|
|
|
for (entry = entries; entry; entry = entry->next) {
|
|
|
|
|
icon = (IconEntry *)entry->data;
|
|
|
|
|
size = 40 + icon->height * (icon->and_rowstride + icon->xor_rowstride);
|
|
|
|
|
|
|
|
|
|
/* directory entry */
|
|
|
|
|
bytes[0] = icon->width;
|
|
|
|
|
bytes[1] = icon->height;
|
|
|
|
|
bytes[2] = icon->n_colors;
|
|
|
|
|
bytes[3] = 0;
|
|
|
|
|
write8 (f, bytes, 4);
|
|
|
|
|
if (type == 1) {
|
|
|
|
|
words[0] = 1;
|
|
|
|
|
words[1] = icon->depth;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
words[0] = icon->hot_x;
|
|
|
|
|
words[1] = icon->hot_y;
|
|
|
|
|
}
|
|
|
|
|
write16 (f, words, 2);
|
|
|
|
|
dwords[0] = size;
|
|
|
|
|
dwords[1] = offset;
|
|
|
|
|
write32 (f, dwords, 2);
|
|
|
|
|
|
|
|
|
|
offset += size;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (entry = entries; entry; entry = entry->next) {
|
|
|
|
|
icon = (IconEntry *)entry->data;
|
|
|
|
|
|
|
|
|
|
/* bitmap header */
|
|
|
|
|
dwords[0] = 40;
|
|
|
|
|
dwords[1] = icon->width;
|
|
|
|
|
dwords[2] = icon->height * 2;
|
|
|
|
|
write32 (f, dwords, 3);
|
|
|
|
|
words[0] = 1;
|
|
|
|
|
words[1] = icon->depth;
|
|
|
|
|
write16 (f, words, 2);
|
|
|
|
|
dwords[0] = 0;
|
|
|
|
|
dwords[1] = 0;
|
|
|
|
|
dwords[2] = 0;
|
|
|
|
|
dwords[3] = 0;
|
|
|
|
|
dwords[4] = 0;
|
|
|
|
|
dwords[5] = 0;
|
|
|
|
|
write32 (f, dwords, 6);
|
|
|
|
|
|
|
|
|
|
/* image data */
|
|
|
|
|
write8 (f, icon->xor, icon->xor_rowstride * icon->height);
|
|
|
|
|
write8 (f, icon->and, icon->and_rowstride * icon->height);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
|
gdk_pixbuf__ico_image_save (FILE *f,
|
|
|
|
|
GdkPixbuf *pixbuf,
|
|
|
|
|
gchar **keys,
|
|
|
|
|
gchar **values,
|
|
|
|
|
GError **error)
|
|
|
|
|
{
|
|
|
|
|
gint hot_x, hot_y;
|
|
|
|
|
IconEntry *icon;
|
|
|
|
|
GSList *entries = NULL;
|
|
|
|
|
|
|
|
|
|
/* support only single-image ICOs for now */
|
|
|
|
|
icon = g_new0 (IconEntry, 1);
|
|
|
|
|
icon->width = gdk_pixbuf_get_width (pixbuf);
|
|
|
|
|
icon->height = gdk_pixbuf_get_height (pixbuf);
|
|
|
|
|
icon->depth = gdk_pixbuf_get_has_alpha (pixbuf) ? 32 : 24;
|
|
|
|
|
hot_x = -1;
|
|
|
|
|
hot_y = -1;
|
|
|
|
|
|
|
|
|
|
/* parse options */
|
|
|
|
|
if (keys && *keys) {
|
|
|
|
|
gchar **kiter;
|
|
|
|
|
gchar **viter;
|
|
|
|
|
|
|
|
|
|
for (kiter = keys, viter = values; *kiter && *viter; kiter++, viter++) {
|
|
|
|
|
char *endptr;
|
|
|
|
|
if (strcmp (*kiter, "depth") == 0) {
|
|
|
|
|
sscanf (*viter, "%d", &icon->depth);
|
|
|
|
|
}
|
|
|
|
|
else if (strcmp (*kiter, "x_hot") == 0) {
|
|
|
|
|
hot_x = strtol (*viter, &endptr, 10);
|
|
|
|
|
}
|
|
|
|
|
else if (strcmp (*kiter, "y_hot") == 0) {
|
|
|
|
|
hot_y = strtol (*viter, &endptr, 10);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!fill_entry (icon, pixbuf, hot_x, hot_y, error)) {
|
|
|
|
|
free_entry (icon);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
entries = g_slist_append (entries, icon);
|
|
|
|
|
write_icon (f, entries);
|
|
|
|
|
|
|
|
|
|
g_slist_foreach (entries, (GFunc)free_entry, NULL);
|
|
|
|
|
g_slist_free (entries);
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
2008-05-30 13:34:52 +00:00
|
|
|
|
#ifndef INCLUDE_ico
|
2008-05-27 16:51:33 +00:00
|
|
|
|
#define MODULE_ENTRY(function) G_MODULE_EXPORT void function
|
2006-10-11 12:41:14 +00:00
|
|
|
|
#else
|
2008-05-27 16:51:33 +00:00
|
|
|
|
#define MODULE_ENTRY(function) void _gdk_pixbuf__ico_ ## function
|
2006-10-11 12:41:14 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
2008-05-27 16:51:33 +00:00
|
|
|
|
MODULE_ENTRY (fill_vtable) (GdkPixbufModule *module)
|
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
|
|
|
|
{
|
2002-10-03 22:39:51 +00:00
|
|
|
|
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;
|
2003-07-03 23:37:34 +00:00
|
|
|
|
module->save = gdk_pixbuf__ico_image_save;
|
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
|
|
|
|
}
|
2002-10-03 22:39:51 +00:00
|
|
|
|
|
2008-05-27 16:51:33 +00:00
|
|
|
|
MODULE_ENTRY (fill_info) (GdkPixbufFormat *info)
|
2002-10-03 22:39:51 +00:00
|
|
|
|
{
|
|
|
|
|
static GdkPixbufModulePattern signature[] = {
|
|
|
|
|
{ " \x1 ", "zz znz", 100 },
|
|
|
|
|
{ " \x2 ", "zz znz", 100 },
|
|
|
|
|
{ NULL, NULL, 0 }
|
|
|
|
|
};
|
|
|
|
|
static gchar * mime_types[] = {
|
|
|
|
|
"image/x-icon",
|
2007-02-27 19:28:28 +00:00
|
|
|
|
"image/x-ico",
|
2008-06-18 15:15:54 +00:00
|
|
|
|
"image/x-win-bitmap",
|
2002-10-03 22:39:51 +00:00
|
|
|
|
NULL
|
|
|
|
|
};
|
|
|
|
|
static gchar * extensions[] = {
|
|
|
|
|
"ico",
|
|
|
|
|
"cur",
|
|
|
|
|
NULL
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
info->name = "ico";
|
|
|
|
|
info->signature = signature;
|
|
|
|
|
info->description = N_("The ICO image format");
|
|
|
|
|
info->mime_types = mime_types;
|
|
|
|
|
info->extensions = extensions;
|
Changes to make gdk-pixbuf threadsafe (#157310, #157306, Colin Walters):
2004-11-12 Matthias Clasen <mclasen@redhat.com>
Changes to make gdk-pixbuf threadsafe (#157310, #157306,
Colin Walters):
* gdk-pixbuf-io.h (enum GdkPixbufFormatFlags): Add
GDK_PIXBUF_FORMAT_THREADSAFE to indicate that an image loader
is threadsafe.
* gdk-pixbuf-io.c (get_file_formats, _gdk_pixbuf_load_module):
Use a lock to make initialization of global data structures
threadsafe.
* gdk-pixbuf-private.h:
* gdk-pixbuf-io.c (_gdk_pixbuf_lock, _gdk_pixbuf_unlock):
Auxiliary functions which use another lock to protect
threadunsafe image loaders.
* gdk-pixbuf-io.c (gdk_pixbuf_real_save):
(save_to_callback_with_tmp_file):
(gdk_pixbuf_real_save_to_callback):
(gdk_pixbuf_new_from_xpm_data):
(_gdk_pixbuf_generic_image_load):
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_new_from_file):
* gdk-pixbuf-loader.c (gdk_pixbuf_loader_load_module):
(gdk_pixbuf_loader_close):
(gdk_pixbuf_loader_finalize):
Use _gdk_pixbuf_lock() and _gdk_pixbuf_unlock().
* io-ani.c, io-bmp.c, io-gif.c, io-ico.c:
* io-jpeg.c, io-pcx.c, io-png.c, io-pnm.c:
* io-ras.c, io-tga.c, io-wbmp.c, io-xbm.c:
* io-xpm.c: Mark as threadsafe.
* io-tiff.c: Remove pointless locking, mark as
threadunsafe.
2004-11-12 05:34:31 +00:00
|
|
|
|
info->flags = GDK_PIXBUF_FORMAT_WRITABLE | GDK_PIXBUF_FORMAT_THREADSAFE;
|
2004-07-08 03:56:36 +00:00
|
|
|
|
info->license = "LGPL";
|
2002-10-03 22:39:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|