AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Return a GdkPixbufLoader, not a GtkObject.

Browse Source 
1999-10-27  Federico Mena Quintero  <federico@redhat.com>

	* src/gdk-pixbuf-loader.c (gdk_pixbuf_loader_new): Return a
	GdkPixbufLoader, not a GtkObject.
	(gtk_marshal_NONE__INT_INT_INT_INT): Made static.
	(gdk_pixbuf_loader_get_type): Documented.
	(gdk_pixbuf_loader_class_init): Initialize the parent class
	correctly.
	(gdk_pixbuf_loader_destroy): Added sanity checks. Call the parent
	class destroy function.
	(gdk_pixbuf_loader_new): Documented.
	(gdk_pixbuf_loader_finalize): Call the parent class finalize
	function.
	(gdk_pixbuf_loader_write): Use size_t for count.
This commit is contained in:
Federico Mena Quintero 1999-10-27 17:31:07 +00:00 committed by Arturo Espinosa
parent 1a0a5d0399
commit 23b0f15ee8
7 changed files with 246 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,18 @@
1999-10-27 Federico Mena Quintero <federico@redhat.com>
* src/gdk-pixbuf-loader.c (gdk_pixbuf_loader_new): Return a
GdkPixbufLoader, not a GtkObject.
(gtk_marshal_NONE__INT_INT_INT_INT): Made static.
(gdk_pixbuf_loader_get_type): Documented.
(gdk_pixbuf_loader_class_init): Initialize the parent class
correctly.
(gdk_pixbuf_loader_destroy): Added sanity checks. Call the parent
class destroy function.
(gdk_pixbuf_loader_new): Documented.
(gdk_pixbuf_loader_finalize): Call the parent class finalize
function.
(gdk_pixbuf_loader_write): Use size_t for count.
1999-10-27 Michael Fulbright <msf@avatar.labs.redhat.com> 1999-10-27 Michael Fulbright <msf@avatar.labs.redhat.com>
* src/gdk-pixbuf-loader.c (gdk_pixbuf_loader_destroy): Fixed * src/gdk-pixbuf-loader.c (gdk_pixbuf_loader_destroy): Fixed

4
gdk-pixbuf/gdk-pixbuf-io.h
View File

