+/* -*- mode: C; c-file-style: "linux" -*- */
/* GdkPixbuf library - SUNRAS image loader
*
* Copyright (C) 1999 The Free Software Foundation
* Based on io-gif.c, io-tiff.c and io-png.c
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* 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
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
* 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>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
#include <string.h>
-#include "gdk-pixbuf.h"
+#include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h"
\f
-
/*
Header structure for sunras files.
All values are in big-endian order on disk
/* Progressive loading */
struct ras_progressive_state {
- ModulePreparedNotifyFunc prepared_func;
- ModuleUpdatedNotifyFunc updated_func;
+ GdkPixbufModuleSizeFunc size_func;
+ GdkPixbufModulePreparedFunc prepared_func;
+ GdkPixbufModuleUpdatedFunc updated_func;
gpointer user_data;
gint HeaderSize; /* The size of the header-part (incl colormap) */
8 = 8 bit colormapped
1 = 1 bit bitonal
*/
-
+ gint DecoderState;
struct rasterfile Header; /* Decoded (BE->CPU) header */
GdkPixbuf *pixbuf; /* Our "target" */
};
-gpointer
-gdk_pixbuf__ras_image_begin_load(ModulePreparedNotifyFunc prepared_func,
- ModuleUpdatedNotifyFunc updated_func,
- ModuleFrameDoneNotifyFunc frame_done_func,
- ModuleAnimationDoneNotifyFunc anim_done_func,
- gpointer user_data);
-void gdk_pixbuf__ras_image_stop_load(gpointer data);
-gboolean gdk_pixbuf__ras_image_load_increment(gpointer data, guchar * buf, guint size);
-
-
-
-/* Shared library entry point */
-GdkPixbuf *gdk_pixbuf__ras_image_load(FILE * f)
-{
- guchar *membuf;
- size_t length;
- struct ras_progressive_state *State;
-
- GdkPixbuf *pb;
-
- State = gdk_pixbuf__ras_image_begin_load(NULL, NULL, NULL, NULL, NULL);
-
- membuf = g_malloc(4096);
-
- g_assert(membuf != NULL);
-
- while (feof(f) == 0) {
- length = fread(membuf, 1, 4096, f);
- (void)gdk_pixbuf__ras_image_load_increment(State, membuf, length);
- }
- g_free(membuf);
- if (State->pixbuf != NULL)
- gdk_pixbuf_ref(State->pixbuf);
-
- pb = State->pixbuf;
-
- gdk_pixbuf__ras_image_stop_load(State);
- return pb;
-}
-
-static void RAS2State(struct rasterfile *RAS,
- struct ras_progressive_state *State)
+static gpointer
+gdk_pixbuf__ras_image_begin_load(GdkPixbufModuleSizeFunc size_func,
+ GdkPixbufModulePreparedFunc prepared_func,
+ GdkPixbufModuleUpdatedFunc updated_func,
+ gpointer user_data,
+ GError **error);
+static gboolean gdk_pixbuf__ras_image_stop_load(gpointer data, GError **error);
+static gboolean gdk_pixbuf__ras_image_load_increment(gpointer data,
+ const guchar * buf, guint size,
+ GError **error);
+
+static gboolean RAS2State(struct rasterfile *RAS,
+ struct ras_progressive_state *State,
+ GError **error)
{
State->Header.width = GUINT32_FROM_BE(RAS->width);
State->Header.height = GUINT32_FROM_BE(RAS->height);
State->Header.maptype = GUINT32_FROM_BE(RAS->maptype);
State->Header.maplength = GUINT32_FROM_BE(RAS->maplength);
- g_assert(State->Header.maplength <= 768); /* Otherwise, we are in trouble */
+ if ((gint)State->Header.width <= 0 ||
+ (gint)State->Header.height <= 0 ||
+ State->Header.maplength > 768) {
+ g_set_error (error,
+ GDK_PIXBUF_ERROR,
+ GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
+ _("RAS image has bogus header data"));
+ return FALSE;
+ }
State->RasType = State->Header.depth; /* This may be less trivial someday */
State->HeaderSize = 32 + State->Header.maplength;
if (State->RasType == 32)
State->LineWidth = State->Header.width * 4;
- if (State->RasType == 24)
+ else if (State->RasType == 24)
State->LineWidth = State->Header.width * 3;
- if (State->RasType == 8)
+ else if (State->RasType == 8)
State->LineWidth = State->Header.width * 1;
- if (State->RasType == 1) {
+ else if (State->RasType == 1) {
State->LineWidth = State->Header.width / 8;
if ((State->Header.width & 7) != 0)
State->LineWidth++;
}
+ else {
+ g_set_error (error,
+ GDK_PIXBUF_ERROR,
+ GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
+ _("RAS image has unknown type"));
+ return FALSE;
+ }
+
+ if (State->Header.type > 2 || State->Header.maptype > 1) {
+ g_set_error (error,
+ GDK_PIXBUF_ERROR,
+ GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
+ _("unsupported RAS image variation"));
+ return FALSE;
+ }
- /* Now padd the line to be a multiple of 16 bits */
+ /* Now pad the line to be a multiple of 16 bits */
if ((State->LineWidth & 1) != 0)
State->LineWidth++;
- if (State->LineBuf == NULL)
- State->LineBuf = g_malloc(State->LineWidth);
+ if (!State->LineBuf) {
+ State->LineBuf = g_try_malloc (State->LineWidth);
+
+ if (!State->LineBuf) {
+ g_set_error (error,
+ GDK_PIXBUF_ERROR,
+ GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
+ _("Not enough memory to load RAS image"));
+ return FALSE;
+ }
+ }
- g_assert(State->LineBuf != NULL);
+ if (!State->pixbuf) {
+ if (State->size_func) {
+ gint width = State->Header.width;
+ gint height = State->Header.height;
+
+ (*State->size_func) (&width, &height, State->user_data);
+ if (width == 0 || height == 0)
+ return FALSE;
+ }
- if (State->pixbuf == NULL) {
if (State->RasType == 32)
- State->pixbuf = gdk_pixbuf_new(ART_PIX_RGB, TRUE,
- 8,
- (gint)
- State->Header.width,
- (gint)
- State->Header.
- height);
+ State->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
+ (gint) State->Header.width,
+ (gint) State->Header.height);
else
- State->pixbuf =
- gdk_pixbuf_new(ART_PIX_RGB, FALSE, 8,
- (gint) State->Header.width,
- (gint) State->Header.height);
+ State->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
+ (gint) State->Header.width,
+ (gint) State->Header.height);
+
+ if (!State->pixbuf) {
+ g_set_error (error,
+ GDK_PIXBUF_ERROR,
+ GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
+ _("Not enough memory to load RAS image"));
+ return FALSE;
+ }
+
if (State->prepared_func != NULL)
/* Notify the client that we are ready to go */
(*State->prepared_func) (State->pixbuf,
+ NULL,
State->user_data);
}
- if ((State->Header.maplength==0)&&(State->RasType==1)) {
+ if ((State->Header.maplength == 0) && (State->RasType == 1)) {
State->HeaderBuf[32] = 255;
State->HeaderBuf[33] = 0;
State->HeaderBuf[34] = 255;
State->HeaderBuf[37] = 0;
}
+ return TRUE;
}
/*
* return context (opaque to user)
*/
-gpointer
-gdk_pixbuf__ras_image_begin_load(ModulePreparedNotifyFunc prepared_func,
- ModuleUpdatedNotifyFunc updated_func,
- ModuleFrameDoneNotifyFunc frame_done_func,
- ModuleAnimationDoneNotifyFunc anim_done_func,
- gpointer user_data)
+static gpointer
+gdk_pixbuf__ras_image_begin_load(GdkPixbufModuleSizeFunc size_func,
+ GdkPixbufModulePreparedFunc prepared_func,
+ GdkPixbufModuleUpdatedFunc updated_func,
+ gpointer user_data,
+ GError **error)
{
struct ras_progressive_state *context;
context = g_new0(struct ras_progressive_state, 1);
+ context->size_func = size_func;
context->prepared_func = prepared_func;
context->updated_func = updated_func;
context->user_data = user_data;
context->Lines = 0;
context->RasType = 0;
-
+ context->DecoderState = 0;
+
memset(&context->Header, 0, sizeof(struct rasterfile));
*
* free context, unref gdk_pixbuf
*/
-void
-gdk_pixbuf__ras_image_stop_load(gpointer data)
+static gboolean
+gdk_pixbuf__ras_image_stop_load(gpointer data, GError **error)
{
struct ras_progressive_state *context =
(struct ras_progressive_state *) data;
+ /* FIXME this thing needs to report errors if
+ * we have unused image data
+ */
- g_return_if_fail(context != NULL);
+ g_return_val_if_fail(context != NULL, TRUE);
if (context->LineBuf != NULL)
g_free(context->LineBuf);
g_free(context->HeaderBuf);
if (context->pixbuf)
- gdk_pixbuf_unref(context->pixbuf);
+ g_object_unref(context->pixbuf);
g_free(context);
+
+ return TRUE;
}
/*
guchar *Pixels;
X = 0;
- Pixels = context->pixbuf->art_pixbuf->pixels +
- context->pixbuf->art_pixbuf->rowstride * context->Lines;
+ Pixels = context->pixbuf->pixels + context->pixbuf->rowstride * context->Lines;
while (X < context->Header.width) {
/* The joys of having a BGR byteorder */
Pixels[X * 4 + 0] = context->LineBuf[X * 4 + 2];
guchar *Pixels;
X = 0;
- Pixels = context->pixbuf->art_pixbuf->pixels +
- context->pixbuf->art_pixbuf->rowstride * context->Lines;
+ Pixels = context->pixbuf->pixels + context->pixbuf->rowstride * context->Lines;
while (X < context->Header.width) {
/* The joys of having a BGR byteorder */
Pixels[X * 3 + 0] = context->LineBuf[X * 3 + 2];
{
gint X;
guchar *Pixels;
+ int offset = context->Header.maplength / 3;
X = 0;
- Pixels = context->pixbuf->art_pixbuf->pixels +
- context->pixbuf->art_pixbuf->rowstride * context->Lines;
+ Pixels = context->pixbuf->pixels + context->pixbuf->rowstride * context->Lines;
while (X < context->Header.width) {
/* The joys of having a BGR byteorder */
Pixels[X * 3 + 0] =
context->HeaderBuf[context->LineBuf[X] + 32];
Pixels[X * 3 + 1] =
- context->HeaderBuf[context->LineBuf[X] + 256 + 32];
+ context->HeaderBuf[context->LineBuf[X] + offset + 32];
Pixels[X * 3 + 2] =
- context->HeaderBuf[context->LineBuf[X] + 512 + 32];
+ context->HeaderBuf[context->LineBuf[X] + 2*offset + 32];
X++;
}
}
guchar *Pixels;
X = 0;
- Pixels = context->pixbuf->art_pixbuf->pixels +
- context->pixbuf->art_pixbuf->rowstride * context->Lines;
+ Pixels = context->pixbuf->pixels + context->pixbuf->rowstride * context->Lines;
while (X < context->Header.width) {
int Bit;
static void OneLine(struct ras_progressive_state *context)
{
+ context->LineDone = 0;
+ if (context->Lines >= context->Header.height)
+ return;
if (context->RasType == 32)
OneLine32(context);
if (context->RasType == 24)
OneLine1(context);
context->LineDone = 0;
- if (context->Lines > context->Header.height)
- return;
context->Lines++;
if (context->updated_func != NULL) {
0,
context->Lines,
context->Header.width,
- context->Header.height,
+ 1,
context->user_data);
}
}
+static gboolean
+DoCompressed (struct ras_progressive_state *context,
+ const guchar * buf, guint size,
+ GError **error)
+{
+ int i;
+
+ for (i = 0; i < size; i++) {
+ switch (context->DecoderState) {
+ case 0:
+ if (buf[i] == 0x80)
+ context->DecoderState = 1;
+ else
+ context->LineBuf[context->LineDone++] = buf[i];
+ break;
+ case 1:
+ if (buf[i] == 0) {
+ context->LineBuf[context->LineDone++] = 0x80;
+ context->DecoderState = 0;
+ }
+ else
+ context->DecoderState = buf[i] + 1;
+ break;
+ default:
+ for (; context->DecoderState; context->DecoderState--) {
+ context->LineBuf[context->LineDone++] = buf[i];
+ if ((context->LineDone >= context->LineWidth) && (context->LineWidth > 0))
+ OneLine(context);
+ }
+ }
+ if ((context->LineDone >= context->LineWidth) && (context->LineWidth > 0))
+ OneLine(context);
+ }
+ return TRUE;
+}
+
/*
* context - from image_begin_load
* buf - new image data
* size - length of new image data
*
- * append image data onto inrecrementally built output image
+ * append image data onto incrementally built output image
*/
-gboolean
-gdk_pixbuf__ras_image_load_increment(gpointer data, guchar * buf, guint size)
+static gboolean
+gdk_pixbuf__ras_image_load_increment(gpointer data,
+ const guchar * buf, guint size,
+ GError **error)
{
struct ras_progressive_state *context =
(struct ras_progressive_state *) data;
buf += BytesToCopy;
context->HeaderDone += BytesToCopy;
- } else {
- /* Pixeldata only */
+ } else if (context->Header.type == 2) {
+ if (!DoCompressed (context, buf, size, error)) {
+ return FALSE;
+ }
+ size = 0;
+ }
+ else {
BytesToCopy =
context->LineWidth - context->LineDone;
if (BytesToCopy > size)
}
if (context->HeaderDone >= 32)
- RAS2State((struct rasterfile *) context->HeaderBuf,
- context);
+ if (!RAS2State((struct rasterfile *) context->HeaderBuf,
+ context, error)) {
+ return FALSE;
+ }
}
return TRUE;
}
+
+void
+MODULE_ENTRY (ras, fill_vtable) (GdkPixbufModule *module)
+{
+ module->begin_load = gdk_pixbuf__ras_image_begin_load;
+ module->stop_load = gdk_pixbuf__ras_image_stop_load;
+ module->load_increment = gdk_pixbuf__ras_image_load_increment;
+}
+
+void
+MODULE_ENTRY (ras, fill_info) (GdkPixbufFormat *info)
+{
+ static GdkPixbufModulePattern signature[] = {
+ { "\x59\xa6\x6a\x95", NULL, 100 },
+ { NULL, NULL, 0 }
+ };
+ static gchar * mime_types[] = {
+ "image/x-cmu-raster",
+ "image/x-sun-raster",
+ NULL
+ };
+ static gchar * extensions[] = {
+ "ras",
+ NULL
+ };
+
+ info->name = "ras";
+ info->signature = signature;
+ info->description = N_("The Sun raster image format");
+ info->mime_types = mime_types;
+ info->extensions = extensions;
+ info->flags = 0;
+}
+
projects / ~andy / gtk / blobdiff