forked from AuroraMiddleware/gtk
829ed02435
2000-04-11 Federico Mena Quintero <federico@helixcode.com> Most of this patch is based on a patch by Havoc Pennington (hp@redhat.com) to make GdkPixbuf's structures opaque and to remove the libart dependency. * gdk-pixbuf/gdk-pixbuf.h: Removed the public structures. (GdkColorspace): New enum that for now only contains GDK_COLORSPACE_RGB. (GdkPixbufDestroyNotify): New type for the pixbuf's pixels destroy notification function. (GdkInterpType): New num with interpolation types. * *.[ch]: Replace the libart stuff with our own stuff. * pixops/*.[ch]: Likewise. * gdk-pixbuf/gdk-pixbuf-private.h: New file with the private declarations of the GdkPixbuf structures. * gdk-pixbuf/gdk-pixbuf.c (gdk_pixbuf_new_from_art_pixbuf): Removed function. (gdk_pixbuf_get_format): Constify. (gdk_pixbuf_get_n_channels): Constify. (gdk_pixbuf_get_has_alpha): Constify. (gdk_pixbuf_get_bits_per_sample): Constify. (gdk_pixbuf_get_pixels): Constify. (gdk_pixbuf_get_width): Constify. (gdk_pixbuf_get_height): Constify. (gdk_pixbuf_get_rowstride): Constify. * gdk-pixbuf/gdk-pixbuf.c (gdk_pixbuf_copy): New function to copy a pixbuf. * gdk-pixbuf/gdk-pixbuf-data.c (gdk_pixbuf_new_from_data): Added a bits_per_sample argument; currently only 8 bits per sample are supported. * gdk-pixbuf/gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_pixbuf): New accessor. (gdk_pixbuf_frame_get_x_offset): New accessor. (gdk_pixbuf_frame_get_y_offset): New accessor. (gdk_pixbuf_frame_get_delay_time): New accessor. (gdk_pixbuf_frame_get_action): New accessor. * gdk-pixbuf/gdk-pixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask): Instead of returning a solid mask rectangle for pixbufs without an alpha channel, set the *mask_return to NULL. * gdk-pixbuf/gdk-pixbuf-util.c (gdk_pixbuf_add_alpha): Constify. * gdk-pixbuf/gdk-pixbuf-scale.c: Fix includes. * gdk-pixbuf/gdk-pixbuf-scale.c (gdk_pixbuf_scale): Added some preconditions. Maybe we should also check for the colorspace, bits per pixel, and such. (gdk_pixbuf_composite): Likewise. (gdk_pixbuf_composite_color): Likewise. (gdk_pixbuf_scale_simple): Likewise, and fail gracefully if we cannot allocate the new pixbuf. (gdk_pixbuf_composite_color_simple): Likewise. * gdk-pixbuf/gnome-canvas-pixbuf.c (gnome_canvas_pixbuf_render): Use art_rgb_rgba_affine() or art_rgb_affine() since we no longer have an ArtPixBuf. * gdk-pixbuf/io-bmp.c: Fix includes. * gdk-pixbuf/pixops/pixops.c (pixops_scale_nearest): Fixed cast in an lvalue. * TODO: Populated. * configure.in: Removed checks for libart. * gdk-pixbuf/Makefile.am: Removed references to libart. (noinst_HEADERS): Added gdk-pixbuf-private.h. * gdk-pixbuf/Makefile.am (libgdk_pixbuf_la_LDFLAGS): Incremented the version number of the libtool library to indicate that this definitely is not compatible with the old usage. I know you love me. I know you do. * configure.in: Bumped version number to 0.7.0. * README: Updated. * gdk-pixbuf-config.in (--libs): We no longer require libart. * DEPENDS.libgdk_pixbuf: We no longer depend on libart. * gdk-pixbuf.spec.in: Updated, but I don't guarantee anything.
203 lines
4.6 KiB
C
203 lines
4.6 KiB
C
/* GdkPixbuf library - JPEG image loader
|
||
*
|
||
* Copyright (C) 1999 Mark Crichton
|
||
* Copyright (C) 1999 The Free Software Foundation
|
||
*
|
||
* Authors: Mark Crichton <crichton@gimp.org>
|
||
* Federico Mena-Quintero <federico@gimp.org>
|
||
* Jonathan Blandford <jrb@redhat.com>
|
||
*
|
||
* This library is free software; you can redistribute it and/or
|
||
* modify it under the terms of the GNU Library 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.
|
||
*
|
||
* You should have received a copy of the GNU Library 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.
|
||
*/
|
||
|
||
/* Following code (almost) blatantly ripped from Imlib */
|
||
|
||
#include <config.h>
|
||
#include <stdlib.h>
|
||
#include <string.h>
|
||
#include <unistd.h>
|
||
#include <tiffio.h>
|
||
#include "gdk-pixbuf-private.h"
|
||
#include "gdk-pixbuf-io.h"
|
||
|
||
|
||
|
||
typedef struct _TiffData TiffData;
|
||
struct _TiffData
|
||
{
|
||
ModulePreparedNotifyFunc prepare_func;
|
||
ModuleUpdatedNotifyFunc update_func;
|
||
gpointer user_data;
|
||
|
||
gchar *tempname;
|
||
FILE *file;
|
||
gboolean all_okay;
|
||
};
|
||
|
||
|
||
|
||
GdkPixbuf *
|
||
gdk_pixbuf__tiff_image_load_real (FILE *f, TiffData *context)
|
||
{
|
||
TIFF *tiff;
|
||
guchar *pixels = NULL;
|
||
guchar *tmppix;
|
||
gint w, h, x, y, num_pixs, fd;
|
||
uint32 *rast, *tmp_rast;
|
||
GdkPixbuf *pixbuf;
|
||
|
||
fd = fileno (f);
|
||
tiff = TIFFFdOpen (fd, "libpixbuf-tiff", "r");
|
||
|
||
if (!tiff)
|
||
return NULL;
|
||
|
||
TIFFGetField (tiff, TIFFTAG_IMAGEWIDTH, &w);
|
||
TIFFGetField (tiff, TIFFTAG_IMAGELENGTH, &h);
|
||
num_pixs = w * h;
|
||
pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, w, h);
|
||
|
||
if (context)
|
||
(* context->prepare_func) (pixbuf, context->user_data);
|
||
|
||
/* Yes, it needs to be _TIFFMalloc... */
|
||
rast = (uint32 *) _TIFFmalloc (num_pixs * sizeof (uint32));
|
||
|
||
if (!rast) {
|
||
TIFFClose (tiff);
|
||
return NULL;
|
||
}
|
||
|
||
if (TIFFReadRGBAImage (tiff, w, h, rast, 0)) {
|
||
pixels = gdk_pixbuf_get_pixels (pixbuf);
|
||
if (!pixels) {
|
||
_TIFFfree (rast);
|
||
TIFFClose (tiff);
|
||
return NULL;
|
||
}
|
||
tmppix = pixels;
|
||
|
||
for (y = 0; y < h; y++) {
|
||
/* Unexplainable...are tiffs backwards? */
|
||
/* Also looking at the GIMP plugin, this
|
||
* whole reading thing can be a bit more
|
||
* robust.
|
||
*/
|
||
tmp_rast = rast + ((h - y - 1) * w);
|
||
for (x = 0; x < w; x++) {
|
||
tmppix[0] = TIFFGetR (*tmp_rast);
|
||
tmppix[1] = TIFFGetG (*tmp_rast);
|
||
tmppix[2] = TIFFGetB (*tmp_rast);
|
||
tmppix[3] = TIFFGetA (*tmp_rast);
|
||
tmp_rast++;
|
||
tmppix += 4;
|
||
}
|
||
}
|
||
}
|
||
_TIFFfree (rast);
|
||
TIFFClose (tiff);
|
||
|
||
if (context) {
|
||
(* context->update_func) (pixbuf, 0, 0, w, h, context->user_data);
|
||
gdk_pixbuf_unref (pixbuf);
|
||
}
|
||
|
||
return pixbuf;
|
||
}
|
||
|
||
|
||
|
||
/* Static loader */
|
||
|
||
GdkPixbuf *
|
||
gdk_pixbuf__tiff_image_load (FILE *f)
|
||
{
|
||
return gdk_pixbuf__tiff_image_load_real (f, NULL);
|
||
}
|
||
|
||
|
||
|
||
/* Progressive loader */
|
||
/*
|
||
* Tiff loading progressively cannot be done. We write it to a file, then load
|
||
* the file when it's done. It's not pretty.
|
||
*/
|
||
|
||
|
||
gpointer
|
||
gdk_pixbuf__tiff_image_begin_load (ModulePreparedNotifyFunc prepare_func,
|
||
ModuleUpdatedNotifyFunc update_func,
|
||
ModuleFrameDoneNotifyFunc frame_done_func,
|
||
ModuleAnimationDoneNotifyFunc anim_done_func,
|
||
gpointer user_data)
|
||
{
|
||
TiffData *context;
|
||
gint fd;
|
||
|
||
context = g_new (TiffData, 1);
|
||
context->prepare_func = prepare_func;
|
||
context->update_func = update_func;
|
||
context->user_data = user_data;
|
||
context->all_okay = TRUE;
|
||
context->tempname = g_strdup ("/tmp/gdkpixbuf-tif-tmp.XXXXXX");
|
||
fd = mkstemp (context->tempname);
|
||
if (fd < 0) {
|
||
g_free (context);
|
||
return NULL;
|
||
}
|
||
|
||
context->file = fdopen (fd, "w");
|
||
if (context->file == NULL) {
|
||
g_free (context);
|
||
return NULL;
|
||
}
|
||
|
||
return context;
|
||
}
|
||
|
||
void
|
||
gdk_pixbuf__tiff_image_stop_load (gpointer data)
|
||
{
|
||
TiffData *context = (TiffData*) data;
|
||
|
||
g_return_if_fail (data != NULL);
|
||
|
||
fflush (context->file);
|
||
rewind (context->file);
|
||
if (context->all_okay)
|
||
gdk_pixbuf__tiff_image_load_real (context->file, context);
|
||
|
||
fclose (context->file);
|
||
unlink (context->tempname);
|
||
g_free ((TiffData *) context);
|
||
}
|
||
|
||
gboolean
|
||
gdk_pixbuf__tiff_image_load_increment (gpointer data, guchar *buf, guint size)
|
||
{
|
||
TiffData *context = (TiffData *) data;
|
||
|
||
g_return_val_if_fail (data != NULL, FALSE);
|
||
|
||
if (fwrite (buf, sizeof (guchar), size, context->file) != size) {
|
||
context->all_okay = FALSE;
|
||
return FALSE;
|
||
}
|
||
|
||
return TRUE;
|
||
}
|
||
|