2000-10-09 17:22:20 +00:00
|
|
|
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
|
1999-11-05 00:16:10 +00:00
|
|
|
/* GdkPixbuf library - PNM image loader
|
|
|
|
*
|
|
|
|
* Copyright (C) 1999 Red Hat, Inc.
|
|
|
|
*
|
2000-10-09 17:22:20 +00:00
|
|
|
* Authors: Jeffrey Stedfast <fejj@helixcode.com>
|
|
|
|
* Michael Fulbright <drmike@redhat.com>
|
1999-11-05 00:16:10 +00:00
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
2000-10-09 17:22:20 +00:00
|
|
|
* modify it under the terms of the GNU Library General Public
|
1999-11-05 00:16:10 +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-10-09 17:22:20 +00:00
|
|
|
* Library General Public License for more details.
|
1999-11-05 00:16:10 +00:00
|
|
|
*
|
2000-10-09 17:22:20 +00:00
|
|
|
* You should have received a copy of the GNU Library General Public
|
1999-11-05 00:16:10 +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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <setjmp.h>
|
2000-04-11 07:03:25 +00:00
|
|
|
#include "gdk-pixbuf-private.h"
|
1999-12-02 20:44:43 +00:00
|
|
|
#include "gdk-pixbuf-io.h"
|
1999-11-05 00:16:10 +00:00
|
|
|
|
|
|
|
|
|
|
|
#define PNM_BUF_SIZE 4096
|
|
|
|
|
|
|
|
#define PNM_FATAL_ERR -1
|
2000-10-09 17:22:20 +00:00
|
|
|
#define PNM_SUSPEND 0
|
|
|
|
#define PNM_OK 1
|
1999-11-05 00:16:10 +00:00
|
|
|
|
|
|
|
typedef enum {
|
2000-10-09 17:22:20 +00:00
|
|
|
PNM_FORMAT_PGM = 1,
|
1999-11-05 00:16:10 +00:00
|
|
|
PNM_FORMAT_PGM_RAW,
|
|
|
|
PNM_FORMAT_PPM,
|
|
|
|
PNM_FORMAT_PPM_RAW,
|
|
|
|
PNM_FORMAT_PBM,
|
|
|
|
PNM_FORMAT_PBM_RAW
|
|
|
|
} PnmFormat;
|
|
|
|
|
|
|
|
typedef struct {
|
2000-10-09 17:22:20 +00:00
|
|
|
guchar buffer[PNM_BUF_SIZE];
|
|
|
|
guchar *byte;
|
|
|
|
guint nbytes;
|
1999-11-05 00:16:10 +00:00
|
|
|
} PnmIOBuffer;
|
|
|
|
|
|
|
|
typedef struct {
|
2002-10-03 22:39:51 +00:00
|
|
|
GdkPixbufModuleUpdatedFunc updated_func;
|
|
|
|
GdkPixbufModulePreparedFunc prepared_func;
|
2004-01-07 00:26:58 +00:00
|
|
|
GdkPixbufModuleSizeFunc size_func;
|
2000-10-09 17:22:20 +00:00
|
|
|
gpointer user_data;
|
|
|
|
|
|
|
|
GdkPixbuf *pixbuf;
|
|
|
|
guchar *pixels; /* incoming pixel data buffer */
|
|
|
|
guchar *dptr; /* current position in pixbuf */
|
|
|
|
|
|
|
|
PnmIOBuffer inbuf;
|
|
|
|
|
|
|
|
guint width;
|
|
|
|
guint height;
|
|
|
|
guint maxval;
|
|
|
|
guint rowstride;
|
|
|
|
PnmFormat type;
|
|
|
|
|
|
|
|
guint output_row; /* last row to be completed */
|
|
|
|
guint output_col;
|
|
|
|
gboolean did_prescan; /* are we in image data yet? */
|
|
|
|
gboolean got_header; /* have we loaded pnm header? */
|
|
|
|
|
|
|
|
guint scan_state;
|
2000-10-18 18:42:54 +00:00
|
|
|
|
|
|
|
GError **error;
|
1999-11-05 00:16:10 +00:00
|
|
|
|
|
|
|
} PnmLoaderContext;
|
|
|
|
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
static GdkPixbuf *gdk_pixbuf__pnm_image_load (FILE *f, GError **error);
|
2002-10-03 22:39:51 +00:00
|
|
|
static gpointer gdk_pixbuf__pnm_image_begin_load (GdkPixbufModuleSizeFunc size_func,
|
|
|
|
GdkPixbufModulePreparedFunc func,
|
|
|
|
GdkPixbufModuleUpdatedFunc func2,
|
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
|
|
|
gpointer user_data,
|
|
|
|
GError **error);
|
|
|
|
static gboolean gdk_pixbuf__pnm_image_stop_load (gpointer context, GError **error);
|
|
|
|
static gboolean gdk_pixbuf__pnm_image_load_increment (gpointer context,
|
|
|
|
const guchar *buf, guint size,
|
|
|
|
GError **error);
|
1999-11-05 00:16:10 +00:00
|
|
|
|
2000-10-09 17:22:20 +00:00
|
|
|
static void explode_bitmap_into_buf (PnmLoaderContext *context);
|
|
|
|
static void explode_gray_into_buf (PnmLoaderContext *context);
|
1999-11-05 00:16:10 +00:00
|
|
|
|
|
|
|
|
1999-11-05 23:17:35 +00:00
|
|
|
/* explode bitmap data into rgb components */
|
|
|
|
/* we need to know what the row so we can */
|
|
|
|
/* do sub-byte expansion (since 1 byte = 8 pixels) */
|
|
|
|
/* context->dptr MUST point at first byte in incoming data */
|
|
|
|
/* which corresponds to first pixel of row y */
|
1999-11-05 00:16:10 +00:00
|
|
|
static void
|
1999-11-05 23:17:35 +00:00
|
|
|
explode_bitmap_into_buf (PnmLoaderContext *context)
|
1999-11-05 00:16:10 +00:00
|
|
|
{
|
1999-11-05 23:17:35 +00:00
|
|
|
gint j;
|
|
|
|
guchar *from, *to, data;
|
|
|
|
gint bit;
|
|
|
|
guchar *dptr;
|
|
|
|
gint wid, x, y;
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-05 23:17:35 +00:00
|
|
|
g_return_if_fail (context != NULL);
|
|
|
|
g_return_if_fail (context->dptr != NULL);
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-05 23:17:35 +00:00
|
|
|
/* I'm no clever bit-hacker so I'm sure this can be optimized */
|
|
|
|
dptr = context->dptr;
|
|
|
|
y = context->output_row;
|
|
|
|
wid = context->width;
|
2000-10-09 17:22:20 +00:00
|
|
|
|
|
|
|
from = dptr + ((wid - 1) / 8);
|
1999-11-05 23:17:35 +00:00
|
|
|
to = dptr + (wid - 1) * 3;
|
1999-11-09 23:21:08 +00:00
|
|
|
/* bit = 7 - (((y+1)*wid-1) % 8); */
|
2000-10-09 17:22:20 +00:00
|
|
|
bit = 7 - ((wid-1) % 8);
|
|
|
|
|
1999-11-05 23:17:35 +00:00
|
|
|
/* get first byte and align properly */
|
|
|
|
data = from[0];
|
|
|
|
for (j = 0; j < bit; j++, data >>= 1);
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-05 23:17:35 +00:00
|
|
|
for (x = wid-1; x >= 0; x--) {
|
1999-11-09 23:21:08 +00:00
|
|
|
/* g_print ("%c", (data & 1) ? '*' : ' '); */
|
2000-10-09 17:22:20 +00:00
|
|
|
|
|
|
|
to[0] = to[1] = to[2] = (data & 0x01) ? 0x00 : 0xff;
|
|
|
|
|
1999-11-05 23:17:35 +00:00
|
|
|
to -= 3;
|
|
|
|
bit++;
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-05 23:17:35 +00:00
|
|
|
if (bit > 7) {
|
|
|
|
from--;
|
|
|
|
data = from[0];
|
|
|
|
bit = 0;
|
|
|
|
} else {
|
|
|
|
data >>= 1;
|
|
|
|
}
|
1999-11-05 00:16:10 +00:00
|
|
|
}
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-09 23:21:08 +00:00
|
|
|
/* g_print ("\n"); */
|
1999-11-05 00:16:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* explode gray image row into rgb components in pixbuf */
|
|
|
|
static void
|
1999-11-05 23:17:35 +00:00
|
|
|
explode_gray_into_buf (PnmLoaderContext *context)
|
1999-11-05 00:16:10 +00:00
|
|
|
{
|
1999-11-05 23:17:35 +00:00
|
|
|
gint j;
|
1999-11-05 00:16:10 +00:00
|
|
|
guchar *from, *to;
|
1999-11-05 23:17:35 +00:00
|
|
|
guint w;
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-05 23:17:35 +00:00
|
|
|
g_return_if_fail (context != NULL);
|
|
|
|
g_return_if_fail (context->dptr != NULL);
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-05 00:16:10 +00:00
|
|
|
/* Expand grey->colour. Expand from the end of the
|
|
|
|
* memory down, so we can use the same buffer.
|
|
|
|
*/
|
1999-11-05 23:17:35 +00:00
|
|
|
w = context->width;
|
|
|
|
from = context->dptr + w - 1;
|
|
|
|
to = context->dptr + (w - 1) * 3;
|
1999-11-05 00:16:10 +00:00
|
|
|
for (j = w - 1; j >= 0; j--) {
|
|
|
|
to[0] = from[0];
|
|
|
|
to[1] = from[0];
|
|
|
|
to[2] = from[0];
|
|
|
|
to -= 3;
|
|
|
|
from--;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-10-09 17:22:20 +00:00
|
|
|
/* skip over whitespace and comments in input buffer */
|
|
|
|
static gint
|
2000-10-18 18:42:54 +00:00
|
|
|
pnm_skip_whitespace (PnmIOBuffer *inbuf, GError **error)
|
1999-11-05 00:16:10 +00:00
|
|
|
{
|
2000-10-09 17:22:20 +00:00
|
|
|
register guchar *inptr;
|
|
|
|
guchar *inend;
|
|
|
|
|
|
|
|
g_return_val_if_fail (inbuf != NULL, PNM_FATAL_ERR);
|
|
|
|
g_return_val_if_fail (inbuf->byte != NULL, PNM_FATAL_ERR);
|
|
|
|
|
|
|
|
inend = inbuf->byte + inbuf->nbytes;
|
|
|
|
inptr = inbuf->byte;
|
|
|
|
|
|
|
|
for ( ; inptr < inend; inptr++) {
|
|
|
|
if (*inptr == '#') {
|
|
|
|
/* in comment - skip to the end of this line */
|
2001-06-04 20:31:51 +00:00
|
|
|
for ( ; *inptr != '\n' && inptr < inend; inptr++)
|
|
|
|
;
|
|
|
|
|
|
|
|
if ( *inptr != '\n' ) {
|
|
|
|
/* couldn't read whole comment */
|
|
|
|
return PNM_SUSPEND;
|
|
|
|
}
|
|
|
|
|
2001-09-14 22:04:55 +00:00
|
|
|
} else if (!g_ascii_isspace (*inptr)) {
|
2000-10-09 17:22:20 +00:00
|
|
|
inbuf->byte = inptr;
|
|
|
|
inbuf->nbytes = (guint) (inend - inptr);
|
|
|
|
return PNM_OK;
|
1999-11-05 00:16:10 +00:00
|
|
|
}
|
|
|
|
}
|
2000-10-09 17:22:20 +00:00
|
|
|
|
|
|
|
inbuf->byte = inptr;
|
|
|
|
inbuf->nbytes = (guint) (inend - inptr);
|
|
|
|
|
|
|
|
return PNM_SUSPEND;
|
1999-11-05 00:16:10 +00:00
|
|
|
}
|
|
|
|
|
2000-10-09 17:22:20 +00:00
|
|
|
/* read next number from buffer */
|
1999-11-05 00:16:10 +00:00
|
|
|
static gint
|
2000-10-18 18:42:54 +00:00
|
|
|
pnm_read_next_value (PnmIOBuffer *inbuf, guint *value, GError **error)
|
1999-11-05 00:16:10 +00:00
|
|
|
{
|
2000-10-09 17:22:20 +00:00
|
|
|
register guchar *inptr, *word, *p;
|
2001-09-14 22:04:55 +00:00
|
|
|
guchar *inend, buf[129];
|
2000-10-09 17:22:20 +00:00
|
|
|
gchar *endptr;
|
|
|
|
gint retval;
|
2001-09-14 22:04:55 +00:00
|
|
|
glong result;
|
1999-11-05 00:16:10 +00:00
|
|
|
|
2000-10-09 17:22:20 +00:00
|
|
|
g_return_val_if_fail (inbuf != NULL, PNM_FATAL_ERR);
|
|
|
|
g_return_val_if_fail (inbuf->byte != NULL, PNM_FATAL_ERR);
|
|
|
|
g_return_val_if_fail (value != NULL, PNM_FATAL_ERR);
|
|
|
|
|
|
|
|
/* skip white space */
|
2000-10-18 18:42:54 +00:00
|
|
|
if ((retval = pnm_skip_whitespace (inbuf, error)) != PNM_OK)
|
2000-10-09 17:22:20 +00:00
|
|
|
return retval;
|
|
|
|
|
|
|
|
inend = inbuf->byte + inbuf->nbytes;
|
|
|
|
inptr = inbuf->byte;
|
|
|
|
|
|
|
|
/* copy this pnm 'word' into a temp buffer */
|
2001-09-14 22:04:55 +00:00
|
|
|
for (p = inptr, word = buf; (p < inend) && !g_ascii_isspace (*p) && (*p != '#') && (p - inptr < 128); p++, word++)
|
2000-10-09 17:22:20 +00:00
|
|
|
*word = *p;
|
|
|
|
*word = '\0';
|
|
|
|
|
|
|
|
/* hmmm, there must be more data to this 'word' */
|
2004-05-17 03:08:15 +00:00
|
|
|
if (p == inend || (!g_ascii_isspace (*p) && (*p != '#') && (p - inptr < 128)))
|
2001-09-14 22:04:55 +00:00
|
|
|
return PNM_SUSPEND;
|
2000-10-09 17:22:20 +00:00
|
|
|
|
|
|
|
/* get the value */
|
2001-09-14 22:04:55 +00:00
|
|
|
result = strtol (buf, &endptr, 10);
|
|
|
|
if (*endptr != '\0' || result < 0) {
|
2000-10-18 18:42:54 +00:00
|
|
|
g_set_error (error,
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
_("PNM loader expected to find an integer, but didn't"));
|
2000-10-09 17:22:20 +00:00
|
|
|
return PNM_FATAL_ERR;
|
2000-10-18 18:42:54 +00:00
|
|
|
}
|
2001-09-14 22:04:55 +00:00
|
|
|
*value = result;
|
|
|
|
|
2000-10-09 17:22:20 +00:00
|
|
|
inbuf->byte = p;
|
|
|
|
inbuf->nbytes = (guint) (inend - p);
|
|
|
|
|
|
|
|
return PNM_OK;
|
1999-11-05 00:16:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* returns PNM_OK, PNM_SUSPEND, or PNM_FATAL_ERR */
|
|
|
|
static gint
|
|
|
|
pnm_read_header (PnmLoaderContext *context)
|
|
|
|
{
|
|
|
|
PnmIOBuffer *inbuf;
|
2000-10-09 17:22:20 +00:00
|
|
|
gint retval;
|
1999-11-05 00:16:10 +00:00
|
|
|
|
2000-10-09 17:22:20 +00:00
|
|
|
g_return_val_if_fail (context != NULL, PNM_FATAL_ERR);
|
1999-11-05 00:16:10 +00:00
|
|
|
|
2000-10-09 17:22:20 +00:00
|
|
|
inbuf = &context->inbuf;
|
1999-11-05 00:16:10 +00:00
|
|
|
|
2000-10-09 17:22:20 +00:00
|
|
|
if (!context->type) {
|
|
|
|
/* file must start with a 'P' followed by a numeral */
|
|
|
|
/* so loop till we get enough data to determine type */
|
|
|
|
if (inbuf->nbytes < 2)
|
|
|
|
return PNM_SUSPEND;
|
|
|
|
|
2000-10-18 18:42:54 +00:00
|
|
|
if (*inbuf->byte != 'P') {
|
|
|
|
g_set_error (context->error,
|
|
|
|
GDK_PIXBUF_ERROR,
|
2001-09-14 22:15:54 +00:00
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
2000-10-18 18:42:54 +00:00
|
|
|
_("PNM file has an incorrect initial byte"));
|
2000-10-09 17:22:20 +00:00
|
|
|
return PNM_FATAL_ERR;
|
2000-10-18 18:42:54 +00:00
|
|
|
}
|
2000-10-09 17:22:20 +00:00
|
|
|
|
|
|
|
inbuf->byte++;
|
|
|
|
inbuf->nbytes--;
|
|
|
|
|
|
|
|
switch (*inbuf->byte) {
|
|
|
|
case '1':
|
|
|
|
context->type = PNM_FORMAT_PBM;
|
|
|
|
break;
|
|
|
|
case '2':
|
|
|
|
context->type = PNM_FORMAT_PGM;
|
|
|
|
break;
|
|
|
|
case '3':
|
|
|
|
context->type = PNM_FORMAT_PPM;
|
|
|
|
break;
|
|
|
|
case '4':
|
|
|
|
context->type = PNM_FORMAT_PBM_RAW;
|
|
|
|
break;
|
|
|
|
case '5':
|
|
|
|
context->type = PNM_FORMAT_PGM_RAW;
|
|
|
|
break;
|
|
|
|
case '6':
|
|
|
|
context->type = PNM_FORMAT_PPM_RAW;
|
|
|
|
break;
|
|
|
|
default:
|
2000-10-18 18:42:54 +00:00
|
|
|
g_set_error (context->error,
|
|
|
|
GDK_PIXBUF_ERROR,
|
2001-09-14 22:15:54 +00:00
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
2000-10-18 18:42:54 +00:00
|
|
|
_("PNM file is not in a recognized PNM subformat"));
|
2000-10-09 17:22:20 +00:00
|
|
|
return PNM_FATAL_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!inbuf->nbytes)
|
|
|
|
return PNM_SUSPEND;
|
|
|
|
|
|
|
|
inbuf->byte++;
|
|
|
|
inbuf->nbytes--;
|
1999-11-05 00:16:10 +00:00
|
|
|
}
|
|
|
|
|
2000-10-09 17:22:20 +00:00
|
|
|
if (!context->width) {
|
|
|
|
/* read the pixmap width */
|
|
|
|
guint width = 0;
|
|
|
|
|
2000-10-18 18:42:54 +00:00
|
|
|
retval = pnm_read_next_value (inbuf, &width,
|
|
|
|
context->error);
|
2000-10-09 17:22:20 +00:00
|
|
|
|
2000-10-18 18:42:54 +00:00
|
|
|
if (retval != PNM_OK)
|
2000-10-09 17:22:20 +00:00
|
|
|
return retval;
|
|
|
|
|
2000-10-18 18:42:54 +00:00
|
|
|
if (!width) {
|
|
|
|
g_set_error (context->error,
|
|
|
|
GDK_PIXBUF_ERROR,
|
2001-09-14 22:15:54 +00:00
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
2000-10-18 18:42:54 +00:00
|
|
|
_("PNM file has an image width of 0"));
|
2000-10-09 17:22:20 +00:00
|
|
|
return PNM_FATAL_ERR;
|
2000-10-18 18:42:54 +00:00
|
|
|
}
|
2000-10-09 17:22:20 +00:00
|
|
|
|
|
|
|
context->width = width;
|
1999-11-05 00:16:10 +00:00
|
|
|
}
|
|
|
|
|
2000-10-09 17:22:20 +00:00
|
|
|
if (!context->height) {
|
|
|
|
/* read the pixmap height */
|
|
|
|
guint height = 0;
|
|
|
|
|
2000-10-18 18:42:54 +00:00
|
|
|
retval = pnm_read_next_value (inbuf, &height,
|
|
|
|
context->error);
|
2000-10-09 17:22:20 +00:00
|
|
|
|
|
|
|
if (retval != PNM_OK)
|
|
|
|
return retval;
|
|
|
|
|
2000-10-18 18:42:54 +00:00
|
|
|
if (!height) {
|
|
|
|
g_set_error (context->error,
|
|
|
|
GDK_PIXBUF_ERROR,
|
2001-09-14 22:15:54 +00:00
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
2000-10-18 18:42:54 +00:00
|
|
|
_("PNM file has an image height of 0"));
|
2000-10-09 17:22:20 +00:00
|
|
|
return PNM_FATAL_ERR;
|
2000-10-18 18:42:54 +00:00
|
|
|
}
|
2000-10-09 17:22:20 +00:00
|
|
|
|
|
|
|
context->height = height;
|
1999-11-05 00:16:10 +00:00
|
|
|
}
|
|
|
|
|
2000-10-09 17:22:20 +00:00
|
|
|
switch (context->type) {
|
1999-11-05 00:16:10 +00:00
|
|
|
case PNM_FORMAT_PPM:
|
|
|
|
case PNM_FORMAT_PPM_RAW:
|
|
|
|
case PNM_FORMAT_PGM:
|
|
|
|
case PNM_FORMAT_PGM_RAW:
|
2000-10-09 17:22:20 +00:00
|
|
|
if (!context->maxval) {
|
2000-10-18 18:42:54 +00:00
|
|
|
retval = pnm_read_next_value (inbuf, &context->maxval,
|
|
|
|
context->error);
|
2000-10-09 17:22:20 +00:00
|
|
|
|
|
|
|
if (retval != PNM_OK)
|
|
|
|
return retval;
|
|
|
|
|
2000-10-18 18:42:54 +00:00
|
|
|
if (context->maxval == 0) {
|
|
|
|
g_set_error (context->error,
|
|
|
|
GDK_PIXBUF_ERROR,
|
2001-09-14 22:15:54 +00:00
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
2001-09-14 22:04:55 +00:00
|
|
|
_("Maximum color value in PNM file is 0"));
|
|
|
|
return PNM_FATAL_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (context->maxval > 65535) {
|
|
|
|
g_set_error (context->error,
|
|
|
|
GDK_PIXBUF_ERROR,
|
2001-09-14 22:15:54 +00:00
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
2001-09-14 22:04:55 +00:00
|
|
|
_("Maximum color value in PNM file is too large"));
|
|
|
|
return PNM_FATAL_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (context->maxval > 255) {
|
|
|
|
g_set_error (context->error,
|
|
|
|
GDK_PIXBUF_ERROR,
|
2001-09-14 22:15:54 +00:00
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
2004-06-12 02:08:45 +00:00
|
|
|
_("Cannot handle PNM files with maximum color values greater than 255"));
|
2000-10-09 17:22:20 +00:00
|
|
|
return PNM_FATAL_ERR;
|
2000-10-18 18:42:54 +00:00
|
|
|
}
|
1999-11-05 00:16:10 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-05 23:17:35 +00:00
|
|
|
return PNM_OK;
|
1999-11-05 00:16:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gint
|
1999-11-05 23:17:35 +00:00
|
|
|
pnm_read_raw_scanline (PnmLoaderContext *context)
|
1999-11-05 00:16:10 +00:00
|
|
|
{
|
|
|
|
PnmIOBuffer *inbuf;
|
2000-10-09 17:22:20 +00:00
|
|
|
guint numbytes, offset;
|
|
|
|
guint numpix = 0;
|
|
|
|
guchar *dest;
|
|
|
|
guint i;
|
|
|
|
|
1999-11-05 00:16:10 +00:00
|
|
|
g_return_val_if_fail (context != NULL, PNM_FATAL_ERR);
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-05 00:16:10 +00:00
|
|
|
inbuf = &context->inbuf;
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-05 00:16:10 +00:00
|
|
|
switch (context->type) {
|
|
|
|
case PNM_FORMAT_PBM_RAW:
|
2000-10-09 17:22:20 +00:00
|
|
|
numpix = inbuf->nbytes * 8;
|
1999-11-05 23:17:35 +00:00
|
|
|
break;
|
1999-11-05 00:16:10 +00:00
|
|
|
case PNM_FORMAT_PGM_RAW:
|
2000-10-09 17:22:20 +00:00
|
|
|
numpix = inbuf->nbytes;
|
1999-11-05 23:17:35 +00:00
|
|
|
break;
|
1999-11-05 00:16:10 +00:00
|
|
|
case PNM_FORMAT_PPM_RAW:
|
2000-10-09 17:22:20 +00:00
|
|
|
numpix = inbuf->nbytes / 3;
|
1999-11-05 23:17:35 +00:00
|
|
|
break;
|
|
|
|
default:
|
2000-10-18 18:42:54 +00:00
|
|
|
g_set_error (context->error,
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
_("Raw PNM image type is invalid"));
|
1999-11-05 23:17:35 +00:00
|
|
|
return PNM_FATAL_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
numpix = MIN (numpix, context->width - context->output_col);
|
2000-10-09 17:22:20 +00:00
|
|
|
|
|
|
|
if (!numpix)
|
1999-11-05 23:17:35 +00:00
|
|
|
return PNM_SUSPEND;
|
|
|
|
|
2000-10-09 17:22:20 +00:00
|
|
|
context->dptr = context->pixels + context->output_row * context->rowstride;
|
1999-11-05 23:17:35 +00:00
|
|
|
|
|
|
|
switch (context->type) {
|
|
|
|
case PNM_FORMAT_PBM_RAW:
|
2000-10-09 17:22:20 +00:00
|
|
|
numbytes = (numpix / 8) + ((numpix % 8) ? 1 : 0);
|
|
|
|
offset = context->output_col / 8;
|
1999-11-05 23:17:35 +00:00
|
|
|
break;
|
|
|
|
case PNM_FORMAT_PGM_RAW:
|
|
|
|
numbytes = numpix;
|
|
|
|
offset = context->output_col;
|
|
|
|
break;
|
|
|
|
case PNM_FORMAT_PPM_RAW:
|
2000-10-09 17:22:20 +00:00
|
|
|
numbytes = numpix * 3;
|
|
|
|
offset = context->output_col * 3;
|
1999-11-05 23:17:35 +00:00
|
|
|
break;
|
|
|
|
default:
|
2000-10-18 18:42:54 +00:00
|
|
|
g_set_error (context->error,
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
_("Raw PNM image type is invalid"));
|
2000-01-22 23:29:21 +00:00
|
|
|
return PNM_FATAL_ERR;
|
1999-11-05 23:17:35 +00:00
|
|
|
}
|
|
|
|
|
2000-10-09 17:22:20 +00:00
|
|
|
switch (context->type) {
|
|
|
|
case PNM_FORMAT_PBM_RAW:
|
|
|
|
dest = context->dptr + offset;
|
|
|
|
memcpy (dest, inbuf->byte, numbytes);
|
|
|
|
break;
|
|
|
|
case PNM_FORMAT_PGM_RAW:
|
|
|
|
case PNM_FORMAT_PPM_RAW:
|
|
|
|
dest = context->dptr + offset;
|
|
|
|
|
|
|
|
if (context->maxval == 255) {
|
|
|
|
/* special-case optimization */
|
|
|
|
memcpy (dest, inbuf->byte, numbytes);
|
|
|
|
} else {
|
|
|
|
for (i = 0; i < numbytes; i++) {
|
|
|
|
guchar *byte = inbuf->byte + i;
|
|
|
|
|
|
|
|
/* scale the color to an 8-bit color depth */
|
|
|
|
if (*byte > context->maxval)
|
|
|
|
*dest++ = 255;
|
|
|
|
else
|
|
|
|
*dest++ = (guchar) (255 * *byte / context->maxval);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
2000-10-18 18:42:54 +00:00
|
|
|
g_set_error (context->error,
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
_("Raw PNM image type is invalid"));
|
|
|
|
return PNM_FATAL_ERR;
|
2000-10-09 17:22:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
inbuf->byte += numbytes;
|
|
|
|
inbuf->nbytes -= numbytes;
|
|
|
|
|
1999-11-05 23:17:35 +00:00
|
|
|
context->output_col += numpix;
|
|
|
|
if (context->output_col == context->width) {
|
2000-10-09 17:22:20 +00:00
|
|
|
if (context->type == PNM_FORMAT_PBM_RAW)
|
|
|
|
explode_bitmap_into_buf (context);
|
|
|
|
else if (context->type == PNM_FORMAT_PGM_RAW)
|
1999-11-05 23:17:35 +00:00
|
|
|
explode_gray_into_buf (context);
|
|
|
|
|
|
|
|
context->output_col = 0;
|
|
|
|
context->output_row++;
|
|
|
|
} else {
|
|
|
|
return PNM_SUSPEND;
|
|
|
|
}
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-05 23:17:35 +00:00
|
|
|
return PNM_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gint
|
|
|
|
pnm_read_ascii_scanline (PnmLoaderContext *context)
|
|
|
|
{
|
2000-10-09 17:22:20 +00:00
|
|
|
PnmIOBuffer *inbuf;
|
|
|
|
guint offset;
|
|
|
|
guint value, numval, i;
|
1999-11-05 23:17:35 +00:00
|
|
|
guchar data;
|
|
|
|
guchar mask;
|
2000-10-09 17:22:20 +00:00
|
|
|
guchar *dptr;
|
|
|
|
gint retval;
|
|
|
|
|
1999-11-05 23:17:35 +00:00
|
|
|
g_return_val_if_fail (context != NULL, PNM_FATAL_ERR);
|
2000-10-09 17:22:20 +00:00
|
|
|
|
2000-01-22 23:29:21 +00:00
|
|
|
data = mask = 0;
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-05 23:17:35 +00:00
|
|
|
inbuf = &context->inbuf;
|
2000-10-09 17:22:20 +00:00
|
|
|
|
|
|
|
context->dptr = context->pixels + context->output_row * context->rowstride;
|
|
|
|
|
1999-11-05 23:17:35 +00:00
|
|
|
switch (context->type) {
|
|
|
|
case PNM_FORMAT_PBM:
|
1999-11-09 23:21:08 +00:00
|
|
|
numval = MIN (8, context->width - context->output_col);
|
2000-10-09 17:22:20 +00:00
|
|
|
offset = context->output_col / 8;
|
1999-11-05 23:17:35 +00:00
|
|
|
break;
|
|
|
|
case PNM_FORMAT_PGM:
|
|
|
|
numval = 1;
|
1999-11-08 17:15:19 +00:00
|
|
|
offset = context->output_col;
|
1999-11-05 23:17:35 +00:00
|
|
|
break;
|
|
|
|
case PNM_FORMAT_PPM:
|
|
|
|
numval = 3;
|
2000-10-09 17:22:20 +00:00
|
|
|
offset = context->output_col * 3;
|
1999-11-05 23:17:35 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2000-10-18 18:42:54 +00:00
|
|
|
g_set_error (context->error,
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
_("PNM image format is invalid"));
|
|
|
|
|
1999-11-05 23:17:35 +00:00
|
|
|
return PNM_FATAL_ERR;
|
|
|
|
}
|
2000-10-09 17:22:20 +00:00
|
|
|
|
|
|
|
dptr = context->dptr + offset + context->scan_state;
|
|
|
|
|
1999-11-08 17:15:19 +00:00
|
|
|
while (TRUE) {
|
|
|
|
if (context->type == PNM_FORMAT_PBM) {
|
|
|
|
mask = 0x80;
|
|
|
|
data = 0;
|
1999-11-09 23:21:08 +00:00
|
|
|
numval = MIN (8, context->width - context->output_col);
|
1999-11-05 23:17:35 +00:00
|
|
|
}
|
2000-10-09 17:22:20 +00:00
|
|
|
|
|
|
|
for (i = context->scan_state; i < numval; i++) {
|
2000-10-18 18:42:54 +00:00
|
|
|
retval = pnm_read_next_value (inbuf, &value,
|
|
|
|
context->error);
|
2000-10-09 17:22:20 +00:00
|
|
|
if (retval != PNM_OK) {
|
|
|
|
/* save state and return */
|
|
|
|
context->scan_state = i;
|
|
|
|
return retval;
|
1999-11-08 17:15:19 +00:00
|
|
|
}
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-08 17:15:19 +00:00
|
|
|
switch (context->type) {
|
|
|
|
case PNM_FORMAT_PBM:
|
|
|
|
if (value)
|
|
|
|
data |= mask;
|
|
|
|
mask >>= 1;
|
1999-11-05 23:17:35 +00:00
|
|
|
|
1999-11-08 17:15:19 +00:00
|
|
|
break;
|
|
|
|
case PNM_FORMAT_PGM:
|
|
|
|
case PNM_FORMAT_PPM:
|
2000-10-09 17:22:20 +00:00
|
|
|
/* scale the color to an 8-bit color depth */
|
|
|
|
if (value > context->maxval)
|
|
|
|
*dptr++ = 255;
|
|
|
|
else
|
|
|
|
*dptr++ = (guchar)(255 * value / context->maxval);
|
1999-11-08 17:15:19 +00:00
|
|
|
break;
|
|
|
|
default:
|
2000-10-18 18:42:54 +00:00
|
|
|
g_set_error (context->error,
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
_("PNM image format is invalid"));
|
|
|
|
return PNM_FATAL_ERR;
|
1999-11-08 17:15:19 +00:00
|
|
|
break;
|
|
|
|
}
|
1999-11-05 00:16:10 +00:00
|
|
|
}
|
1999-11-05 23:17:35 +00:00
|
|
|
|
2000-10-09 17:22:20 +00:00
|
|
|
context->scan_state = 0;
|
|
|
|
|
1999-11-09 23:21:08 +00:00
|
|
|
if (context->type == PNM_FORMAT_PBM) {
|
|
|
|
*dptr++ = data;
|
1999-11-10 17:43:49 +00:00
|
|
|
context->output_col += numval;
|
1999-11-09 23:21:08 +00:00
|
|
|
} else {
|
|
|
|
context->output_col++;
|
|
|
|
}
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-08 17:15:19 +00:00
|
|
|
if (context->output_col == context->width) {
|
2000-10-09 17:22:20 +00:00
|
|
|
if (context->type == PNM_FORMAT_PBM)
|
|
|
|
explode_bitmap_into_buf (context);
|
|
|
|
else if (context->type == PNM_FORMAT_PGM)
|
1999-11-08 17:15:19 +00:00
|
|
|
explode_gray_into_buf (context);
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-08 17:15:19 +00:00
|
|
|
context->output_col = 0;
|
|
|
|
context->output_row++;
|
|
|
|
break;
|
|
|
|
}
|
1999-11-05 23:17:35 +00:00
|
|
|
}
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-05 23:17:35 +00:00
|
|
|
return PNM_OK;
|
|
|
|
}
|
|
|
|
|
2000-10-09 17:22:20 +00:00
|
|
|
/* returns 1 if a scanline was converted, 0 means we ran out of data */
|
1999-11-05 23:17:35 +00:00
|
|
|
static gint
|
|
|
|
pnm_read_scanline (PnmLoaderContext *context)
|
|
|
|
{
|
2000-10-09 17:22:20 +00:00
|
|
|
gint retval;
|
|
|
|
|
1999-11-05 23:17:35 +00:00
|
|
|
g_return_val_if_fail (context != NULL, PNM_FATAL_ERR);
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-05 23:17:35 +00:00
|
|
|
/* read in image data */
|
|
|
|
/* for raw formats this is trivial */
|
|
|
|
switch (context->type) {
|
|
|
|
case PNM_FORMAT_PBM_RAW:
|
|
|
|
case PNM_FORMAT_PGM_RAW:
|
|
|
|
case PNM_FORMAT_PPM_RAW:
|
2000-10-09 17:22:20 +00:00
|
|
|
retval = pnm_read_raw_scanline (context);
|
|
|
|
if (retval != PNM_OK)
|
|
|
|
return retval;
|
1999-11-05 23:17:35 +00:00
|
|
|
break;
|
|
|
|
case PNM_FORMAT_PBM:
|
|
|
|
case PNM_FORMAT_PGM:
|
|
|
|
case PNM_FORMAT_PPM:
|
2000-10-09 17:22:20 +00:00
|
|
|
retval = pnm_read_ascii_scanline (context);
|
|
|
|
if (retval != PNM_OK)
|
|
|
|
return retval;
|
1999-11-05 23:17:35 +00:00
|
|
|
break;
|
1999-11-05 00:16:10 +00:00
|
|
|
default:
|
2000-10-18 18:42:54 +00:00
|
|
|
g_set_error (context->error,
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
GDK_PIXBUF_ERROR_UNKNOWN_TYPE,
|
|
|
|
_("PNM image loader does not support this PNM subformat"));
|
|
|
|
|
1999-11-05 00:16:10 +00:00
|
|
|
return PNM_FATAL_ERR;
|
|
|
|
}
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-05 23:17:35 +00:00
|
|
|
return PNM_OK;
|
1999-11-05 00:16:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Shared library entry point */
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
static GdkPixbuf *
|
2000-10-18 18:42:54 +00:00
|
|
|
gdk_pixbuf__pnm_image_load (FILE *f, GError **error)
|
1999-11-05 00:16:10 +00:00
|
|
|
{
|
|
|
|
PnmLoaderContext context;
|
|
|
|
PnmIOBuffer *inbuf;
|
2000-10-09 17:22:20 +00:00
|
|
|
gint nbytes;
|
|
|
|
gint retval;
|
|
|
|
|
1999-11-05 00:16:10 +00:00
|
|
|
/* pretend to be doing progressive loading */
|
1999-11-10 15:45:24 +00:00
|
|
|
context.updated_func = NULL;
|
|
|
|
context.prepared_func = NULL;
|
1999-11-05 00:16:10 +00:00
|
|
|
context.user_data = NULL;
|
2000-10-09 17:22:20 +00:00
|
|
|
context.type = 0;
|
|
|
|
context.inbuf.nbytes = 0;
|
|
|
|
context.inbuf.byte = NULL;
|
|
|
|
context.width = 0;
|
|
|
|
context.height = 0;
|
|
|
|
context.maxval = 0;
|
1999-11-10 15:45:24 +00:00
|
|
|
context.pixels = NULL;
|
|
|
|
context.pixbuf = NULL;
|
2000-10-09 17:22:20 +00:00
|
|
|
context.got_header = FALSE;
|
|
|
|
context.did_prescan = FALSE;
|
|
|
|
context.scan_state = 0;
|
2000-10-18 18:42:54 +00:00
|
|
|
context.error = error;
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-05 00:16:10 +00:00
|
|
|
inbuf = &context.inbuf;
|
2000-10-09 17:22:20 +00:00
|
|
|
|
2001-09-14 22:04:55 +00:00
|
|
|
while (TRUE) {
|
2000-10-09 17:22:20 +00:00
|
|
|
guint num_to_read;
|
|
|
|
|
1999-11-05 00:16:10 +00:00
|
|
|
/* keep buffer as full as possible */
|
2000-10-09 17:22:20 +00:00
|
|
|
num_to_read = PNM_BUF_SIZE - inbuf->nbytes;
|
|
|
|
|
|
|
|
if (inbuf->byte != NULL && inbuf->nbytes > 0)
|
|
|
|
memmove (inbuf->buffer, inbuf->byte, inbuf->nbytes);
|
|
|
|
|
|
|
|
nbytes = fread (inbuf->buffer + inbuf->nbytes, 1, num_to_read, f);
|
|
|
|
|
|
|
|
/* error checking */
|
2001-09-14 22:04:55 +00:00
|
|
|
if (nbytes == 0) {
|
2000-10-09 17:22:20 +00:00
|
|
|
/* we ran out of data? */
|
1999-11-08 19:02:58 +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);
|
2001-09-14 22:04:55 +00:00
|
|
|
g_set_error (error,
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
_("Premature end-of-file encountered"));
|
1999-11-05 00:16:10 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2000-10-09 17:22:20 +00:00
|
|
|
|
|
|
|
inbuf->nbytes += nbytes;
|
|
|
|
inbuf->byte = inbuf->buffer;
|
|
|
|
|
1999-11-05 00:16:10 +00:00
|
|
|
/* get header if needed */
|
|
|
|
if (!context.got_header) {
|
2000-10-09 17:22:20 +00:00
|
|
|
retval = pnm_read_header (&context);
|
|
|
|
if (retval == PNM_FATAL_ERR)
|
1999-11-05 00:16:10 +00:00
|
|
|
return NULL;
|
2000-10-09 17:22:20 +00:00
|
|
|
else if (retval == PNM_SUSPEND)
|
1999-11-05 00:16:10 +00:00
|
|
|
continue;
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-05 00:16:10 +00:00
|
|
|
context.got_header = TRUE;
|
|
|
|
}
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-05 00:16:10 +00:00
|
|
|
/* scan until we hit image data */
|
|
|
|
if (!context.did_prescan) {
|
2001-09-14 22:04:55 +00:00
|
|
|
switch (context.type) {
|
|
|
|
case PNM_FORMAT_PBM_RAW:
|
|
|
|
case PNM_FORMAT_PGM_RAW:
|
|
|
|
case PNM_FORMAT_PPM_RAW:
|
|
|
|
if (inbuf->nbytes <= 0)
|
|
|
|
continue;
|
|
|
|
/* raw formats require exactly one whitespace */
|
|
|
|
if (!g_ascii_isspace(*(inbuf->byte)))
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
_("Raw PNM formats require exactly one whitespace before sample data"));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
inbuf->nbytes--;
|
|
|
|
inbuf->byte++;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
retval = pnm_skip_whitespace (inbuf,
|
|
|
|
context.error);
|
|
|
|
if (retval == PNM_FATAL_ERR)
|
|
|
|
return NULL;
|
|
|
|
else if (retval == PNM_SUSPEND)
|
|
|
|
continue;
|
|
|
|
break;
|
|
|
|
}
|
1999-11-05 00:16:10 +00:00
|
|
|
context.did_prescan = TRUE;
|
|
|
|
context.output_row = 0;
|
|
|
|
context.output_col = 0;
|
2000-10-09 17:22:20 +00:00
|
|
|
|
2002-04-11 21:18:40 +00:00
|
|
|
context.pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
|
|
|
|
context.width, context.height);
|
2000-10-09 17:22:20 +00:00
|
|
|
|
2002-04-11 21:18:40 +00:00
|
|
|
if (!context.pixbuf) {
|
1999-11-08 19:02:58 +00:00
|
|
|
/* Failed to allocate memory */
|
2001-09-14 22:04:55 +00:00
|
|
|
g_set_error (error,
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
|
2004-06-12 02:08:45 +00:00
|
|
|
_("Cannot allocate memory for loading PNM image"));
|
2001-09-14 22:04:55 +00:00
|
|
|
return NULL;
|
1999-11-08 19:02:58 +00:00
|
|
|
}
|
2002-04-11 21:18:40 +00:00
|
|
|
|
|
|
|
context.rowstride = context.pixbuf->rowstride;
|
|
|
|
context.pixels = context.pixbuf->pixels;
|
1999-11-05 00:16:10 +00:00
|
|
|
}
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-05 00:16:10 +00:00
|
|
|
/* if we got here we're reading image data */
|
|
|
|
while (context.output_row < context.height) {
|
2000-10-09 17:22:20 +00:00
|
|
|
retval = pnm_read_scanline (&context);
|
|
|
|
|
|
|
|
if (retval == PNM_SUSPEND) {
|
1999-11-05 00:16:10 +00:00
|
|
|
break;
|
2000-10-09 17:22:20 +00:00
|
|
|
} else if (retval == PNM_FATAL_ERR) {
|
1999-11-08 19:02:58 +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);
|
2000-10-18 18:42:54 +00:00
|
|
|
|
1999-11-05 00:16:10 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-05 00:16:10 +00:00
|
|
|
if (context.output_row < context.height)
|
|
|
|
continue;
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
2000-10-09 17:22:20 +00:00
|
|
|
|
2002-04-11 21:18:40 +00:00
|
|
|
return context.pixbuf;
|
1999-11-05 00:16:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 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__pnm_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-05 00:16:10 +00:00
|
|
|
{
|
1999-11-08 19:02:58 +00:00
|
|
|
PnmLoaderContext *context;
|
2000-10-09 17:22:20 +00:00
|
|
|
|
2001-09-14 22:04:55 +00:00
|
|
|
context = g_try_malloc (sizeof (PnmLoaderContext));
|
|
|
|
if (!context) {
|
|
|
|
g_set_error(error, GDK_PIXBUF_ERROR,
|
|
|
|
GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
|
|
|
|
_("Insufficient memory to load PNM context struct"));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
memset (context, 0, sizeof (PnmLoaderContext));
|
2004-01-07 00:26:58 +00:00
|
|
|
context->size_func = size_func;
|
1999-11-05 00:16:10 +00:00
|
|
|
context->prepared_func = prepared_func;
|
|
|
|
context->updated_func = updated_func;
|
|
|
|
context->user_data = user_data;
|
2000-10-09 17:22:20 +00:00
|
|
|
context->width = 0;
|
|
|
|
context->height = 0;
|
|
|
|
context->maxval = 0;
|
1999-11-10 15:45:24 +00:00
|
|
|
context->pixbuf = NULL;
|
|
|
|
context->pixels = NULL;
|
1999-11-05 00:16:10 +00:00
|
|
|
context->got_header = FALSE;
|
|
|
|
context->did_prescan = FALSE;
|
2000-10-09 17:22:20 +00:00
|
|
|
context->scan_state = 0;
|
|
|
|
|
|
|
|
context->inbuf.nbytes = 0;
|
|
|
|
context->inbuf.byte = NULL;
|
2000-10-18 18:42:54 +00:00
|
|
|
|
|
|
|
context->error = error;
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-05 00:16:10 +00:00
|
|
|
return (gpointer) context;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* context - returned from image_begin_load
|
|
|
|
*
|
|
|
|
* free context, unref gdk_pixbuf
|
|
|
|
*/
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
static gboolean
|
|
|
|
gdk_pixbuf__pnm_image_stop_load (gpointer data,
|
|
|
|
GError **error)
|
1999-11-05 00:16:10 +00:00
|
|
|
{
|
1999-11-08 19:02:58 +00:00
|
|
|
PnmLoaderContext *context = (PnmLoaderContext *) 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
|
|
|
gboolean retval = TRUE;
|
2000-10-09 17:22:20 +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);
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-05 00:16:10 +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);
|
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
|
|
|
|
2001-09-14 22:04:55 +00:00
|
|
|
#if 0
|
|
|
|
/* We should ignore trailing newlines and we can't
|
|
|
|
generally complain about trailing stuff at all, since
|
|
|
|
pnm allows to put multiple images in a file
|
|
|
|
*/
|
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
|
|
|
if (context->inbuf.nbytes > 0) {
|
|
|
|
g_set_error (error,
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
_("Unexpected end of PNM image data"));
|
|
|
|
retval = FALSE;
|
|
|
|
}
|
2001-09-14 22:04:55 +00:00
|
|
|
#endif
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-05 00:16:10 +00:00
|
|
|
g_free (context);
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
|
|
|
return retval;
|
1999-11-05 00:16:10 +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__pnm_image_load_increment (gpointer data,
|
|
|
|
const guchar *buf, guint size,
|
2000-10-18 18:42:54 +00:00
|
|
|
GError **error)
|
1999-11-05 00:16:10 +00:00
|
|
|
{
|
1999-11-09 16:38:31 +00:00
|
|
|
PnmLoaderContext *context = (PnmLoaderContext *)data;
|
2000-10-09 17:22:20 +00:00
|
|
|
PnmIOBuffer *inbuf;
|
|
|
|
guchar *old_byte;
|
|
|
|
guint old_nbytes;
|
2001-07-18 04:25:04 +00:00
|
|
|
const guchar *bufhd;
|
2000-10-09 17:22:20 +00:00
|
|
|
guint num_left, spinguard;
|
|
|
|
gint retval;
|
|
|
|
|
1999-11-05 00:16:10 +00:00
|
|
|
g_return_val_if_fail (context != NULL, FALSE);
|
|
|
|
g_return_val_if_fail (buf != NULL, FALSE);
|
2000-10-18 18:42:54 +00:00
|
|
|
|
|
|
|
context->error = error;
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-09 16:38:31 +00:00
|
|
|
bufhd = buf;
|
|
|
|
inbuf = &context->inbuf;
|
2000-10-09 17:22:20 +00:00
|
|
|
old_nbytes = inbuf->nbytes;
|
|
|
|
old_byte = inbuf->byte;
|
|
|
|
|
1999-11-09 16:38:31 +00:00
|
|
|
num_left = size;
|
|
|
|
spinguard = 0;
|
|
|
|
while (TRUE) {
|
|
|
|
guint num_to_copy;
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-09 16:38:31 +00:00
|
|
|
/* keep buffer as full as possible */
|
2000-10-09 17:22:20 +00:00
|
|
|
num_to_copy = MIN (PNM_BUF_SIZE - inbuf->nbytes, num_left);
|
1999-11-09 16:38:31 +00:00
|
|
|
|
|
|
|
if (num_to_copy == 0)
|
|
|
|
spinguard++;
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-09 16:38:31 +00:00
|
|
|
if (spinguard > 1)
|
1999-11-05 00:16:10 +00:00
|
|
|
return TRUE;
|
2000-10-09 17:22:20 +00:00
|
|
|
|
|
|
|
if (inbuf->byte != NULL && inbuf->nbytes > 0)
|
|
|
|
memmove (inbuf->buffer, inbuf->byte, inbuf->nbytes);
|
|
|
|
|
|
|
|
memcpy (inbuf->buffer + inbuf->nbytes, bufhd, num_to_copy);
|
1999-11-09 16:38:31 +00:00
|
|
|
bufhd += num_to_copy;
|
2000-10-09 17:22:20 +00:00
|
|
|
inbuf->nbytes += num_to_copy;
|
|
|
|
inbuf->byte = inbuf->buffer;
|
1999-11-09 16:38:31 +00:00
|
|
|
num_left -= num_to_copy;
|
|
|
|
|
|
|
|
/* ran out of data and we haven't exited main loop */
|
2000-10-09 17:22:20 +00:00
|
|
|
if (inbuf->nbytes == 0)
|
1999-11-05 00:16:10 +00:00
|
|
|
return TRUE;
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-09 16:38:31 +00:00
|
|
|
/* get header if needed */
|
1999-11-05 00:16:10 +00:00
|
|
|
if (!context->got_header) {
|
2000-10-09 17:22:20 +00:00
|
|
|
retval = pnm_read_header (context);
|
|
|
|
|
|
|
|
if (retval == PNM_FATAL_ERR)
|
1999-11-09 16:38:31 +00:00
|
|
|
return FALSE;
|
2000-10-09 17:22:20 +00:00
|
|
|
else if (retval == PNM_SUSPEND)
|
1999-11-05 00:16:10 +00:00
|
|
|
continue;
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-05 00:16:10 +00:00
|
|
|
context->got_header = TRUE;
|
1999-11-09 16:38:31 +00:00
|
|
|
}
|
2004-01-07 00:26:58 +00:00
|
|
|
|
|
|
|
if (context->size_func) {
|
|
|
|
gint w = context->width;
|
|
|
|
gint h = context->height;
|
|
|
|
(*context->size_func) (&w, &h, context->user_data);
|
|
|
|
|
|
|
|
if (w == 0 || h == 0)
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-09 16:38:31 +00:00
|
|
|
/* scan until we hit image data */
|
|
|
|
if (!context->did_prescan) {
|
2001-09-14 22:04:55 +00:00
|
|
|
switch (context->type) {
|
|
|
|
case PNM_FORMAT_PBM_RAW:
|
|
|
|
case PNM_FORMAT_PGM_RAW:
|
|
|
|
case PNM_FORMAT_PPM_RAW:
|
|
|
|
if (inbuf->nbytes <= 0)
|
|
|
|
continue;
|
|
|
|
/* raw formats require exactly one whitespace */
|
|
|
|
if (!g_ascii_isspace(*(inbuf->byte)))
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
_("Raw PNM formats require exactly one whitespace before sample data"));
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
inbuf->nbytes--;
|
|
|
|
inbuf->byte++;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
retval = pnm_skip_whitespace (inbuf,
|
|
|
|
context->error);
|
|
|
|
if (retval == PNM_FATAL_ERR)
|
|
|
|
return FALSE;
|
|
|
|
else if (retval == PNM_SUSPEND)
|
|
|
|
continue;
|
|
|
|
break;
|
|
|
|
}
|
1999-11-09 16:38:31 +00:00
|
|
|
context->did_prescan = TRUE;
|
|
|
|
context->output_row = 0;
|
|
|
|
context->output_col = 0;
|
2000-10-09 17:22:20 +00:00
|
|
|
|
|
|
|
context->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
|
|
|
|
FALSE,
|
|
|
|
8,
|
|
|
|
context->width,
|
|
|
|
context->height);
|
|
|
|
|
1999-11-05 00:16:10 +00:00
|
|
|
if (context->pixbuf == NULL) {
|
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_set_error (error,
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
|
|
|
|
_("Insufficient memory to load PNM file"));
|
|
|
|
return FALSE;
|
1999-11-05 00:16:10 +00:00
|
|
|
}
|
2000-10-09 17:22:20 +00:00
|
|
|
|
2000-04-11 07:03:25 +00:00
|
|
|
context->pixels = context->pixbuf->pixels;
|
|
|
|
context->rowstride = context->pixbuf->rowstride;
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-05 00:16:10 +00:00
|
|
|
/* Notify the client that we are ready to go */
|
|
|
|
(* context->prepared_func) (context->pixbuf,
|
2001-05-07 15:58:47 +00:00
|
|
|
NULL,
|
1999-11-05 00:16:10 +00:00
|
|
|
context->user_data);
|
1999-11-09 16:38:31 +00:00
|
|
|
}
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-09 16:38:31 +00:00
|
|
|
/* if we got here we're reading image data */
|
|
|
|
while (context->output_row < context->height) {
|
2000-10-09 17:22:20 +00:00
|
|
|
retval = pnm_read_scanline (context);
|
|
|
|
|
|
|
|
if (retval == PNM_SUSPEND) {
|
1999-11-09 16:38:31 +00:00
|
|
|
break;
|
2000-10-09 17:22:20 +00:00
|
|
|
} else if (retval == PNM_FATAL_ERR) {
|
1999-11-09 16:38:31 +00:00
|
|
|
return FALSE;
|
2000-10-09 17:22:20 +00:00
|
|
|
} else if (retval == PNM_OK) {
|
1999-11-05 00:16:10 +00:00
|
|
|
/* send updated signal */
|
|
|
|
(* context->updated_func) (context->pixbuf,
|
2000-01-05 23:06:13 +00:00
|
|
|
0,
|
|
|
|
context->output_row-1,
|
|
|
|
context->width,
|
|
|
|
1,
|
|
|
|
context->user_data);
|
1999-11-05 00:16:10 +00:00
|
|
|
}
|
|
|
|
}
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-09 16:38:31 +00:00
|
|
|
if (context->output_row < context->height)
|
|
|
|
continue;
|
|
|
|
else
|
|
|
|
break;
|
1999-11-05 00:16:10 +00:00
|
|
|
}
|
2000-10-09 17:22:20 +00:00
|
|
|
|
1999-11-05 00:16:10 +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
|
|
|
|
|
|
|
void
|
2002-10-03 22:39:51 +00:00
|
|
|
MODULE_ENTRY (pnm, 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->load = gdk_pixbuf__pnm_image_load;
|
|
|
|
module->begin_load = gdk_pixbuf__pnm_image_begin_load;
|
|
|
|
module->stop_load = gdk_pixbuf__pnm_image_stop_load;
|
|
|
|
module->load_increment = gdk_pixbuf__pnm_image_load_increment;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
MODULE_ENTRY (pnm, fill_info) (GdkPixbufFormat *info)
|
|
|
|
{
|
|
|
|
static GdkPixbufModulePattern signature[] = {
|
|
|
|
{ "P1", NULL, 100 },
|
|
|
|
{ "P2", NULL, 100 },
|
|
|
|
{ "P3", NULL, 100 },
|
|
|
|
{ "P4", NULL, 100 },
|
|
|
|
{ "P5", NULL, 100 },
|
|
|
|
{ "P6", NULL, 100 },
|
|
|
|
{ NULL, NULL, 0 }
|
|
|
|
};
|
|
|
|
static gchar * mime_types[] = {
|
|
|
|
"image/x-portable-anymap",
|
|
|
|
"image/x-portable-bitmap",
|
|
|
|
"image/x-portable-graymap",
|
|
|
|
"image/x-portable-pixmap",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
static gchar * extensions[] = {
|
|
|
|
"pnm",
|
|
|
|
"pbm",
|
|
|
|
"pgm",
|
|
|
|
"ppm",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
info->name = "pnm";
|
|
|
|
info->signature = signature;
|
|
|
|
info->description = N_("The PNM/PBM/PGM/PPM image format family");
|
|
|
|
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_THREADSAFE;
|
2004-07-08 03:56:36 +00:00
|
|
|
info->license = "LGPL";
|
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
|
|
|
}
|