@ -26,13 +26,15 @@
#include "gdk-pixbuf.h" #include "gdk-pixbuf.h"
#include <stdio.h> #include <stdio.h>
typedef void (* ModulePreparedNotifyFunc) (GdkPixbuf *pixbuf, gpointer user_data); typedef void (* ModulePreparedNotifyFunc) (GdkPixbuf *pixbuf, gpointer user_data);
typedef struct _ModuleType ModuleType; typedef struct _ModuleType ModuleType;
struct _ModuleType { struct _ModuleType {
char *module_name; char *module_name;
gboolean (* format_check) (guchar *buffer, int size);
GModule *module; GModule *module;
gboolean (* format_check) (guchar *buffer, int size);
GdkPixbuf *(* load) (FILE *f); GdkPixbuf *(* load) (FILE *f);
GdkPixbuf *(* load_xpm_data) (const gchar **data); GdkPixbuf *(* load_xpm_data) (const gchar **data);

160
gdk-pixbuf/gdk-pixbuf-loader.c
View File

@ -27,6 +27,8 @@
#include "gdk-pixbuf-io.h" #include "gdk-pixbuf-io.h"
#include <gtk/gtksignal.h> #include <gtk/gtksignal.h>
enum { enum {
AREA_UPDATED, AREA_UPDATED,
AREA_PREPARED, AREA_PREPARED,
@ -41,35 +43,32 @@ static void gdk_pixbuf_loader_init (GdkPixbufLoader *loader);
static void gdk_pixbuf_loader_destroy (GtkObject *loader); static void gdk_pixbuf_loader_destroy (GtkObject *loader);
static void gdk_pixbuf_loader_finalize (GtkObject *loader); static void gdk_pixbuf_loader_finalize (GtkObject *loader);
static guint pixbuf_loader_signals[LAST_SIGNAL] = { 0 };
/* Internal data */ /* Internal data */
typedef struct _GdkPixbufLoaderPrivate GdkPixbufLoaderPrivate; typedef struct {
struct _GdkPixbufLoaderPrivate
{
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
gboolean closed; gboolean closed;
gchar buf[128]; gchar buf[128];
gint buf_offset; gint buf_offset;
ModuleType *image_module; ModuleType *image_module;
gpointer context; gpointer context;
}; } GdkPixbufLoaderPrivate;
static guint pixbuf_loader_signals[LAST_SIGNAL] = { 0 };
/* our marshaller */ /* our marshaller */
typedef void (*GtkSignal_NONE__INT_INT_INT_INT) (GtkObject * object, typedef void (* GtkSignal_NONE__INT_INT_INT_INT) (GtkObject *object,
gint arg1, gint arg1, gint arg2, gint arg3, gint arg4,
gint arg2,
gint arg3,
gint arg4,
gpointer user_data); gpointer user_data);
void static void
gtk_marshal_NONE__INT_INT_INT_INT (GtkObject * object, gtk_marshal_NONE__INT_INT_INT_INT (GtkObject *object, GtkSignalFunc func, gpointer func_data,
GtkSignalFunc func,
gpointer func_data,
GtkArg * args) GtkArg * args)
{ {
GtkSignal_NONE__INT_INT_INT_INT rfunc; GtkSignal_NONE__INT_INT_INT_INT rfunc;
rfunc = (GtkSignal_NONE__INT_INT_INT_INT) func; rfunc = (GtkSignal_NONE__INT_INT_INT_INT) func;
(*rfunc) (object, (*rfunc) (object,
GTK_VALUE_INT (args[0]), GTK_VALUE_INT (args[0]),
@ -79,6 +78,17 @@ gtk_marshal_NONE__INT_INT_INT_INT (GtkObject * object,
func_data); func_data);
} }
/**
* gdk_pixbuf_loader_get_type:
* @void:
*
* Registers the &GdkPixubfLoader class if necessary, and returns the type ID
* associated to it.
*
* Return value: The type ID of the &GdkPixbufLoader class.
**/
GtkType GtkType
gdk_pixbuf_loader_get_type (void) gdk_pixbuf_loader_get_type (void)
{ {
@ -103,9 +113,13 @@ gdk_pixbuf_loader_get_type (void)
} }
static void static void
gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *klass) gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *class)
{ {
parent_class = GTK_OBJECT_CLASS (klass); GtkObjectClass *object_class;
object_class = (GtkObjectClass *) class;
parent_class = gtk_type_class (gtk_object_get_type ());
pixbuf_loader_signals[AREA_PREPARED] = pixbuf_loader_signals[AREA_PREPARED] =
gtk_signal_new ("area_prepared", gtk_signal_new ("area_prepared",
@ -121,7 +135,11 @@ gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *klass)
parent_class->type, parent_class->type,
GTK_SIGNAL_OFFSET (GdkPixbufLoaderClass, area_updated), GTK_SIGNAL_OFFSET (GdkPixbufLoaderClass, area_updated),
gtk_marshal_NONE__INT_INT_INT_INT, gtk_marshal_NONE__INT_INT_INT_INT,
GTK_TYPE_NONE, 4, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_INT); GTK_TYPE_NONE, 4,
GTK_TYPE_INT,
GTK_TYPE_INT,
GTK_TYPE_INT,
GTK_TYPE_INT);
pixbuf_loader_signals[CLOSED] = pixbuf_loader_signals[CLOSED] =
gtk_signal_new ("closed", gtk_signal_new ("closed",
@ -131,10 +149,10 @@ gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *klass)
gtk_marshal_NONE__NONE, gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0); GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (parent_class, pixbuf_loader_signals, LAST_SIGNAL); gtk_object_class_add_signals (object_class, pixbuf_loader_signals, LAST_SIGNAL);
parent_class->destroy = gdk_pixbuf_loader_destroy; object_class->destroy = gdk_pixbuf_loader_destroy;
parent_class->finalize = gdk_pixbuf_loader_finalize; object_class->finalize = gdk_pixbuf_loader_finalize;
} }
static void static void
@ -142,13 +160,8 @@ gdk_pixbuf_loader_init (GdkPixbufLoader *loader)
{ {
GdkPixbufLoaderPrivate *priv; GdkPixbufLoaderPrivate *priv;
priv = g_new (GdkPixbufLoaderPrivate, 1); priv = g_new0 (GdkPixbufLoaderPrivate, 1);
loader->private = priv; loader->private = priv;
priv->image_module=NULL;
priv->pixbuf = NULL;
priv->closed = FALSE;
priv->buf_offset = 0;
} }
static void static void
@ -156,14 +169,19 @@ gdk_pixbuf_loader_destroy (GtkObject *loader)
{ {
GdkPixbufLoaderPrivate *priv = NULL; GdkPixbufLoaderPrivate *priv = NULL;
g_return_if_fail (loader != NULL);
g_return_if_fail (GDK_IS_PIXBUF_LOADER (loader));
priv = GDK_PIXBUF_LOADER (loader)->private; priv = GDK_PIXBUF_LOADER (loader)->private;
/* We want to close it if it's not already closed */
if (!priv->closed) if (!priv->closed)
gdk_pixbuf_loader_close (GDK_PIXBUF_LOADER (loader)); gdk_pixbuf_loader_close (GDK_PIXBUF_LOADER (loader));
if (priv->pixbuf) if (priv->pixbuf)
gdk_pixbuf_unref (priv->pixbuf); gdk_pixbuf_unref (priv->pixbuf);
if (GTK_OBJECT_CLASS (parent_class)->destroy)
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
} }
static void static void
@ -173,6 +191,9 @@ gdk_pixbuf_loader_finalize (GtkObject *loader)
priv = GDK_PIXBUF_LOADER (loader)->private; priv = GDK_PIXBUF_LOADER (loader)->private;
g_free (priv); g_free (priv);
if (GTK_OBJECT_CLASS (parent_class)->finalize)
(* GTK_OBJECT_CLASS (parent_class)->finalize) (object);
} }
static void static void
@ -188,20 +209,25 @@ gdk_pixbuf_loader_prepare (GdkPixbuf *pixbuf, gpointer loader)
gtk_signal_emit (GTK_OBJECT (loader), pixbuf_loader_signals[AREA_PREPARED]); gtk_signal_emit (GTK_OBJECT (loader), pixbuf_loader_signals[AREA_PREPARED]);
} }
/* Public functions */
GtkObject *
/**
* gdk_pixbuf_loader_new:
* @void:
*
* Creates a new pixbuf loader object.
*
* Return value: A newly-created pixbuf loader.
**/
GdkPixbufLoader *
gdk_pixbuf_loader_new (void) gdk_pixbuf_loader_new (void)
{ {
GdkPixbufLoader *loader; return gtk_type_new (gdk_pixbuf_loader_get_type ());
loader = gtk_type_new (gdk_pixbuf_loader_get_type ());
return GTK_OBJECT (loader);
} }
/** /**
* gdk_pixbuf_loader_write: * gdk_pixbuf_loader_write:
* @loader: A loader. * @loader: A pixbuf loader.
* @buf: The image data. * @buf: The image data.
* @count: The length of @buf in bytes. * @count: The length of @buf in bytes.
* *
@ -213,7 +239,7 @@ gdk_pixbuf_loader_new (void)
* cannot parse the buf. * cannot parse the buf.
**/ **/
gboolean gboolean
gdk_pixbuf_loader_write (GdkPixbufLoader *loader, gchar *buf, gint count) gdk_pixbuf_loader_write (GdkPixbufLoader *loader, guchar *buf, size_t count)
{ {
GdkPixbufLoaderPrivate *priv; GdkPixbufLoaderPrivate *priv;
@ -230,54 +256,59 @@ gdk_pixbuf_loader_write (GdkPixbufLoader *loader, gchar *buf, gint count)
if (priv->image_module == NULL) { if (priv->image_module == NULL) {
gboolean retval = TRUE; gboolean retval = TRUE;
g_print ("buf_offset:%d:\n", priv->buf_offset);
memcpy (priv->buf + priv->buf_offset, memcpy (priv->buf + priv->buf_offset,
buf, buf,
(priv->buf_offset + count) > 128 ? 128 - priv->buf_offset : count); (priv->buf_offset + count > 128) ? (128 - priv->buf_offset) : count);
if ((priv->buf_offset + count) >= 128) {
if (priv->buf_offset + count >= 128) {
/* We have enough data to start doing something with the image */ /* We have enough data to start doing something with the image */
priv->image_module = gdk_pixbuf_get_module (priv->buf, 128); priv->image_module = gdk_pixbuf_get_module (priv->buf, 128);
if (priv->image_module == NULL) { if (priv->image_module == NULL)
return FALSE; return FALSE;
} else if ((priv->image_module->begin_load == NULL) || else if ((priv->image_module->begin_load == NULL) ||
(priv->image_module->stop_load == NULL) || (priv->image_module->stop_load == NULL) ||
(priv->image_module->load_increment == NULL)) { (priv->image_module->load_increment == NULL)) {
g_warning ("module %s does not support incremental loading.\n", priv->image_module->module_name); g_warning ("module %s does not support incremental loading.\n",
priv->image_module->module_name);
return FALSE; return FALSE;
} else { } else {
g_print ("module loaded: name is %s\n", priv->image_module->module_name); priv->context = (*priv->image_module->begin_load) (
priv->context = (priv->image_module->begin_load) (gdk_pixbuf_loader_prepare, loader); gdk_pixbuf_loader_prepare, loader);
if (priv->context == NULL) { if (priv->context == NULL) {
g_warning("Failed to begin progressive load"); g_warning("Failed to begin progressive load");
return FALSE; return FALSE;
} }
retval = (priv->image_module->load_increment) (priv->context, priv->buf, 128); retval = (* priv->image_module->load_increment) (
priv->context, priv->buf, 128);
/* if we had more then 128 bytes total, we want
* to send the rest of the buffer.
*/
/* if we had more then 128 bytes total, we want to send the rest of the buffer */
if (retval && (priv->buf_offset + count) >= 128) { if (retval && (priv->buf_offset + count) >= 128) {
retval = (priv->image_module->load_increment) (priv->context, retval = (* priv->image_module->load_increment) (
priv->context,
buf, buf,
count + priv->buf_offset - 128); count + priv->buf_offset - 128);
} }
} }
} else { } else
priv->buf_offset += count; priv->buf_offset += count;
}
return retval; return retval;
} }
if (priv->image_module->load_increment) if (priv->image_module->load_increment)
return (priv->image_module->load_increment) (priv->context, return (* priv->image_module->load_increment) (priv->context, buf, count);
buf,
count);
return (FALSE); return (FALSE);
} }
/** /**
* gdk_pixbuf_loader_get_pixbuf: * gdk_pixbuf_loader_get_pixbuf:
* @loader: A loader. * @loader: A pixbuf loader.
* *
* Gets the GdkPixbuf that the loader is currently loading. If the loader * Gets the GdkPixbuf that the loader is currently loading. If the loader
* hasn't been enough data via gdk_pixbuf_loader_write, then NULL is returned. * hasn't been enough data via gdk_pixbuf_loader_write, then NULL is returned.
@ -295,6 +326,7 @@ gdk_pixbuf_loader_get_pixbuf (GdkPixbufLoader *loader)
g_return_val_if_fail (loader != NULL, NULL); g_return_val_if_fail (loader != NULL, NULL);
g_return_val_if_fail (GDK_IS_PIXBUF_LOADER (loader), NULL); g_return_val_if_fail (GDK_IS_PIXBUF_LOADER (loader), NULL);
priv = loader->private; priv = loader->private;
return priv->pixbuf; return priv->pixbuf;
@ -302,10 +334,9 @@ gdk_pixbuf_loader_get_pixbuf (GdkPixbufLoader *loader)
/** /**
* gdk_pixbuf_loader_close: * gdk_pixbuf_loader_close:
* @loader: A loader. * @loader: A pixbuf loader.
*
* Tells the loader to stop accepting writes
* *
* Tells the loader to stop accepting writes.
**/ **/
void void
gdk_pixbuf_loader_close (GdkPixbufLoader *loader) gdk_pixbuf_loader_close (GdkPixbufLoader *loader)
@ -325,20 +356,21 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader)
priv->image_module = gdk_pixbuf_get_module (priv->buf, priv->buf_offset); priv->image_module = gdk_pixbuf_get_module (priv->buf, priv->buf_offset);
if (priv->image_module && if (priv->image_module &&
((priv->image_module->begin_load == NULL) || ((priv->image_module->begin_load == NULL) ||
(priv->image_module->begin_load == NULL) || (priv->image_module->stop_load == NULL) ||
(priv->image_module->begin_load == NULL) || (priv->image_module->load_increment == NULL))) {
(priv->image_module->begin_load == NULL))) { g_warning ("module %s does not support incremental loading.\n",
g_warning ("module %s does not support incremental loading.\n", priv->image_module->module_name); priv->image_module->module_name);
} else if (priv->image_module) { } else if (priv->image_module) {
g_print ("module loaded: name is %s\n", priv->image_module->module_name); g_print ("module loaded: name is %s\n", priv->image_module->module_name);
priv->context = (priv->image_module->begin_load) (gdk_pixbuf_loader_prepare, loader); priv->context = (* priv->image_module->begin_load) (
(priv->image_module->load_increment) (priv->context, priv->buf, priv->buf_offset); gdk_pixbuf_loader_prepare, loader);
(* priv->image_module->load_increment) (priv->context,
priv->buf, priv->buf_offset);
} }
} }
if (priv->image_module && priv->image_module->stop_load) if (priv->image_module && priv->image_module->stop_load)
(priv->image_module->stop_load) (priv->context); (* priv->image_module->stop_load) (priv->context);
priv->closed = TRUE; priv->closed = TRUE;
} }

