2001-06-01 23:05:46 +00:00
|
|
|
|
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
|
2000-10-05 21:40:37 +00:00
|
|
|
|
/* GdkPixbuf library - PNG image loader
|
1999-10-20 21:20:49 +00:00
|
|
|
|
*
|
1999-06-30 15:28:43 +00:00
|
|
|
|
* Copyright (C) 1999 Mark Crichton
|
1999-10-20 21:20:49 +00:00
|
|
|
|
* Copyright (C) 1999 The Free Software Foundation
|
|
|
|
|
*
|
|
|
|
|
* Authors: Mark Crichton <crichton@gimp.org>
|
|
|
|
|
* Federico Mena-Quintero <federico@gimp.org>
|
1999-01-05 04:31:03 +00:00
|
|
|
|
*
|
1999-06-30 15:28:43 +00:00
|
|
|
|
* This library is free software; you can redistribute it and/or
|
2000-07-26 11:33:08 +00:00
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
1999-06-30 15:28:43 +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-07-26 11:33:08 +00:00
|
|
|
|
* Lesser General Public License for more details.
|
1999-06-30 15:28:43 +00:00
|
|
|
|
*
|
2000-07-26 11:33:08 +00:00
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
1999-10-20 21:20:49 +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.
|
1999-01-05 04:31:03 +00:00
|
|
|
|
*/
|
1999-10-20 21:20:49 +00:00
|
|
|
|
|
1999-01-05 04:31:03 +00:00
|
|
|
|
#include <config.h>
|
|
|
|
|
#include <stdio.h>
|
2000-04-11 07:03:25 +00:00
|
|
|
|
#include <stdlib.h>
|
1999-01-05 04:31:03 +00:00
|
|
|
|
#include <png.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-10-20 21:20:49 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-10-27 19:42:34 +00:00
|
|
|
|
static void
|
|
|
|
|
setup_png_transformations(png_structp png_read_ptr, png_infop png_info_ptr,
|
|
|
|
|
gboolean *fatal_error_occurred,
|
|
|
|
|
png_uint_32* width_p, png_uint_32* height_p,
|
|
|
|
|
int* color_type_p)
|
|
|
|
|
{
|
|
|
|
|
png_uint_32 width, height;
|
|
|
|
|
int bit_depth, color_type, interlace_type, compression_type, filter_type;
|
2001-07-18 04:25:04 +00:00
|
|
|
|
#ifndef G_DISABLE_CHECKS
|
1999-10-27 19:42:34 +00:00
|
|
|
|
int channels;
|
2001-07-18 04:25:04 +00:00
|
|
|
|
#endif
|
1999-10-27 19:42:34 +00:00
|
|
|
|
|
|
|
|
|
/* Get the image info */
|
|
|
|
|
|
|
|
|
|
png_get_IHDR (png_read_ptr, png_info_ptr,
|
|
|
|
|
&width, &height,
|
|
|
|
|
&bit_depth,
|
|
|
|
|
&color_type,
|
|
|
|
|
&interlace_type,
|
|
|
|
|
&compression_type,
|
|
|
|
|
&filter_type);
|
|
|
|
|
|
|
|
|
|
/* set_expand() basically needs to be called unless
|
|
|
|
|
we are already in RGB/RGBA mode
|
|
|
|
|
*/
|
|
|
|
|
if (color_type == PNG_COLOR_TYPE_PALETTE &&
|
|
|
|
|
bit_depth <= 8) {
|
|
|
|
|
|
|
|
|
|
/* Convert indexed images to RGB */
|
|
|
|
|
png_set_expand (png_read_ptr);
|
|
|
|
|
|
|
|
|
|
} else if (color_type == PNG_COLOR_TYPE_GRAY &&
|
|
|
|
|
bit_depth < 8) {
|
|
|
|
|
|
|
|
|
|
/* Convert grayscale to RGB */
|
|
|
|
|
png_set_expand (png_read_ptr);
|
|
|
|
|
|
|
|
|
|
} else if (png_get_valid (png_read_ptr,
|
|
|
|
|
png_info_ptr, PNG_INFO_tRNS)) {
|
|
|
|
|
|
|
|
|
|
/* If we have transparency header, convert it to alpha
|
|
|
|
|
channel */
|
|
|
|
|
png_set_expand(png_read_ptr);
|
|
|
|
|
|
|
|
|
|
} else if (bit_depth < 8) {
|
|
|
|
|
|
|
|
|
|
/* If we have < 8 scale it up to 8 */
|
|
|
|
|
png_set_expand(png_read_ptr);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Conceivably, png_set_packing() is a better idea;
|
|
|
|
|
* God only knows how libpng works
|
|
|
|
|
*/
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If we are 16-bit, convert to 8-bit */
|
|
|
|
|
if (bit_depth == 16) {
|
|
|
|
|
png_set_strip_16(png_read_ptr);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If gray scale, convert to RGB */
|
|
|
|
|
if (color_type == PNG_COLOR_TYPE_GRAY ||
|
|
|
|
|
color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
|
|
|
|
|
png_set_gray_to_rgb(png_read_ptr);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If interlaced, handle that */
|
|
|
|
|
if (interlace_type != PNG_INTERLACE_NONE) {
|
|
|
|
|
png_set_interlace_handling(png_read_ptr);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Update the info the reflect our transformations */
|
|
|
|
|
png_read_update_info(png_read_ptr, png_info_ptr);
|
|
|
|
|
|
|
|
|
|
png_get_IHDR (png_read_ptr, png_info_ptr,
|
|
|
|
|
&width, &height,
|
|
|
|
|
&bit_depth,
|
|
|
|
|
&color_type,
|
|
|
|
|
&interlace_type,
|
|
|
|
|
&compression_type,
|
|
|
|
|
&filter_type);
|
|
|
|
|
|
|
|
|
|
*width_p = width;
|
|
|
|
|
*height_p = height;
|
|
|
|
|
*color_type_p = color_type;
|
|
|
|
|
|
|
|
|
|
#ifndef G_DISABLE_CHECKS
|
|
|
|
|
/* Check that the new info is what we want */
|
|
|
|
|
|
|
|
|
|
if (bit_depth != 8) {
|
|
|
|
|
g_warning("Bits per channel of transformed PNG is %d, not 8.", bit_depth);
|
|
|
|
|
*fatal_error_occurred = TRUE;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ( ! (color_type == PNG_COLOR_TYPE_RGB ||
|
|
|
|
|
color_type == PNG_COLOR_TYPE_RGB_ALPHA) ) {
|
|
|
|
|
g_warning("Transformed PNG not RGB or RGBA.");
|
|
|
|
|
*fatal_error_occurred = TRUE;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
channels = png_get_channels(png_read_ptr, png_info_ptr);
|
|
|
|
|
if ( ! (channels == 3 || channels == 4) ) {
|
|
|
|
|
g_warning("Transformed PNG has %d channels, must be 3 or 4.", channels);
|
|
|
|
|
*fatal_error_occurred = TRUE;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
2000-10-18 18:42:54 +00:00
|
|
|
|
static void
|
|
|
|
|
png_simple_error_callback(png_structp png_save_ptr,
|
|
|
|
|
png_const_charp error_msg)
|
|
|
|
|
{
|
|
|
|
|
GError **error;
|
|
|
|
|
|
|
|
|
|
error = png_get_error_ptr(png_save_ptr);
|
|
|
|
|
|
|
|
|
|
/* I don't trust libpng to call the error callback only once,
|
|
|
|
|
* so check for already-set error
|
|
|
|
|
*/
|
|
|
|
|
if (error && *error == NULL) {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_FAILED,
|
2000-11-14 01:08:28 +00:00
|
|
|
|
_("Fatal error in PNG image file: %s"),
|
2000-10-18 18:42:54 +00:00
|
|
|
|
error_msg);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
png_simple_warning_callback(png_structp png_save_ptr,
|
|
|
|
|
png_const_charp warning_msg)
|
|
|
|
|
{
|
|
|
|
|
/* Don't print anything; we should not be dumping junk to
|
|
|
|
|
* stderr, since that may be bad for some apps. If it's
|
|
|
|
|
* important enough to display, we need to add a GError
|
|
|
|
|
* **warning return location wherever we have an error return
|
|
|
|
|
* location.
|
|
|
|
|
*/
|
|
|
|
|
}
|
|
|
|
|
|
2000-04-11 07:03:25 +00:00
|
|
|
|
/* Destroy notification function for the pixbuf */
|
1999-10-20 21:20:49 +00:00
|
|
|
|
static void
|
2000-04-11 07:03:25 +00:00
|
|
|
|
free_buffer (guchar *pixels, gpointer data)
|
1999-10-20 21:20:49 +00:00
|
|
|
|
{
|
2001-02-19 14:35:25 +00:00
|
|
|
|
g_free (pixels);
|
1999-10-20 21:20:49 +00:00
|
|
|
|
}
|
1999-01-05 04:31:03 +00:00
|
|
|
|
|
2001-10-05 18:51:47 +00:00
|
|
|
|
static gboolean
|
|
|
|
|
png_text_to_pixbuf_option (png_text text_ptr,
|
|
|
|
|
gchar **key,
|
|
|
|
|
gchar **value)
|
|
|
|
|
{
|
|
|
|
|
*value = g_convert (text_ptr.text, -1,
|
|
|
|
|
"UTF-8", "ISO-8859-1",
|
|
|
|
|
NULL, NULL, NULL);
|
|
|
|
|
if (*value) {
|
|
|
|
|
*key = g_strconcat ("tEXt::", text_ptr.key, NULL);
|
|
|
|
|
return TRUE;
|
|
|
|
|
} else {
|
|
|
|
|
g_warning ("Couldn't convert tEXt chunk value to UTF-8.");
|
|
|
|
|
*key = NULL;
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-01-05 04:31:03 +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__png_image_load (FILE *f, GError **error)
|
1999-01-05 04:31:03 +00:00
|
|
|
|
{
|
2001-10-05 18:51:47 +00:00
|
|
|
|
GdkPixbuf *pixbuf;
|
1999-10-18 19:29:45 +00:00
|
|
|
|
png_structp png_ptr;
|
|
|
|
|
png_infop info_ptr, end_info;
|
2001-10-05 18:51:47 +00:00
|
|
|
|
png_textp text_ptr;
|
1999-10-27 19:42:34 +00:00
|
|
|
|
gboolean failed = FALSE;
|
1999-10-27 23:36:44 +00:00
|
|
|
|
gint i, ctype, bpp;
|
1999-10-22 15:18:03 +00:00
|
|
|
|
png_uint_32 w, h;
|
2002-01-20 04:52:47 +00:00
|
|
|
|
png_bytepp volatile rows = NULL;
|
|
|
|
|
guchar * volatile pixels = NULL;
|
2001-10-05 18:51:47 +00:00
|
|
|
|
gint num_texts;
|
|
|
|
|
gchar **options = NULL;
|
1999-10-18 19:29:45 +00:00
|
|
|
|
|
2000-10-18 18:42:54 +00:00
|
|
|
|
png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING,
|
|
|
|
|
error,
|
|
|
|
|
png_simple_error_callback,
|
|
|
|
|
png_simple_warning_callback);
|
1999-10-18 19:29:45 +00:00
|
|
|
|
if (!png_ptr)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
info_ptr = png_create_info_struct (png_ptr);
|
|
|
|
|
if (!info_ptr) {
|
|
|
|
|
png_destroy_read_struct (&png_ptr, NULL, NULL);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
end_info = png_create_info_struct (png_ptr);
|
|
|
|
|
if (!end_info) {
|
|
|
|
|
png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (setjmp (png_ptr->jmpbuf)) {
|
2002-01-20 04:52:47 +00:00
|
|
|
|
if (rows)
|
|
|
|
|
g_free (rows);
|
|
|
|
|
|
|
|
|
|
if (pixels)
|
|
|
|
|
g_free (pixels);
|
|
|
|
|
|
1999-10-18 19:29:45 +00:00
|
|
|
|
png_destroy_read_struct (&png_ptr, &info_ptr, &end_info);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
1999-10-20 21:20:49 +00:00
|
|
|
|
png_init_io (png_ptr, f);
|
1999-10-18 19:29:45 +00:00
|
|
|
|
png_read_info (png_ptr, info_ptr);
|
1999-06-29 02:54:16 +00:00
|
|
|
|
|
1999-10-27 19:42:34 +00:00
|
|
|
|
setup_png_transformations(png_ptr, info_ptr, &failed, &w, &h, &ctype);
|
1999-10-18 19:29:45 +00:00
|
|
|
|
|
1999-10-27 19:42:34 +00:00
|
|
|
|
if (failed) {
|
|
|
|
|
png_destroy_read_struct (&png_ptr, &info_ptr, &end_info);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
1999-10-18 19:29:45 +00:00
|
|
|
|
if (ctype & PNG_COLOR_MASK_ALPHA)
|
|
|
|
|
bpp = 4;
|
|
|
|
|
else
|
|
|
|
|
bpp = 3;
|
|
|
|
|
|
2001-02-19 14:35:25 +00:00
|
|
|
|
pixels = g_try_malloc (w * h * bpp);
|
1999-10-22 15:18:03 +00:00
|
|
|
|
if (!pixels) {
|
2000-10-18 18:42:54 +00:00
|
|
|
|
/* Check error NULL, normally this would be broken,
|
|
|
|
|
* but libpng makes me want to code defensively.
|
|
|
|
|
*/
|
|
|
|
|
if (error && *error == NULL) {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
|
|
|
|
|
_("Insufficient memory to load PNG file"));
|
|
|
|
|
}
|
|
|
|
|
|
1999-10-18 19:29:45 +00:00
|
|
|
|
png_destroy_read_struct (&png_ptr, &info_ptr, &end_info);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
1999-10-20 21:20:49 +00:00
|
|
|
|
|
1999-10-22 15:18:03 +00:00
|
|
|
|
rows = g_new (png_bytep, h);
|
1999-10-20 21:20:49 +00:00
|
|
|
|
|
1999-10-22 15:18:03 +00:00
|
|
|
|
for (i = 0; i < h; i++)
|
|
|
|
|
rows[i] = pixels + i * w * bpp;
|
1999-10-20 21:20:49 +00:00
|
|
|
|
|
1999-10-18 19:29:45 +00:00
|
|
|
|
png_read_image (png_ptr, rows);
|
2001-10-05 18:51:47 +00:00
|
|
|
|
|
|
|
|
|
if (png_get_text (png_ptr, info_ptr, &text_ptr, &num_texts)) {
|
|
|
|
|
options = g_new (gchar *, num_texts * 2);
|
|
|
|
|
for (i = 0; i < num_texts; i++) {
|
|
|
|
|
png_text_to_pixbuf_option (text_ptr[i],
|
|
|
|
|
options + 2*i,
|
|
|
|
|
options + 2*i + 1);
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-10-18 19:29:45 +00:00
|
|
|
|
png_destroy_read_struct (&png_ptr, &info_ptr, &end_info);
|
1999-10-22 15:18:03 +00:00
|
|
|
|
g_free (rows);
|
1999-07-19 04:21:09 +00:00
|
|
|
|
|
1999-10-18 19:29:45 +00:00
|
|
|
|
if (ctype & PNG_COLOR_MASK_ALPHA)
|
2001-10-05 18:51:47 +00:00
|
|
|
|
pixbuf = gdk_pixbuf_new_from_data (pixels, GDK_COLORSPACE_RGB, TRUE, 8,
|
|
|
|
|
w, h, w * 4,
|
|
|
|
|
free_buffer, NULL);
|
1999-10-18 19:29:45 +00:00
|
|
|
|
else
|
2001-10-05 18:51:47 +00:00
|
|
|
|
pixbuf = gdk_pixbuf_new_from_data (pixels, GDK_COLORSPACE_RGB, FALSE, 8,
|
|
|
|
|
w, h, w * 3,
|
|
|
|
|
free_buffer, NULL);
|
|
|
|
|
|
|
|
|
|
if (options) {
|
|
|
|
|
for (i = 0; i < num_texts; i++) {
|
|
|
|
|
if (pixbuf) {
|
|
|
|
|
if (!gdk_pixbuf_set_option (pixbuf,
|
|
|
|
|
options[2*i],
|
|
|
|
|
options[2*i+1]))
|
|
|
|
|
g_warning ("Got multiple tEXt chunks for the same key.");
|
|
|
|
|
}
|
|
|
|
|
g_free (options[2*i]);
|
|
|
|
|
g_free (options[2*i+1]);
|
|
|
|
|
}
|
|
|
|
|
g_free (options);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return pixbuf;
|
1999-07-30 15:34:18 +00:00
|
|
|
|
}
|
1999-10-26 16:26:00 +00:00
|
|
|
|
|
2000-06-09 19:41:29 +00:00
|
|
|
|
/* I wish these avoided the setjmp()/longjmp() crap in libpng instead
|
|
|
|
|
just allow you to change the error reporting. */
|
1999-10-27 18:55:00 +00:00
|
|
|
|
static void png_error_callback (png_structp png_read_ptr,
|
|
|
|
|
png_const_charp error_msg);
|
|
|
|
|
|
|
|
|
|
static void png_warning_callback(png_structp png_read_ptr,
|
|
|
|
|
png_const_charp warning_msg);
|
|
|
|
|
|
|
|
|
|
/* Called at the start of the progressive load */
|
|
|
|
|
static void png_info_callback (png_structp png_read_ptr,
|
|
|
|
|
png_infop png_info_ptr);
|
|
|
|
|
|
|
|
|
|
/* Called for each row; note that you will get duplicate row numbers
|
|
|
|
|
for interlaced PNGs */
|
|
|
|
|
static void png_row_callback (png_structp png_read_ptr,
|
|
|
|
|
png_bytep new_row,
|
|
|
|
|
png_uint_32 row_num,
|
|
|
|
|
int pass_num);
|
|
|
|
|
|
|
|
|
|
/* Called after reading the entire image */
|
|
|
|
|
static void png_end_callback (png_structp png_read_ptr,
|
|
|
|
|
png_infop png_info_ptr);
|
|
|
|
|
|
|
|
|
|
typedef struct _LoadContext LoadContext;
|
|
|
|
|
|
|
|
|
|
struct _LoadContext {
|
|
|
|
|
png_structp png_read_ptr;
|
|
|
|
|
png_infop png_info_ptr;
|
|
|
|
|
|
1999-11-22 23:04:52 +00:00
|
|
|
|
ModulePreparedNotifyFunc prepare_func;
|
|
|
|
|
ModuleUpdatedNotifyFunc update_func;
|
1999-10-27 18:55:00 +00:00
|
|
|
|
gpointer notify_user_data;
|
|
|
|
|
|
|
|
|
|
GdkPixbuf* pixbuf;
|
1999-11-22 23:04:52 +00:00
|
|
|
|
|
|
|
|
|
/* row number of first row seen, or -1 if none yet seen */
|
|
|
|
|
|
|
|
|
|
gint first_row_seen_in_chunk;
|
|
|
|
|
|
|
|
|
|
/* pass number for the first row seen */
|
|
|
|
|
|
|
|
|
|
gint first_pass_seen_in_chunk;
|
|
|
|
|
|
|
|
|
|
/* row number of last row seen */
|
|
|
|
|
gint last_row_seen_in_chunk;
|
|
|
|
|
|
|
|
|
|
gint last_pass_seen_in_chunk;
|
|
|
|
|
|
|
|
|
|
/* highest row number seen */
|
|
|
|
|
gint max_row_seen_in_chunk;
|
1999-10-27 18:55:00 +00:00
|
|
|
|
|
|
|
|
|
guint fatal_error_occurred : 1;
|
|
|
|
|
|
2000-10-18 18:42:54 +00:00
|
|
|
|
GError **error;
|
1999-10-27 18:55:00 +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
|
|
|
|
static gpointer
|
2000-02-22 00:29:00 +00:00
|
|
|
|
gdk_pixbuf__png_image_begin_load (ModulePreparedNotifyFunc prepare_func,
|
|
|
|
|
ModuleUpdatedNotifyFunc update_func,
|
2000-10-18 18:42:54 +00:00
|
|
|
|
gpointer user_data,
|
|
|
|
|
GError **error)
|
1999-10-27 18:55:00 +00:00
|
|
|
|
{
|
|
|
|
|
LoadContext* lc;
|
|
|
|
|
|
|
|
|
|
lc = g_new0(LoadContext, 1);
|
|
|
|
|
|
|
|
|
|
lc->fatal_error_occurred = FALSE;
|
|
|
|
|
|
1999-11-22 23:04:52 +00:00
|
|
|
|
lc->prepare_func = prepare_func;
|
|
|
|
|
lc->update_func = update_func;
|
1999-10-27 18:55:00 +00:00
|
|
|
|
lc->notify_user_data = user_data;
|
|
|
|
|
|
1999-11-22 23:04:52 +00:00
|
|
|
|
lc->first_row_seen_in_chunk = -1;
|
|
|
|
|
lc->last_row_seen_in_chunk = -1;
|
|
|
|
|
lc->first_pass_seen_in_chunk = -1;
|
|
|
|
|
lc->last_pass_seen_in_chunk = -1;
|
|
|
|
|
lc->max_row_seen_in_chunk = -1;
|
2000-10-18 18:42:54 +00:00
|
|
|
|
lc->error = error;
|
1999-11-22 23:04:52 +00:00
|
|
|
|
|
1999-10-27 18:55:00 +00:00
|
|
|
|
/* Create the main PNG context struct */
|
|
|
|
|
|
2000-06-09 19:41:29 +00:00
|
|
|
|
|
1999-10-27 18:55:00 +00:00
|
|
|
|
lc->png_read_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
|
|
|
|
|
lc, /* error/warning callback data */
|
|
|
|
|
png_error_callback,
|
|
|
|
|
png_warning_callback);
|
|
|
|
|
|
|
|
|
|
if (lc->png_read_ptr == NULL) {
|
|
|
|
|
g_free(lc);
|
2000-10-18 18:42:54 +00:00
|
|
|
|
/* error callback should have set the error */
|
1999-10-27 18:55:00 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2000-10-18 18:42:54 +00:00
|
|
|
|
|
2000-06-09 19:41:29 +00:00
|
|
|
|
if (setjmp (lc->png_read_ptr->jmpbuf)) {
|
|
|
|
|
if (lc->png_info_ptr)
|
|
|
|
|
png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL);
|
|
|
|
|
g_free(lc);
|
2000-10-18 18:42:54 +00:00
|
|
|
|
/* error callback should have set the error */
|
2000-06-09 19:41:29 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
1999-10-27 19:42:34 +00:00
|
|
|
|
/* Create the auxiliary context struct */
|
1999-10-27 18:55:00 +00:00
|
|
|
|
|
|
|
|
|
lc->png_info_ptr = png_create_info_struct(lc->png_read_ptr);
|
|
|
|
|
|
|
|
|
|
if (lc->png_info_ptr == NULL) {
|
|
|
|
|
png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL);
|
|
|
|
|
g_free(lc);
|
2000-10-18 18:42:54 +00:00
|
|
|
|
/* error callback should have set the error */
|
1999-10-27 18:55:00 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
png_set_progressive_read_fn(lc->png_read_ptr,
|
|
|
|
|
lc, /* callback data */
|
|
|
|
|
png_info_callback,
|
|
|
|
|
png_row_callback,
|
|
|
|
|
png_end_callback);
|
|
|
|
|
|
|
|
|
|
|
2000-10-18 18:42:54 +00:00
|
|
|
|
/* We don't want to keep modifying error after returning here,
|
|
|
|
|
* it may no longer be valid.
|
|
|
|
|
*/
|
|
|
|
|
lc->error = NULL;
|
|
|
|
|
|
1999-10-27 18:55:00 +00:00
|
|
|
|
return lc;
|
|
|
|
|
}
|
|
|
|
|
|
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__png_image_stop_load (gpointer context, GError **error)
|
1999-10-27 18:55:00 +00:00
|
|
|
|
{
|
|
|
|
|
LoadContext* lc = 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
|
|
|
|
g_return_val_if_fail(lc != NULL, TRUE);
|
1999-10-27 18:55:00 +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
|
|
|
|
/* FIXME this thing needs to report errors if
|
|
|
|
|
* we have unused image data
|
|
|
|
|
*/
|
|
|
|
|
|
2001-06-01 23:05:46 +00:00
|
|
|
|
if (lc->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 (lc->pixbuf);
|
1999-10-27 18:55:00 +00:00
|
|
|
|
|
|
|
|
|
png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL);
|
|
|
|
|
g_free(lc);
|
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 TRUE;
|
1999-10-27 18:55:00 +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
|
|
|
|
static gboolean
|
|
|
|
|
gdk_pixbuf__png_image_load_increment(gpointer context,
|
|
|
|
|
const guchar *buf, guint size,
|
2000-10-18 18:42:54 +00:00
|
|
|
|
GError **error)
|
1999-10-27 18:55:00 +00:00
|
|
|
|
{
|
|
|
|
|
LoadContext* lc = context;
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail(lc != NULL, FALSE);
|
|
|
|
|
|
1999-11-22 23:04:52 +00:00
|
|
|
|
/* reset */
|
|
|
|
|
lc->first_row_seen_in_chunk = -1;
|
|
|
|
|
lc->last_row_seen_in_chunk = -1;
|
|
|
|
|
lc->first_pass_seen_in_chunk = -1;
|
|
|
|
|
lc->last_pass_seen_in_chunk = -1;
|
|
|
|
|
lc->max_row_seen_in_chunk = -1;
|
2000-10-18 18:42:54 +00:00
|
|
|
|
lc->error = error;
|
1999-11-22 23:04:52 +00:00
|
|
|
|
|
1999-10-27 18:55:00 +00:00
|
|
|
|
/* Invokes our callbacks as needed */
|
2000-06-09 19:41:29 +00:00
|
|
|
|
if (setjmp (lc->png_read_ptr->jmpbuf)) {
|
2000-10-18 18:42:54 +00:00
|
|
|
|
lc->error = NULL;
|
2000-06-09 19:41:29 +00:00
|
|
|
|
return FALSE;
|
|
|
|
|
} else {
|
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
|
|
|
|
png_process_data(lc->png_read_ptr, lc->png_info_ptr,
|
|
|
|
|
(guchar*) buf, size);
|
2000-06-09 19:41:29 +00:00
|
|
|
|
}
|
1999-10-27 18:55:00 +00:00
|
|
|
|
|
2000-10-18 18:42:54 +00:00
|
|
|
|
if (lc->fatal_error_occurred) {
|
|
|
|
|
lc->error = NULL;
|
1999-10-27 18:55:00 +00:00
|
|
|
|
return FALSE;
|
2000-10-18 18:42:54 +00:00
|
|
|
|
} else {
|
1999-11-22 23:04:52 +00:00
|
|
|
|
if (lc->first_row_seen_in_chunk >= 0) {
|
|
|
|
|
/* We saw at least one row */
|
|
|
|
|
gint pass_diff = lc->last_pass_seen_in_chunk - lc->first_pass_seen_in_chunk;
|
|
|
|
|
|
|
|
|
|
g_assert(pass_diff >= 0);
|
|
|
|
|
|
|
|
|
|
if (pass_diff == 0) {
|
|
|
|
|
/* start and end row were in the same pass */
|
2000-01-05 23:06:13 +00:00
|
|
|
|
(lc->update_func)(lc->pixbuf, 0,
|
1999-11-22 23:04:52 +00:00
|
|
|
|
lc->first_row_seen_in_chunk,
|
2000-04-11 07:03:25 +00:00
|
|
|
|
lc->pixbuf->width,
|
1999-11-22 23:04:52 +00:00
|
|
|
|
(lc->last_row_seen_in_chunk -
|
2000-01-05 23:06:13 +00:00
|
|
|
|
lc->first_row_seen_in_chunk) + 1,
|
|
|
|
|
lc->notify_user_data);
|
1999-11-22 23:04:52 +00:00
|
|
|
|
} else if (pass_diff == 1) {
|
|
|
|
|
/* We have from the first row seen to
|
|
|
|
|
the end of the image (max row
|
|
|
|
|
seen), then from the top of the
|
|
|
|
|
image to the last row seen */
|
|
|
|
|
/* first row to end */
|
2000-01-05 23:06:13 +00:00
|
|
|
|
(lc->update_func)(lc->pixbuf, 0,
|
1999-11-22 23:04:52 +00:00
|
|
|
|
lc->first_row_seen_in_chunk,
|
2000-04-11 07:03:25 +00:00
|
|
|
|
lc->pixbuf->width,
|
1999-11-22 23:04:52 +00:00
|
|
|
|
(lc->max_row_seen_in_chunk -
|
2000-01-05 23:06:13 +00:00
|
|
|
|
lc->first_row_seen_in_chunk) + 1,
|
|
|
|
|
lc->notify_user_data);
|
1999-11-22 23:04:52 +00:00
|
|
|
|
/* top to last row */
|
2000-01-05 23:06:13 +00:00
|
|
|
|
(lc->update_func)(lc->pixbuf,
|
1999-11-22 23:04:52 +00:00
|
|
|
|
0, 0,
|
2000-04-11 07:03:25 +00:00
|
|
|
|
lc->pixbuf->width,
|
2000-01-05 23:06:13 +00:00
|
|
|
|
lc->last_row_seen_in_chunk + 1,
|
|
|
|
|
lc->notify_user_data);
|
1999-11-22 23:04:52 +00:00
|
|
|
|
} else {
|
|
|
|
|
/* We made at least one entire pass, so update the
|
|
|
|
|
whole image */
|
2000-01-05 23:06:13 +00:00
|
|
|
|
(lc->update_func)(lc->pixbuf,
|
1999-11-22 23:04:52 +00:00
|
|
|
|
0, 0,
|
2000-04-11 07:03:25 +00:00
|
|
|
|
lc->pixbuf->width,
|
2000-01-05 23:06:13 +00:00
|
|
|
|
lc->max_row_seen_in_chunk + 1,
|
|
|
|
|
lc->notify_user_data);
|
1999-11-22 23:04:52 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2000-10-18 18:42:54 +00:00
|
|
|
|
|
|
|
|
|
lc->error = NULL;
|
1999-11-22 23:04:52 +00:00
|
|
|
|
|
1999-10-27 18:55:00 +00:00
|
|
|
|
return TRUE;
|
1999-11-22 23:04:52 +00:00
|
|
|
|
}
|
1999-10-27 18:55:00 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Called at the start of the progressive load, once we have image info */
|
|
|
|
|
static void
|
|
|
|
|
png_info_callback (png_structp png_read_ptr,
|
|
|
|
|
png_infop png_info_ptr)
|
|
|
|
|
{
|
|
|
|
|
LoadContext* lc;
|
|
|
|
|
png_uint_32 width, height;
|
2001-10-05 18:51:47 +00:00
|
|
|
|
png_textp png_text_ptr;
|
|
|
|
|
int i, num_texts;
|
1999-10-27 19:42:34 +00:00
|
|
|
|
int color_type;
|
1999-10-27 18:55:00 +00:00
|
|
|
|
gboolean have_alpha = FALSE;
|
1999-10-27 19:42:34 +00:00
|
|
|
|
gboolean failed = FALSE;
|
1999-10-27 18:55:00 +00:00
|
|
|
|
|
|
|
|
|
lc = png_get_progressive_ptr(png_read_ptr);
|
|
|
|
|
|
|
|
|
|
if (lc->fatal_error_occurred)
|
|
|
|
|
return;
|
|
|
|
|
|
1999-10-27 19:42:34 +00:00
|
|
|
|
setup_png_transformations(lc->png_read_ptr,
|
|
|
|
|
lc->png_info_ptr,
|
|
|
|
|
&failed,
|
|
|
|
|
&width, &height, &color_type);
|
1999-10-27 18:55:00 +00:00
|
|
|
|
|
1999-10-27 19:42:34 +00:00
|
|
|
|
if (failed) {
|
|
|
|
|
lc->fatal_error_occurred = TRUE;
|
|
|
|
|
return;
|
1999-10-27 18:55:00 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If we have alpha, set a flag */
|
|
|
|
|
if (color_type & PNG_COLOR_MASK_ALPHA)
|
1999-10-27 19:42:34 +00:00
|
|
|
|
have_alpha = TRUE;
|
1999-10-27 18:55:00 +00:00
|
|
|
|
|
2000-04-11 07:03:25 +00:00
|
|
|
|
lc->pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, have_alpha, 8, width, height);
|
1999-10-27 18:55:00 +00:00
|
|
|
|
|
|
|
|
|
if (lc->pixbuf == NULL) {
|
|
|
|
|
/* Failed to allocate memory */
|
|
|
|
|
lc->fatal_error_occurred = TRUE;
|
2000-10-18 18:42:54 +00:00
|
|
|
|
if (lc->error && *lc->error == NULL) {
|
|
|
|
|
g_set_error (lc->error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
|
|
|
|
|
_("Insufficient memory to store a %ld by %ld image; try exiting some applications to reduce memory usage"),
|
|
|
|
|
width, height);
|
|
|
|
|
}
|
1999-10-27 18:55:00 +00:00
|
|
|
|
return;
|
|
|
|
|
}
|
2001-10-05 18:51:47 +00:00
|
|
|
|
|
|
|
|
|
/* Extract tEXt chunks and attach them as pixbuf options */
|
1999-10-27 18:55:00 +00:00
|
|
|
|
|
2001-10-05 18:51:47 +00:00
|
|
|
|
if (png_get_text (png_read_ptr, png_info_ptr, &png_text_ptr, &num_texts)) {
|
|
|
|
|
for (i = 0; i < num_texts; i++) {
|
|
|
|
|
gchar *key, *value;
|
|
|
|
|
|
|
|
|
|
if (png_text_to_pixbuf_option (png_text_ptr[i],
|
|
|
|
|
&key, &value)) {
|
|
|
|
|
gdk_pixbuf_set_option (lc->pixbuf, key, value);
|
|
|
|
|
g_free (key);
|
|
|
|
|
g_free (value);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-10-27 18:55:00 +00:00
|
|
|
|
/* Notify the client that we are ready to go */
|
|
|
|
|
|
1999-11-22 23:04:52 +00:00
|
|
|
|
if (lc->prepare_func)
|
2001-05-07 15:58:47 +00:00
|
|
|
|
(* lc->prepare_func) (lc->pixbuf, NULL, lc->notify_user_data);
|
1999-10-27 18:55:00 +00:00
|
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Called for each row; note that you will get duplicate row numbers
|
|
|
|
|
for interlaced PNGs */
|
|
|
|
|
static void
|
|
|
|
|
png_row_callback (png_structp png_read_ptr,
|
|
|
|
|
png_bytep new_row,
|
|
|
|
|
png_uint_32 row_num,
|
|
|
|
|
int pass_num)
|
|
|
|
|
{
|
|
|
|
|
LoadContext* lc;
|
|
|
|
|
guchar* old_row = NULL;
|
1999-11-22 23:04:52 +00:00
|
|
|
|
|
1999-10-27 18:55:00 +00:00
|
|
|
|
lc = png_get_progressive_ptr(png_read_ptr);
|
|
|
|
|
|
|
|
|
|
if (lc->fatal_error_occurred)
|
|
|
|
|
return;
|
1999-11-22 23:04:52 +00:00
|
|
|
|
|
2001-08-30 07:21:13 +00:00
|
|
|
|
if (row_num < 0 || row_num >= lc->pixbuf->height) {
|
|
|
|
|
lc->fatal_error_occurred = TRUE;
|
|
|
|
|
if (lc->error && *lc->error == NULL) {
|
|
|
|
|
g_set_error (lc->error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
|
_("Fatal error reading PNG image file"));
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
1999-11-22 23:04:52 +00:00
|
|
|
|
if (lc->first_row_seen_in_chunk < 0) {
|
|
|
|
|
lc->first_row_seen_in_chunk = row_num;
|
|
|
|
|
lc->first_pass_seen_in_chunk = pass_num;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
lc->max_row_seen_in_chunk = MAX(lc->max_row_seen_in_chunk, ((gint)row_num));
|
|
|
|
|
lc->last_row_seen_in_chunk = row_num;
|
|
|
|
|
lc->last_pass_seen_in_chunk = pass_num;
|
|
|
|
|
|
2000-04-11 07:03:25 +00:00
|
|
|
|
old_row = lc->pixbuf->pixels + (row_num * lc->pixbuf->rowstride);
|
1999-10-27 19:42:34 +00:00
|
|
|
|
|
1999-10-27 18:55:00 +00:00
|
|
|
|
png_progressive_combine_row(lc->png_read_ptr, old_row, new_row);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Called after reading the entire image */
|
|
|
|
|
static void
|
|
|
|
|
png_end_callback (png_structp png_read_ptr,
|
|
|
|
|
png_infop png_info_ptr)
|
1999-10-26 16:26:00 +00:00
|
|
|
|
{
|
1999-10-27 18:55:00 +00:00
|
|
|
|
LoadContext* lc;
|
|
|
|
|
|
|
|
|
|
lc = png_get_progressive_ptr(png_read_ptr);
|
|
|
|
|
|
|
|
|
|
if (lc->fatal_error_occurred)
|
|
|
|
|
return;
|
1999-10-26 16:26:00 +00:00
|
|
|
|
}
|
1999-10-27 18:55:00 +00:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
png_error_callback(png_structp png_read_ptr,
|
|
|
|
|
png_const_charp error_msg)
|
|
|
|
|
{
|
|
|
|
|
LoadContext* lc;
|
|
|
|
|
|
|
|
|
|
lc = png_get_error_ptr(png_read_ptr);
|
|
|
|
|
|
|
|
|
|
lc->fatal_error_occurred = TRUE;
|
2000-10-18 18:42:54 +00:00
|
|
|
|
|
|
|
|
|
/* I don't trust libpng to call the error callback only once,
|
|
|
|
|
* so check for already-set error
|
|
|
|
|
*/
|
|
|
|
|
if (lc->error && *lc->error == NULL) {
|
|
|
|
|
g_set_error (lc->error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
|
_("Fatal error reading PNG image file: %s"),
|
|
|
|
|
error_msg);
|
|
|
|
|
}
|
2001-06-01 23:05:46 +00:00
|
|
|
|
|
|
|
|
|
longjmp (png_read_ptr->jmpbuf, 1);
|
1999-10-27 18:55:00 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
png_warning_callback(png_structp png_read_ptr,
|
|
|
|
|
png_const_charp warning_msg)
|
|
|
|
|
{
|
|
|
|
|
LoadContext* lc;
|
|
|
|
|
|
|
|
|
|
lc = png_get_error_ptr(png_read_ptr);
|
2000-10-18 18:42:54 +00:00
|
|
|
|
|
|
|
|
|
/* Don't print anything; we should not be dumping junk to
|
|
|
|
|
* stderr, since that may be bad for some apps. If it's
|
|
|
|
|
* important enough to display, we need to add a GError
|
|
|
|
|
* **warning return location wherever we have an error return
|
|
|
|
|
* location.
|
|
|
|
|
*/
|
1999-10-27 18:55:00 +00:00
|
|
|
|
}
|
2000-06-09 19:41:29 +00:00
|
|
|
|
|
|
|
|
|
|
2000-10-06 18:19:18 +00:00
|
|
|
|
/* Save */
|
2000-10-18 18:42:54 +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
|
|
|
|
static gboolean
|
2000-10-06 18:19:18 +00:00
|
|
|
|
gdk_pixbuf__png_image_save (FILE *f,
|
|
|
|
|
GdkPixbuf *pixbuf,
|
|
|
|
|
gchar **keys,
|
|
|
|
|
gchar **values,
|
|
|
|
|
GError **error)
|
|
|
|
|
{
|
|
|
|
|
png_structp png_ptr;
|
|
|
|
|
png_infop info_ptr;
|
2001-10-05 18:51:47 +00:00
|
|
|
|
png_textp text_ptr = NULL;
|
2000-10-06 18:19:18 +00:00
|
|
|
|
guchar *ptr;
|
|
|
|
|
guchar *pixels;
|
2001-12-11 17:30:53 +00:00
|
|
|
|
int y;
|
|
|
|
|
int i;
|
2001-06-01 23:05:46 +00:00
|
|
|
|
png_bytep row_ptr;
|
2000-10-06 18:19:18 +00:00
|
|
|
|
png_color_8 sig_bit;
|
|
|
|
|
int w, h, rowstride;
|
|
|
|
|
int has_alpha;
|
|
|
|
|
int bpc;
|
2001-10-05 18:51:47 +00:00
|
|
|
|
int num_keys;
|
2002-01-20 04:52:47 +00:00
|
|
|
|
gboolean success = TRUE;
|
2001-10-05 18:51:47 +00:00
|
|
|
|
|
|
|
|
|
num_keys = 0;
|
2000-10-06 18:19:18 +00:00
|
|
|
|
|
|
|
|
|
if (keys && *keys) {
|
2001-10-05 18:51:47 +00:00
|
|
|
|
gchar **kiter;
|
|
|
|
|
gchar *key;
|
|
|
|
|
int len;
|
|
|
|
|
|
|
|
|
|
for (kiter = keys; *kiter; kiter++) {
|
|
|
|
|
if (strncmp (*kiter, "tEXt::", 6) != 0) {
|
|
|
|
|
g_warning ("Bad option name '%s' passed to PNG saver", *kiter);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
key = *kiter + 6;
|
|
|
|
|
len = strlen (key);
|
|
|
|
|
if (len <= 1 || len > 79) {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_BAD_OPTION,
|
|
|
|
|
_("Keys for PNG tEXt chunks must have at least 1 and at most 79 characters."));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
|
if ((guchar) key[i] > 127) {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_BAD_OPTION,
|
|
|
|
|
_("Keys for PNG tEXt chunks must be ASCII characters."));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
num_keys++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (num_keys > 0) {
|
|
|
|
|
text_ptr = g_new0 (png_text, num_keys);
|
|
|
|
|
for (i = 0; i < num_keys; i++) {
|
|
|
|
|
text_ptr[i].compression = PNG_TEXT_COMPRESSION_NONE;
|
|
|
|
|
text_ptr[i].key = keys[i] + 6;
|
|
|
|
|
text_ptr[i].text = g_convert (values[i], -1,
|
|
|
|
|
"ISO-8859-1", "UTF-8",
|
|
|
|
|
NULL, &text_ptr[i].text_length,
|
|
|
|
|
NULL);
|
|
|
|
|
if (!text_ptr[i].text) {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_BAD_OPTION,
|
|
|
|
|
_("Value for PNG tEXt chunk can not be converted to ISO-8859-1 encoding."));
|
|
|
|
|
num_keys = i;
|
|
|
|
|
for (i = 0; i < num_keys; i++)
|
|
|
|
|
g_free (text_ptr[i].text);
|
|
|
|
|
g_free (text_ptr);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
2000-10-06 18:19:18 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2001-10-05 18:51:47 +00:00
|
|
|
|
|
2000-10-06 18:19:18 +00:00
|
|
|
|
bpc = gdk_pixbuf_get_bits_per_sample (pixbuf);
|
|
|
|
|
w = gdk_pixbuf_get_width (pixbuf);
|
|
|
|
|
h = gdk_pixbuf_get_height (pixbuf);
|
|
|
|
|
rowstride = gdk_pixbuf_get_rowstride (pixbuf);
|
|
|
|
|
has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
|
|
|
|
|
pixels = gdk_pixbuf_get_pixels (pixbuf);
|
|
|
|
|
|
|
|
|
|
png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING,
|
2000-10-18 18:42:54 +00:00
|
|
|
|
error,
|
|
|
|
|
png_simple_error_callback,
|
|
|
|
|
png_simple_warning_callback);
|
2000-10-06 18:19:18 +00:00
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (png_ptr != NULL, FALSE);
|
|
|
|
|
|
|
|
|
|
info_ptr = png_create_info_struct (png_ptr);
|
|
|
|
|
if (info_ptr == NULL) {
|
2002-01-20 04:52:47 +00:00
|
|
|
|
success = FALSE;
|
|
|
|
|
goto cleanup;
|
2000-10-06 18:19:18 +00:00
|
|
|
|
}
|
|
|
|
|
if (setjmp (png_ptr->jmpbuf)) {
|
2002-01-20 04:52:47 +00:00
|
|
|
|
success = FALSE;
|
|
|
|
|
goto cleanup;
|
2000-10-06 18:19:18 +00:00
|
|
|
|
}
|
2001-10-05 18:51:47 +00:00
|
|
|
|
|
|
|
|
|
if (num_keys > 0) {
|
|
|
|
|
png_set_text (png_ptr, info_ptr, text_ptr, num_keys);
|
|
|
|
|
}
|
|
|
|
|
|
2000-10-06 18:19:18 +00:00
|
|
|
|
png_init_io (png_ptr, f);
|
2001-10-05 18:51:47 +00:00
|
|
|
|
|
2000-10-06 18:19:18 +00:00
|
|
|
|
if (has_alpha) {
|
|
|
|
|
png_set_IHDR (png_ptr, info_ptr, w, h, bpc,
|
2000-10-18 18:42:54 +00:00
|
|
|
|
PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE,
|
|
|
|
|
PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
|
2000-10-06 18:19:18 +00:00
|
|
|
|
} else {
|
|
|
|
|
png_set_IHDR (png_ptr, info_ptr, w, h, bpc,
|
2000-10-18 18:42:54 +00:00
|
|
|
|
PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
|
|
|
|
|
PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
|
2000-10-06 18:19:18 +00:00
|
|
|
|
}
|
|
|
|
|
sig_bit.red = bpc;
|
|
|
|
|
sig_bit.green = bpc;
|
|
|
|
|
sig_bit.blue = bpc;
|
|
|
|
|
sig_bit.alpha = bpc;
|
|
|
|
|
png_set_sBIT (png_ptr, info_ptr, &sig_bit);
|
|
|
|
|
png_write_info (png_ptr, info_ptr);
|
|
|
|
|
png_set_shift (png_ptr, &sig_bit);
|
|
|
|
|
png_set_packing (png_ptr);
|
|
|
|
|
|
|
|
|
|
ptr = pixels;
|
|
|
|
|
for (y = 0; y < h; y++) {
|
2001-12-11 17:30:53 +00:00
|
|
|
|
row_ptr = (png_bytep)ptr;
|
2000-10-06 18:19:18 +00:00
|
|
|
|
png_write_rows (png_ptr, &row_ptr, 1);
|
|
|
|
|
ptr += rowstride;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
png_write_end (png_ptr, info_ptr);
|
2002-01-20 04:52:47 +00:00
|
|
|
|
|
|
|
|
|
cleanup:
|
2000-10-06 18:19:18 +00:00
|
|
|
|
png_destroy_write_struct (&png_ptr, (png_infopp) NULL);
|
|
|
|
|
|
2001-10-05 18:51:47 +00:00
|
|
|
|
if (num_keys > 0) {
|
|
|
|
|
for (i = 0; i < num_keys; i++)
|
|
|
|
|
g_free (text_ptr[i].text);
|
|
|
|
|
g_free (text_ptr);
|
|
|
|
|
}
|
|
|
|
|
|
2002-01-20 04:52:47 +00:00
|
|
|
|
return success;
|
2000-10-06 18:19:18 +00:00
|
|
|
|
}
|
|
|
|
|
|
2000-06-09 19:41:29 +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
|
|
|
|
void
|
|
|
|
|
gdk_pixbuf__png_fill_vtable (GdkPixbufModule *module)
|
|
|
|
|
{
|
|
|
|
|
module->load = gdk_pixbuf__png_image_load;
|
|
|
|
|
module->begin_load = gdk_pixbuf__png_image_begin_load;
|
|
|
|
|
module->stop_load = gdk_pixbuf__png_image_stop_load;
|
|
|
|
|
module->load_increment = gdk_pixbuf__png_image_load_increment;
|
|
|
|
|
module->save = gdk_pixbuf__png_image_save;
|
|
|
|
|
}
|