forked from AuroraMiddleware/gtk
518f32d97e
2000-10-06 Havoc Pennington <hp@redhat.com> * Makefile.am (SRC_SUBDIRS): contrib subdir * gdk/gdkpixbuf.h: Move GdkPixbufAlphaMode to gdk-pixbuf library, so it can be used in Xlib version * demos/testpixbuf.c (update_timeout): error checking from 1.0 tree * gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_get_pixbuf): Sync change from 1.0 tree that returns first frame of animation if the loaded file is an animation. * contrib: add new directory to hold stuff that comes with GTK+ but isn't really part of GTK+ (for now, gdk-pixbuf-xlib) * configure.in: add contrib/* 2000-10-06 Havoc Pennington <hp@redhat.com> * gdk-pixbuf.h: add GdkPixbufAlphaMode 2000-10-06 Havoc Pennington <hp@redhat.com> This entry is a summary of the merged-in changes from 1.0. Relevant original ChangeLog entries are spliced in after this entry; the files they refer to are from the 1.0 gdk-pixbuf sources. * pixops/pixops.c (pixops_composite_nearest): sync a small fix from 1.0 * io-xpm.c (xpm_seek_string): add fscanf error check from 1.0 Add progressive loader from 1.0 * io-tiff.c (gdk_pixbuf__tiff_image_begin_load): mem leak fixes from 1.0 tree * io-pnm.c: new version from 1.0 tree * io-jpeg.c (gdk_pixbuf__jpeg_image_load): sync from 1.0, use malloc not g_malloc * io-gif.c (lzw_read_byte): sync from 1.0, change a g_error to g_warning (gif_get_next_step): return 0 here, sync from 1.0 * gdk-pixbuf-util.c: sync email address change for Cody Russell 2000-09-11 Jeffrey Stedfast <fejj@helixcode.com> * gdk-pixbuf/io-pnm.c: Pretty much totally rewrote again because last nights code was still "broken". Should now properly handle all error conditions gracefully. 2000-09-10 Jeffrey Stedfast <fejj@helixcode.com> * gdk-pixbuf/io-pnm.c: Rewrote. 2000-09-09 Federico Mena Quintero <federico@helixcode.com> * gdk-pixbuf/pixops/pixops.c (pixops_composite_nearest): Compute the correct dest offset. 2000-08-25 Federico Mena Quintero <federico@helixcode.com> * gdk-pixbuf/io-xpm.c: #include <unistd.h> 2000-08-05 Larry Ewing <lewing@helixcode.com> * gdk-pixbuf/io-tiff.c: stop leaking context->tempname. * gdk-pixbuf/io-xpm.c: same as above. 2000-07-26 Michael Meeks <michael@helixcode.com> * gdk-pixbuf/io-jpeg.c (gdk_pixbuf__jpeg_image_load): make g_malloc a malloc. 2000-07-21 Larry Ewing <lewing@helixcode.com> * gdk-pixbuf/io-xpm.c: add a fake progressive loader so that xpm at least supports the progressive interface like the one in io-tiff.c. This should be reimplemented as an actual progressive loader. 2000-07-19 Jonathan Blandford <jrb@redhat.com> * demo/pixbuf-demo.c (update_timeout): changed scaling level to make it look better. * gdk-pixbuf/testpixbuf.c (update_timeout): Patch from michael meeks to handle errors better.
222 lines
5.0 KiB
C
222 lines
5.0 KiB
C
/* GdkPixbuf library - TIFF 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 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
|
||
* Lesser General Public License for more details.
|
||
*
|
||
* 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.
|
||
*/
|
||
|
||
/* Following code (almost) blatantly ripped from Imlib */
|
||
|
||
#include <config.h>
|
||
#include <stdlib.h>
|
||
#include <string.h>
|
||
#ifdef HAVE_UNISTD_H
|
||
#include <unistd.h>
|
||
#endif
|
||
#include <tiffio.h>
|
||
#include "gdk-pixbuf-private.h"
|
||
#include "gdk-pixbuf-io.h"
|
||
|
||
#ifdef G_OS_WIN32
|
||
#include <fcntl.h>
|
||
#define O_RDWR _O_RDWR
|
||
#endif
|
||
|
||
|
||
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;
|
||
gchar *tmp = g_get_tmp_dir ();
|
||
|
||
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_strconcat (tmp,
|
||
tmp[strlen (tmp)] == G_DIR_SEPARATOR ? G_DIR_SEPARATOR_S : "",
|
||
"gdkpixbuf-tif-tmp.XXXXXX",
|
||
NULL);
|
||
#ifdef HAVE_MKSTEMP
|
||
fd = mkstemp (context->tempname);
|
||
#else
|
||
mktemp (context->tempname);
|
||
fd = open (context->tempname, O_RDWR);
|
||
#endif
|
||
if (fd < 0) {
|
||
g_free (context->tempname);
|
||
g_free (context);
|
||
return NULL;
|
||
}
|
||
|
||
context->file = fdopen (fd, "w");
|
||
if (context->file == NULL) {
|
||
g_free (context->tempname);
|
||
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 (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;
|
||
}
|
||
|