4
gdk-pixbuf/gdk-pixbuf-loader.h
View File

@ -67,8 +67,8 @@ struct _GdkPixbufLoaderClass {
GtkType gdk_pixbuf_loader_get_type (void); GtkType gdk_pixbuf_loader_get_type (void);
GtkObject *gdk_pixbuf_loader_new (void); GdkPixbufLoader *gdk_pixbuf_loader_new (void);
gboolean gdk_pixbuf_loader_write (GdkPixbufLoader *loader, gchar *buf, gint count); gboolean gdk_pixbuf_loader_write (GdkPixbufLoader *loader, guchar *buf, size_t count);
GdkPixbuf *gdk_pixbuf_loader_get_pixbuf (GdkPixbufLoader *loader); GdkPixbuf *gdk_pixbuf_loader_get_pixbuf (GdkPixbufLoader *loader);
void gdk_pixbuf_loader_close (GdkPixbufLoader *loader); void gdk_pixbuf_loader_close (GdkPixbufLoader *loader);

4
gdk-pixbuf/gnome-canvas-pixbuf.c
View File

@ -607,6 +607,6 @@ gnome_canvas_pixbuf_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
art_affine_scale (scale, i_len, j_len); art_affine_scale (scale, i_len, j_len);
art_affine_multiply (final, i2c, scale); art_affine_multiply (final, i2c, scale);
buf = g_new0 (guchar, width * height * 3); buf = g_new0 (guchar, width * height * 4);
transform_pixbuf (buf, x, y, width, height, width * 3, priv->pixbuf, final); transform_pixbuf (buf, x, y, width, height, width * 4, priv->pixbuf, final);
} }

160
gtk/gdk-pixbuf-loader.c
View File

@ -27,6 +27,8 @@
#include "gdk-pixbuf-io.h" #include "gdk-pixbuf-io.h"
#include <gtk/gtksignal.h> #include <gtk/gtksignal.h>
enum { enum {
AREA_UPDATED, AREA_UPDATED,
AREA_PREPARED, AREA_PREPARED,
@ -41,35 +43,32 @@ static void gdk_pixbuf_loader_init (GdkPixbufLoader *loader);
static void gdk_pixbuf_loader_destroy (GtkObject *loader); static void gdk_pixbuf_loader_destroy (GtkObject *loader);
static void gdk_pixbuf_loader_finalize (GtkObject *loader); static void gdk_pixbuf_loader_finalize (GtkObject *loader);
static guint pixbuf_loader_signals[LAST_SIGNAL] = { 0 };
/* Internal data */ /* Internal data */
typedef struct _GdkPixbufLoaderPrivate GdkPixbufLoaderPrivate; typedef struct {
struct _GdkPixbufLoaderPrivate
{
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
gboolean closed; gboolean closed;
gchar buf[128]; gchar buf[128];
gint buf_offset; gint buf_offset;
ModuleType *image_module; ModuleType *image_module;
gpointer context; gpointer context;
}; } GdkPixbufLoaderPrivate;
static guint pixbuf_loader_signals[LAST_SIGNAL] = { 0 };
/* our marshaller */ /* our marshaller */
typedef void (*GtkSignal_NONE__INT_INT_INT_INT) (GtkObject * object, typedef void (* GtkSignal_NONE__INT_INT_INT_INT) (GtkObject *object,
gint arg1, gint arg1, gint arg2, gint arg3, gint arg4,
gint arg2,
gint arg3,
gint arg4,
gpointer user_data); gpointer user_data);
void static void
gtk_marshal_NONE__INT_INT_INT_INT (GtkObject * object, gtk_marshal_NONE__INT_INT_INT_INT (GtkObject *object, GtkSignalFunc func, gpointer func_data,
GtkSignalFunc func,
gpointer func_data,
GtkArg * args) GtkArg * args)
{ {
GtkSignal_NONE__INT_INT_INT_INT rfunc; GtkSignal_NONE__INT_INT_INT_INT rfunc;
rfunc = (GtkSignal_NONE__INT_INT_INT_INT) func; rfunc = (GtkSignal_NONE__INT_INT_INT_INT) func;
(*rfunc) (object, (*rfunc) (object,
GTK_VALUE_INT (args[0]), GTK_VALUE_INT (args[0]),
@ -79,6 +78,17 @@ gtk_marshal_NONE__INT_INT_INT_INT (GtkObject * object,
func_data); func_data);
} }
/**
* gdk_pixbuf_loader_get_type:
* @void:
*
* Registers the &GdkPixubfLoader class if necessary, and returns the type ID
* associated to it.
*
* Return value: The type ID of the &GdkPixbufLoader class.
**/
GtkType GtkType
gdk_pixbuf_loader_get_type (void) gdk_pixbuf_loader_get_type (void)
{ {
@ -103,9 +113,13 @@ gdk_pixbuf_loader_get_type (void)
} }
static void static void
gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *klass) gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *class)
{ {
parent_class = GTK_OBJECT_CLASS (klass); GtkObjectClass *object_class;
object_class = (GtkObjectClass *) class;
parent_class = gtk_type_class (gtk_object_get_type ());
pixbuf_loader_signals[AREA_PREPARED] = pixbuf_loader_signals[AREA_PREPARED] =
gtk_signal_new ("area_prepared", gtk_signal_new ("area_prepared",
@ -121,7 +135,11 @@ gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *klass)
parent_class->type, parent_class->type,
GTK_SIGNAL_OFFSET (GdkPixbufLoaderClass, area_updated), GTK_SIGNAL_OFFSET (GdkPixbufLoaderClass, area_updated),
gtk_marshal_NONE__INT_INT_INT_INT, gtk_marshal_NONE__INT_INT_INT_INT,
GTK_TYPE_NONE, 4, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_INT); GTK_TYPE_NONE, 4,
GTK_TYPE_INT,
GTK_TYPE_INT,
GTK_TYPE_INT,
GTK_TYPE_INT);
pixbuf_loader_signals[CLOSED] = pixbuf_loader_signals[CLOSED] =
gtk_signal_new ("closed", gtk_signal_new ("closed",
@ -131,10 +149,10 @@ gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *klass)
gtk_marshal_NONE__NONE, gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0); GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (parent_class, pixbuf_loader_signals, LAST_SIGNAL); gtk_object_class_add_signals (object_class, pixbuf_loader_signals, LAST_SIGNAL);
parent_class->destroy = gdk_pixbuf_loader_destroy; object_class->destroy = gdk_pixbuf_loader_destroy;
parent_class->finalize = gdk_pixbuf_loader_finalize; object_class->finalize = gdk_pixbuf_loader_finalize;
} }
static void static void
@ -142,13 +160,8 @@ gdk_pixbuf_loader_init (GdkPixbufLoader *loader)
{ {
GdkPixbufLoaderPrivate *priv; GdkPixbufLoaderPrivate *priv;
priv = g_new (GdkPixbufLoaderPrivate, 1); priv = g_new0 (GdkPixbufLoaderPrivate, 1);
loader->private = priv; loader->private = priv;
priv->image_module=NULL;
priv->pixbuf = NULL;
priv->closed = FALSE;
priv->buf_offset = 0;
} }
static void static void
@ -156,14 +169,19 @@ gdk_pixbuf_loader_destroy (GtkObject *loader)
{ {
GdkPixbufLoaderPrivate *priv = NULL; GdkPixbufLoaderPrivate *priv = NULL;
g_return_if_fail (loader != NULL);
g_return_if_fail (GDK_IS_PIXBUF_LOADER (loader));
priv = GDK_PIXBUF_LOADER (loader)->private; priv = GDK_PIXBUF_LOADER (loader)->private;
/* We want to close it if it's not already closed */
if (!priv->closed) if (!priv->closed)
gdk_pixbuf_loader_close (GDK_PIXBUF_LOADER (loader)); gdk_pixbuf_loader_close (GDK_PIXBUF_LOADER (loader));
if (priv->pixbuf) if (priv->pixbuf)
gdk_pixbuf_unref (priv->pixbuf); gdk_pixbuf_unref (priv->pixbuf);
if (GTK_OBJECT_CLASS (parent_class)->destroy)
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
} }
static void static void
@ -173,6 +191,9 @@ gdk_pixbuf_loader_finalize (GtkObject *loader)
priv = GDK_PIXBUF_LOADER (loader)->private; priv = GDK_PIXBUF_LOADER (loader)->private;
g_free (priv); g_free (priv);
if (GTK_OBJECT_CLASS (parent_class)->finalize)
(* GTK_OBJECT_CLASS (parent_class)->finalize) (object);
} }
static void static void
@ -188,20 +209,25 @@ gdk_pixbuf_loader_prepare (GdkPixbuf *pixbuf, gpointer loader)
gtk_signal_emit (GTK_OBJECT (loader), pixbuf_loader_signals[AREA_PREPARED]); gtk_signal_emit (GTK_OBJECT (loader), pixbuf_loader_signals[AREA_PREPARED]);
} }
/* Public functions */
GtkObject *
/**
* gdk_pixbuf_loader_new:
* @void:
*
* Creates a new pixbuf loader object.
*
* Return value: A newly-created pixbuf loader.
**/
GdkPixbufLoader *
gdk_pixbuf_loader_new (void) gdk_pixbuf_loader_new (void)
{ {
GdkPixbufLoader *loader; return gtk_type_new (gdk_pixbuf_loader_get_type ());
loader = gtk_type_new (gdk_pixbuf_loader_get_type ());
return GTK_OBJECT (loader);
} }
/** /**
* gdk_pixbuf_loader_write: * gdk_pixbuf_loader_write:
* @loader: A loader. * @loader: A pixbuf loader.
* @buf: The image data. * @buf: The image data.
* @count: The length of @buf in bytes. * @count: The length of @buf in bytes.
* *
@ -213,7 +239,7 @@ gdk_pixbuf_loader_new (void)
* cannot parse the buf. * cannot parse the buf.
**/ **/
gboolean gboolean
gdk_pixbuf_loader_write (GdkPixbufLoader *loader, gchar *buf, gint count) gdk_pixbuf_loader_write (GdkPixbufLoader *loader, guchar *buf, size_t count)
{ {
GdkPixbufLoaderPrivate *priv; GdkPixbufLoaderPrivate *priv;
@ -230,54 +256,59 @@ gdk_pixbuf_loader_write (GdkPixbufLoader *loader, gchar *buf, gint count)
if (priv->image_module == NULL) { if (priv->image_module == NULL) {
gboolean retval = TRUE; gboolean retval = TRUE;
g_print ("buf_offset:%d:\n", priv->buf_offset);
memcpy (priv->buf + priv->buf_offset, memcpy (priv->buf + priv->buf_offset,
buf, buf,
(priv->buf_offset + count) > 128 ? 128 - priv->buf_offset : count); (priv->buf_offset + count > 128) ? (128 - priv->buf_offset) : count);
if ((priv->buf_offset + count) >= 128) {
if (priv->buf_offset + count >= 128) {
/* We have enough data to start doing something with the image */ /* We have enough data to start doing something with the image */
priv->image_module = gdk_pixbuf_get_module (priv->buf, 128); priv->image_module = gdk_pixbuf_get_module (priv->buf, 128);
if (priv->image_module == NULL) { if (priv->image_module == NULL)
return FALSE; return FALSE;
} else if ((priv->image_module->begin_load == NULL) || else if ((priv->image_module->begin_load == NULL) ||
(priv->image_module->stop_load == NULL) || (priv->image_module->stop_load == NULL) ||
(priv->image_module->load_increment == NULL)) { (priv->image_module->load_increment == NULL)) {
g_warning ("module %s does not support incremental loading.\n", priv->image_module->module_name); g_warning ("module %s does not support incremental loading.\n",
priv->image_module->module_name);
return FALSE; return FALSE;
} else { } else {
g_print ("module loaded: name is %s\n", priv->image_module->module_name); priv->context = (*priv->image_module->begin_load) (
priv->context = (priv->image_module->begin_load) (gdk_pixbuf_loader_prepare, loader); gdk_pixbuf_loader_prepare, loader);
if (priv->context == NULL) { if (priv->context == NULL) {
g_warning("Failed to begin progressive load"); g_warning("Failed to begin progressive load");
return FALSE; return FALSE;
} }
retval = (priv->image_module->load_increment) (priv->context, priv->buf, 128); retval = (* priv->image_module->load_increment) (
priv->context, priv->buf, 128);
/* if we had more then 128 bytes total, we want
* to send the rest of the buffer.
*/
/* if we had more then 128 bytes total, we want to send the rest of the buffer */
if (retval && (priv->buf_offset + count) >= 128) { if (retval && (priv->buf_offset + count) >= 128) {
retval = (priv->image_module->load_increment) (priv->context, retval = (* priv->image_module->load_increment) (
priv->context,
buf, buf,
count + priv->buf_offset - 128); count + priv->buf_offset - 128);
} }
} }
} else { } else
priv->buf_offset += count; priv->buf_offset += count;
}
return retval; return retval;
} }
if (priv->image_module->load_increment) if (priv->image_module->load_increment)
return (priv->image_module->load_increment) (priv->context, return (* priv->image_module->load_increment) (priv->context, buf, count);
buf,
count);
return (FALSE); return (FALSE);
} }
/** /**
* gdk_pixbuf_loader_get_pixbuf: * gdk_pixbuf_loader_get_pixbuf:
* @loader: A loader. * @loader: A pixbuf loader.
* *
* Gets the GdkPixbuf that the loader is currently loading. If the loader * Gets the GdkPixbuf that the loader is currently loading. If the loader
* hasn't been enough data via gdk_pixbuf_loader_write, then NULL is returned. * hasn't been enough data via gdk_pixbuf_loader_write, then NULL is returned.
@ -295,6 +326,7 @@ gdk_pixbuf_loader_get_pixbuf (GdkPixbufLoader *loader)
g_return_val_if_fail (loader != NULL, NULL); g_return_val_if_fail (loader != NULL, NULL);
g_return_val_if_fail (GDK_IS_PIXBUF_LOADER (loader), NULL); g_return_val_if_fail (GDK_IS_PIXBUF_LOADER (loader), NULL);
priv = loader->private; priv = loader->private;
return priv->pixbuf; return priv->pixbuf;
@ -302,10 +334,9 @@ gdk_pixbuf_loader_get_pixbuf (GdkPixbufLoader *loader)
/** /**
* gdk_pixbuf_loader_close: * gdk_pixbuf_loader_close:
* @loader: A loader. * @loader: A pixbuf loader.
*
* Tells the loader to stop accepting writes
* *
* Tells the loader to stop accepting writes.
**/ **/
void void
gdk_pixbuf_loader_close (GdkPixbufLoader *loader) gdk_pixbuf_loader_close (GdkPixbufLoader *loader)
@ -325,20 +356,21 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader)
priv->image_module = gdk_pixbuf_get_module (priv->buf, priv->buf_offset); priv->image_module = gdk_pixbuf_get_module (priv->buf, priv->buf_offset);
if (priv->image_module && if (priv->image_module &&
((priv->image_module->begin_load == NULL) || ((priv->image_module->begin_load == NULL) ||
(priv->image_module->begin_load == NULL) || (priv->image_module->stop_load == NULL) ||
(priv->image_module->begin_load == NULL) || (priv->image_module->load_increment == NULL))) {
(priv->image_module->begin_load == NULL))) { g_warning ("module %s does not support incremental loading.\n",
g_warning ("module %s does not support incremental loading.\n", priv->image_module->module_name); priv->image_module->module_name);
} else if (priv->image_module) { } else if (priv->image_module) {
g_print ("module loaded: name is %s\n", priv->image_module->module_name); g_print ("module loaded: name is %s\n", priv->image_module->module_name);
priv->context = (priv->image_module->begin_load) (gdk_pixbuf_loader_prepare, loader); priv->context = (* priv->image_module->begin_load) (
(priv->image_module->load_increment) (priv->context, priv->buf, priv->buf_offset); gdk_pixbuf_loader_prepare, loader);
(* priv->image_module->load_increment) (priv->context,
priv->buf, priv->buf_offset);
} }
} }
if (priv->image_module && priv->image_module->stop_load) if (priv->image_module && priv->image_module->stop_load)
(priv->image_module->stop_load) (priv->context); (* priv->image_module->stop_load) (priv->context);
priv->closed = TRUE; priv->closed = TRUE;
} }

4
gtk/gdk-pixbuf-loader.h
View File

@ -67,8 +67,8 @@ struct _GdkPixbufLoaderClass {
GtkType gdk_pixbuf_loader_get_type (void); GtkType gdk_pixbuf_loader_get_type (void);
GtkObject *gdk_pixbuf_loader_new (void); GdkPixbufLoader *gdk_pixbuf_loader_new (void);
gboolean gdk_pixbuf_loader_write (GdkPixbufLoader *loader, gchar *buf, gint count); gboolean gdk_pixbuf_loader_write (GdkPixbufLoader *loader, guchar *buf, size_t count);
GdkPixbuf *gdk_pixbuf_loader_get_pixbuf (GdkPixbufLoader *loader); GdkPixbuf *gdk_pixbuf_loader_get_pixbuf (GdkPixbufLoader *loader);
void gdk_pixbuf_loader_close (GdkPixbufLoader *loader); void gdk_pixbuf_loader_close (GdkPixbufLoader *loader);