2002-07-06 23:10:46 +00:00
|
|
|
|
/* -*- mode: C; c-file-style: "linux" -*- */
|
1999-10-20 21:20:49 +00:00
|
|
|
|
/* GdkPixbuf library - JPEG image loader
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 1999 Michael Zucchi
|
|
|
|
|
* Copyright (C) 1999 The Free Software Foundation
|
1999-10-29 22:37:27 +00:00
|
|
|
|
*
|
|
|
|
|
* Progressive loading code Copyright (C) 1999 Red Hat, Inc.
|
1999-10-20 21:20:49 +00:00
|
|
|
|
*
|
|
|
|
|
* Authors: Michael Zucchi <zucchi@zedzone.mmc.com.au>
|
|
|
|
|
* Federico Mena-Quintero <federico@gimp.org>
|
1999-10-29 22:37:27 +00:00
|
|
|
|
* Michael Fulbright <drmike@redhat.com>
|
1999-10-20 21:20:49 +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-10-20 21:20:49 +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-10-20 21:20:49 +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-06-29 11:13:31 +00:00
|
|
|
|
|
1999-10-29 22:37:27 +00:00
|
|
|
|
|
2008-06-22 14:28:52 +00:00
|
|
|
|
#include "config.h"
|
1999-06-29 11:13:31 +00:00
|
|
|
|
#include <stdio.h>
|
1999-11-03 17:17:32 +00:00
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
1999-06-29 11:13:31 +00:00
|
|
|
|
#include <setjmp.h>
|
|
|
|
|
#include <jpeglib.h>
|
2005-08-15 13:50:27 +00:00
|
|
|
|
#include <jerror.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
|
|
|
|
|
2000-07-22 23:50:19 +00:00
|
|
|
|
#ifndef HAVE_SIGSETJMP
|
|
|
|
|
#define sigjmp_buf jmp_buf
|
|
|
|
|
#define sigsetjmp(jb, x) setjmp(jb)
|
|
|
|
|
#define siglongjmp longjmp
|
|
|
|
|
#endif
|
1999-10-20 21:20:49 +00:00
|
|
|
|
|
1999-06-29 11:13:31 +00:00
|
|
|
|
|
1999-10-29 22:37:27 +00:00
|
|
|
|
/* we are a "source manager" as far as libjpeg is concerned */
|
2002-04-11 21:18:40 +00:00
|
|
|
|
#define JPEG_PROG_BUF_SIZE 65536
|
1999-11-03 17:17:32 +00:00
|
|
|
|
|
1999-10-29 22:37:27 +00:00
|
|
|
|
typedef struct {
|
|
|
|
|
struct jpeg_source_mgr pub; /* public fields */
|
|
|
|
|
|
1999-11-03 17:17:32 +00:00
|
|
|
|
JOCTET buffer[JPEG_PROG_BUF_SIZE]; /* start of buffer */
|
1999-10-29 22:37:27 +00:00
|
|
|
|
long skip_next; /* number of bytes to skip next read */
|
2002-07-06 23:10:46 +00:00
|
|
|
|
|
1999-10-29 22:37:27 +00:00
|
|
|
|
} my_source_mgr;
|
|
|
|
|
|
|
|
|
|
typedef my_source_mgr * my_src_ptr;
|
|
|
|
|
|
1999-06-29 11:13:31 +00:00
|
|
|
|
/* error handler data */
|
1999-10-20 21:20:49 +00:00
|
|
|
|
struct error_handler_data {
|
1999-06-29 11:13:31 +00:00
|
|
|
|
struct jpeg_error_mgr pub;
|
1999-10-18 19:29:45 +00:00
|
|
|
|
sigjmp_buf setjmp_buffer;
|
2000-10-18 18:42:54 +00:00
|
|
|
|
GError **error;
|
1999-06-29 11:13:31 +00:00
|
|
|
|
};
|
|
|
|
|
|
1999-10-29 22:37:27 +00:00
|
|
|
|
/* progressive loader context */
|
|
|
|
|
typedef struct {
|
2002-10-03 22:39:51 +00:00
|
|
|
|
GdkPixbufModuleSizeFunc size_func;
|
|
|
|
|
GdkPixbufModuleUpdatedFunc updated_func;
|
|
|
|
|
GdkPixbufModulePreparedFunc prepared_func;
|
|
|
|
|
gpointer user_data;
|
1999-11-04 20:02:37 +00:00
|
|
|
|
|
1999-10-29 22:37:27 +00:00
|
|
|
|
GdkPixbuf *pixbuf;
|
|
|
|
|
guchar *dptr; /* current position in pixbuf */
|
|
|
|
|
|
|
|
|
|
gboolean did_prescan; /* are we in image data yet? */
|
|
|
|
|
gboolean got_header; /* have we loaded jpeg header? */
|
|
|
|
|
gboolean src_initialized;/* TRUE when jpeg lib initialized */
|
2002-04-11 21:18:40 +00:00
|
|
|
|
gboolean in_output; /* did we get suspended in an output pass? */
|
1999-10-29 22:37:27 +00:00
|
|
|
|
struct jpeg_decompress_struct cinfo;
|
|
|
|
|
struct error_handler_data jerr;
|
|
|
|
|
} JpegProgContext;
|
|
|
|
|
|
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__jpeg_image_load (FILE *f, GError **error);
|
2002-10-03 22:39:51 +00:00
|
|
|
|
static gpointer gdk_pixbuf__jpeg_image_begin_load (GdkPixbufModuleSizeFunc func0,
|
|
|
|
|
GdkPixbufModulePreparedFunc func1,
|
|
|
|
|
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__jpeg_image_stop_load (gpointer context, GError **error);
|
|
|
|
|
static gboolean gdk_pixbuf__jpeg_image_load_increment(gpointer context,
|
|
|
|
|
const guchar *buf, guint size,
|
|
|
|
|
GError **error);
|
1999-10-29 22:37:27 +00:00
|
|
|
|
|
|
|
|
|
|
1999-06-29 11:13:31 +00:00
|
|
|
|
static void
|
1999-10-20 21:20:49 +00:00
|
|
|
|
fatal_error_handler (j_common_ptr cinfo)
|
1999-06-29 11:13:31 +00:00
|
|
|
|
{
|
1999-10-20 21:20:49 +00:00
|
|
|
|
struct error_handler_data *errmgr;
|
2000-10-18 18:42:54 +00:00
|
|
|
|
char buffer[JMSG_LENGTH_MAX];
|
|
|
|
|
|
1999-10-20 21:20:49 +00:00
|
|
|
|
errmgr = (struct error_handler_data *) cinfo->err;
|
2000-10-18 18:42:54 +00:00
|
|
|
|
|
|
|
|
|
/* Create the message */
|
|
|
|
|
(* cinfo->err->format_message) (cinfo, buffer);
|
|
|
|
|
|
|
|
|
|
/* broken check for *error == NULL for robustness against
|
|
|
|
|
* crappy JPEG library
|
|
|
|
|
*/
|
|
|
|
|
if (errmgr->error && *errmgr->error == NULL) {
|
|
|
|
|
g_set_error (errmgr->error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
2005-08-15 13:50:27 +00:00
|
|
|
|
cinfo->err->msg_code == JERR_OUT_OF_MEMORY
|
|
|
|
|
? GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY
|
|
|
|
|
: GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
2000-10-18 18:42:54 +00:00
|
|
|
|
_("Error interpreting JPEG image file (%s)"),
|
|
|
|
|
buffer);
|
|
|
|
|
}
|
|
|
|
|
|
1999-10-20 21:20:49 +00:00
|
|
|
|
siglongjmp (errmgr->setjmp_buffer, 1);
|
2000-05-31 02:07:07 +00:00
|
|
|
|
|
2000-10-18 18:42:54 +00:00
|
|
|
|
g_assert_not_reached ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
output_message_handler (j_common_ptr cinfo)
|
|
|
|
|
{
|
|
|
|
|
/* This method keeps libjpeg from dumping crap to stderr */
|
|
|
|
|
|
|
|
|
|
/* do nothing */
|
1999-06-29 11:13:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
1999-10-29 22:37:27 +00:00
|
|
|
|
/* explode gray image data from jpeg library into rgb components in pixbuf */
|
|
|
|
|
static void
|
|
|
|
|
explode_gray_into_buf (struct jpeg_decompress_struct *cinfo,
|
|
|
|
|
guchar **lines)
|
|
|
|
|
{
|
|
|
|
|
gint i, j;
|
|
|
|
|
guint w;
|
|
|
|
|
|
|
|
|
|
g_return_if_fail (cinfo != NULL);
|
|
|
|
|
g_return_if_fail (cinfo->output_components == 1);
|
2002-07-01 22:20:20 +00:00
|
|
|
|
g_return_if_fail (cinfo->out_color_space == JCS_GRAYSCALE);
|
1999-10-29 22:37:27 +00:00
|
|
|
|
|
|
|
|
|
/* Expand grey->colour. Expand from the end of the
|
|
|
|
|
* memory down, so we can use the same buffer.
|
|
|
|
|
*/
|
2002-07-06 23:10:46 +00:00
|
|
|
|
w = cinfo->output_width;
|
1999-10-29 22:37:27 +00:00
|
|
|
|
for (i = cinfo->rec_outbuf_height - 1; i >= 0; i--) {
|
|
|
|
|
guchar *from, *to;
|
|
|
|
|
|
|
|
|
|
from = lines[i] + w - 1;
|
|
|
|
|
to = lines[i] + (w - 1) * 3;
|
|
|
|
|
for (j = w - 1; j >= 0; j--) {
|
|
|
|
|
to[0] = from[0];
|
1999-10-29 23:07:23 +00:00
|
|
|
|
to[1] = from[0];
|
|
|
|
|
to[2] = from[0];
|
1999-10-29 22:37:27 +00:00
|
|
|
|
to -= 3;
|
|
|
|
|
from--;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2002-07-01 22:20:20 +00:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
convert_cmyk_to_rgb (struct jpeg_decompress_struct *cinfo,
|
|
|
|
|
guchar **lines)
|
|
|
|
|
{
|
|
|
|
|
gint i, j;
|
|
|
|
|
|
|
|
|
|
g_return_if_fail (cinfo != NULL);
|
|
|
|
|
g_return_if_fail (cinfo->output_components == 4);
|
|
|
|
|
g_return_if_fail (cinfo->out_color_space == JCS_CMYK);
|
|
|
|
|
|
|
|
|
|
for (i = cinfo->rec_outbuf_height - 1; i >= 0; i--) {
|
|
|
|
|
guchar *p;
|
|
|
|
|
|
|
|
|
|
p = lines[i];
|
2002-07-06 23:10:46 +00:00
|
|
|
|
for (j = 0; j < cinfo->output_width; j++) {
|
2002-07-01 22:20:20 +00:00
|
|
|
|
int c, m, y, k;
|
|
|
|
|
c = p[0];
|
|
|
|
|
m = p[1];
|
|
|
|
|
y = p[2];
|
|
|
|
|
k = p[3];
|
|
|
|
|
if (cinfo->saw_Adobe_marker) {
|
|
|
|
|
p[0] = k*c / 255;
|
|
|
|
|
p[1] = k*m / 255;
|
|
|
|
|
p[2] = k*y / 255;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
p[0] = (255 - k)*(255 - c) / 255;
|
|
|
|
|
p[1] = (255 - k)*(255 - m) / 255;
|
|
|
|
|
p[2] = (255 - k)*(255 - y) / 255;
|
|
|
|
|
}
|
|
|
|
|
p[3] = 255;
|
|
|
|
|
p += 4;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2002-04-11 21:18:40 +00:00
|
|
|
|
typedef struct {
|
|
|
|
|
struct jpeg_source_mgr pub; /* public fields */
|
|
|
|
|
|
|
|
|
|
FILE * infile; /* source stream */
|
|
|
|
|
JOCTET * buffer; /* start of buffer */
|
|
|
|
|
boolean start_of_file; /* have we gotten any data yet? */
|
|
|
|
|
} stdio_source_mgr;
|
|
|
|
|
|
|
|
|
|
typedef stdio_source_mgr * stdio_src_ptr;
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
stdio_init_source (j_decompress_ptr cinfo)
|
|
|
|
|
{
|
|
|
|
|
stdio_src_ptr src = (stdio_src_ptr)cinfo->src;
|
|
|
|
|
src->start_of_file = FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static boolean
|
|
|
|
|
stdio_fill_input_buffer (j_decompress_ptr cinfo)
|
|
|
|
|
{
|
|
|
|
|
stdio_src_ptr src = (stdio_src_ptr) cinfo->src;
|
|
|
|
|
size_t nbytes;
|
|
|
|
|
|
|
|
|
|
nbytes = fread (src->buffer, 1, JPEG_PROG_BUF_SIZE, src->infile);
|
|
|
|
|
|
|
|
|
|
if (nbytes <= 0) {
|
|
|
|
|
#if 0
|
|
|
|
|
if (src->start_of_file) /* Treat empty input file as fatal error */
|
|
|
|
|
ERREXIT(cinfo, JERR_INPUT_EMPTY);
|
|
|
|
|
WARNMS(cinfo, JWRN_JPEG_EOF);
|
|
|
|
|
#endif
|
|
|
|
|
/* Insert a fake EOI marker */
|
|
|
|
|
src->buffer[0] = (JOCTET) 0xFF;
|
|
|
|
|
src->buffer[1] = (JOCTET) JPEG_EOI;
|
|
|
|
|
nbytes = 2;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
src->pub.next_input_byte = src->buffer;
|
|
|
|
|
src->pub.bytes_in_buffer = nbytes;
|
|
|
|
|
src->start_of_file = FALSE;
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
stdio_skip_input_data (j_decompress_ptr cinfo, long num_bytes)
|
|
|
|
|
{
|
|
|
|
|
stdio_src_ptr src = (stdio_src_ptr) cinfo->src;
|
|
|
|
|
|
|
|
|
|
if (num_bytes > 0) {
|
|
|
|
|
while (num_bytes > (long) src->pub.bytes_in_buffer) {
|
|
|
|
|
num_bytes -= (long) src->pub.bytes_in_buffer;
|
|
|
|
|
(void)stdio_fill_input_buffer(cinfo);
|
|
|
|
|
}
|
|
|
|
|
src->pub.next_input_byte += (size_t) num_bytes;
|
|
|
|
|
src->pub.bytes_in_buffer -= (size_t) num_bytes;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
stdio_term_source (j_decompress_ptr cinfo)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2002-07-01 22:20:20 +00:00
|
|
|
|
static gchar *
|
|
|
|
|
colorspace_name (const J_COLOR_SPACE jpeg_color_space)
|
|
|
|
|
{
|
|
|
|
|
switch (jpeg_color_space) {
|
|
|
|
|
case JCS_UNKNOWN: return "UNKNOWN";
|
|
|
|
|
case JCS_GRAYSCALE: return "GRAYSCALE";
|
|
|
|
|
case JCS_RGB: return "RGB";
|
|
|
|
|
case JCS_YCbCr: return "YCbCr";
|
|
|
|
|
case JCS_CMYK: return "CMYK";
|
|
|
|
|
case JCS_YCCK: return "YCCK";
|
|
|
|
|
default: return "invalid";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2007-05-18 14:19:47 +00:00
|
|
|
|
|
|
|
|
|
const char leth[] = {0x49, 0x49, 0x2a, 0x00}; // Little endian TIFF header
|
|
|
|
|
const char beth[] = {0x4d, 0x4d, 0x00, 0x2a}; // Big endian TIFF header
|
|
|
|
|
const char types[] = {0x00, 0x01, 0x01, 0x02, 0x04, 0x08, 0x00,
|
|
|
|
|
0x08, 0x00, 0x04, 0x08}; // size in bytes for EXIF types
|
|
|
|
|
|
|
|
|
|
#define DE_ENDIAN16(val) endian == G_BIG_ENDIAN ? GUINT16_FROM_BE(val) : GUINT16_FROM_LE(val)
|
|
|
|
|
#define DE_ENDIAN32(val) endian == G_BIG_ENDIAN ? GUINT32_FROM_BE(val) : GUINT32_FROM_LE(val)
|
|
|
|
|
|
|
|
|
|
#define ENDIAN16_IT(val) endian == G_BIG_ENDIAN ? GUINT16_TO_BE(val) : GUINT16_TO_LE(val)
|
|
|
|
|
#define ENDIAN32_IT(val) endian == G_BIG_ENDIAN ? GUINT32_TO_BE(val) : GUINT32_TO_LE(val)
|
|
|
|
|
|
|
|
|
|
#define EXIF_JPEG_MARKER JPEG_APP0+1
|
|
|
|
|
#define EXIF_IDENT_STRING "Exif\000\000"
|
|
|
|
|
|
2007-11-11 03:24:06 +00:00
|
|
|
|
static unsigned short de_get16(void *ptr, guint endian)
|
|
|
|
|
{
|
|
|
|
|
unsigned short val;
|
|
|
|
|
|
|
|
|
|
memcpy(&val, ptr, sizeof(val));
|
|
|
|
|
val = DE_ENDIAN16(val);
|
|
|
|
|
|
|
|
|
|
return val;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static unsigned int de_get32(void *ptr, guint endian)
|
|
|
|
|
{
|
|
|
|
|
unsigned int val;
|
|
|
|
|
|
|
|
|
|
memcpy(&val, ptr, sizeof(val));
|
|
|
|
|
val = DE_ENDIAN32(val);
|
|
|
|
|
|
|
|
|
|
return val;
|
|
|
|
|
}
|
|
|
|
|
|
2007-05-18 14:19:47 +00:00
|
|
|
|
static gint
|
|
|
|
|
get_orientation (j_decompress_ptr cinfo)
|
|
|
|
|
{
|
|
|
|
|
/* This function looks through the meta data in the libjpeg decompress structure to
|
|
|
|
|
determine if an EXIF Orientation tag is present and if so return its value (1-8).
|
|
|
|
|
If no EXIF Orientation tag is found 0 (zero) is returned. */
|
|
|
|
|
|
|
|
|
|
guint i; /* index into working buffer */
|
|
|
|
|
guint orient_tag_id; /* endianed version of orientation tag ID */
|
|
|
|
|
guint ret; /* Return value */
|
|
|
|
|
guint offset; /* de-endianed offset in various situations */
|
|
|
|
|
guint tags; /* number of tags in current ifd */
|
|
|
|
|
guint type; /* de-endianed type of tag used as index into types[] */
|
|
|
|
|
guint count; /* de-endianed count of elements in a tag */
|
|
|
|
|
guint tiff = 0; /* offset to active tiff header */
|
|
|
|
|
guint endian = 0; /* detected endian of data */
|
|
|
|
|
|
|
|
|
|
jpeg_saved_marker_ptr exif_marker; /* Location of the Exif APP1 marker */
|
|
|
|
|
jpeg_saved_marker_ptr cmarker; /* Location to check for Exif APP1 marker */
|
|
|
|
|
|
|
|
|
|
/* check for Exif marker (also called the APP1 marker) */
|
|
|
|
|
exif_marker = NULL;
|
|
|
|
|
cmarker = cinfo->marker_list;
|
|
|
|
|
while (cmarker) {
|
|
|
|
|
if (cmarker->marker == EXIF_JPEG_MARKER) {
|
|
|
|
|
/* The Exif APP1 marker should contain a unique
|
|
|
|
|
identification string ("Exif\0\0"). Check for it. */
|
|
|
|
|
if (!memcmp (cmarker->data, EXIF_IDENT_STRING, 6)) {
|
|
|
|
|
exif_marker = cmarker;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
cmarker = cmarker->next;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Did we find the Exif APP1 marker? */
|
|
|
|
|
if (exif_marker == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* Do we have enough data? */
|
|
|
|
|
if (exif_marker->data_length < 32)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* Check for TIFF header and catch endianess */
|
|
|
|
|
i = 0;
|
|
|
|
|
|
|
|
|
|
/* Just skip data until TIFF header - it should be within 16 bytes from marker start.
|
|
|
|
|
Normal structure relative to APP1 marker -
|
|
|
|
|
0x0000: APP1 marker entry = 2 bytes
|
|
|
|
|
0x0002: APP1 length entry = 2 bytes
|
|
|
|
|
0x0004: Exif Identifier entry = 6 bytes
|
|
|
|
|
0x000A: Start of TIFF header (Byte order entry) - 4 bytes
|
|
|
|
|
- This is what we look for, to determine endianess.
|
|
|
|
|
0x000E: 0th IFD offset pointer - 4 bytes
|
|
|
|
|
|
|
|
|
|
exif_marker->data points to the first data after the APP1 marker
|
|
|
|
|
and length entries, which is the exif identification string.
|
|
|
|
|
The TIFF header should thus normally be found at i=6, below,
|
|
|
|
|
and the pointer to IFD0 will be at 6+4 = 10.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
while (i < 16) {
|
|
|
|
|
|
|
|
|
|
/* Little endian TIFF header */
|
|
|
|
|
if (memcmp (&exif_marker->data[i], leth, 4) == 0){
|
|
|
|
|
endian = G_LITTLE_ENDIAN;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Big endian TIFF header */
|
|
|
|
|
else if (memcmp (&exif_marker->data[i], beth, 4) == 0){
|
|
|
|
|
endian = G_BIG_ENDIAN;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Keep looking through buffer */
|
|
|
|
|
else {
|
|
|
|
|
i++;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
/* We have found either big or little endian TIFF header */
|
|
|
|
|
tiff = i;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* So did we find a TIFF header or did we just hit end of buffer? */
|
|
|
|
|
if (tiff == 0)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* Endian the orientation tag ID, to locate it more easily */
|
|
|
|
|
orient_tag_id = ENDIAN16_IT(0x112);
|
|
|
|
|
|
|
|
|
|
/* Read out the offset pointer to IFD0 */
|
2007-11-11 03:24:06 +00:00
|
|
|
|
offset = de_get32(&exif_marker->data[i] + 4, endian);
|
2007-05-18 14:19:47 +00:00
|
|
|
|
i = i + offset;
|
|
|
|
|
|
|
|
|
|
/* Check that we still are within the buffer and can read the tag count */
|
|
|
|
|
if ((i + 2) > exif_marker->data_length)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* Find out how many tags we have in IFD0. As per the TIFF spec, the first
|
|
|
|
|
two bytes of the IFD contain a count of the number of tags. */
|
2007-11-11 03:24:06 +00:00
|
|
|
|
tags = de_get16(&exif_marker->data[i], endian);
|
2007-05-18 14:19:47 +00:00
|
|
|
|
i = i + 2;
|
|
|
|
|
|
|
|
|
|
/* Check that we still have enough data for all tags to check. The tags
|
|
|
|
|
are listed in consecutive 12-byte blocks. The tag ID, type, size, and
|
|
|
|
|
a pointer to the actual value, are packed into these 12 byte entries. */
|
|
|
|
|
if ((i + tags * 12) > exif_marker->data_length)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* Check through IFD0 for tags of interest */
|
|
|
|
|
while (tags--){
|
2007-11-11 03:24:06 +00:00
|
|
|
|
type = de_get16(&exif_marker->data[i + 2], endian);
|
|
|
|
|
count = de_get32(&exif_marker->data[i + 4], endian);
|
2007-05-18 14:19:47 +00:00
|
|
|
|
|
|
|
|
|
/* Is this the orientation tag? */
|
|
|
|
|
if (memcmp (&exif_marker->data[i], (char *) &orient_tag_id, 2) == 0){
|
|
|
|
|
|
|
|
|
|
/* Check that type and count fields are OK. The orientation field
|
|
|
|
|
will consist of a single (count=1) 2-byte integer (type=3). */
|
|
|
|
|
if (type != 3 || count != 1) return 0;
|
|
|
|
|
|
|
|
|
|
/* Return the orientation value. Within the 12-byte block, the
|
|
|
|
|
pointer to the actual data is at offset 8. */
|
2007-11-11 03:24:06 +00:00
|
|
|
|
ret = de_get16(&exif_marker->data[i + 8], endian);
|
2007-05-18 14:19:47 +00:00
|
|
|
|
return ret <= 8 ? ret : 0;
|
|
|
|
|
}
|
|
|
|
|
/* move the pointer to the next 12-byte tag field. */
|
|
|
|
|
i = i + 12;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0; /* No EXIF Orientation tag found */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1999-10-20 21:20:49 +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__jpeg_image_load (FILE *f, GError **error)
|
1999-06-29 11:13:31 +00:00
|
|
|
|
{
|
2007-05-18 14:19:47 +00:00
|
|
|
|
gint i;
|
|
|
|
|
int is_otag;
|
|
|
|
|
char otag_str[5];
|
2002-04-11 21:18:40 +00:00
|
|
|
|
GdkPixbuf * volatile pixbuf = NULL;
|
1999-10-26 20:43:39 +00:00
|
|
|
|
guchar *dptr;
|
1999-11-04 20:02:37 +00:00
|
|
|
|
guchar *lines[4]; /* Used to expand rows, via rec_outbuf_height,
|
|
|
|
|
* from the header file:
|
|
|
|
|
* " Usually rec_outbuf_height will be 1 or 2,
|
|
|
|
|
* at most 4."
|
1999-10-20 21:20:49 +00:00
|
|
|
|
*/
|
|
|
|
|
guchar **lptr;
|
1999-06-29 11:13:31 +00:00
|
|
|
|
struct jpeg_decompress_struct cinfo;
|
1999-10-20 21:20:49 +00:00
|
|
|
|
struct error_handler_data jerr;
|
2002-04-11 21:18:40 +00:00
|
|
|
|
stdio_src_ptr src;
|
1999-06-29 11:13:31 +00:00
|
|
|
|
|
|
|
|
|
/* setup error handler */
|
1999-10-20 21:20:49 +00:00
|
|
|
|
cinfo.err = jpeg_std_error (&jerr.pub);
|
|
|
|
|
jerr.pub.error_exit = fatal_error_handler;
|
2000-10-18 18:42:54 +00:00
|
|
|
|
jerr.pub.output_message = output_message_handler;
|
1999-06-29 11:13:31 +00:00
|
|
|
|
|
2000-10-18 18:42:54 +00:00
|
|
|
|
jerr.error = error;
|
|
|
|
|
|
1999-10-20 21:20:49 +00:00
|
|
|
|
if (sigsetjmp (jerr.setjmp_buffer, 1)) {
|
1999-06-29 11:13:31 +00:00
|
|
|
|
/* Whoops there was a jpeg error */
|
2002-04-11 21:18:40 +00:00
|
|
|
|
if (pixbuf)
|
|
|
|
|
g_object_unref (pixbuf);
|
1999-10-20 21:20:49 +00:00
|
|
|
|
|
|
|
|
|
jpeg_destroy_decompress (&cinfo);
|
2007-02-07 14:47:36 +00:00
|
|
|
|
|
|
|
|
|
/* error should have been set by fatal_error_handler () */
|
1999-06-29 11:13:31 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* load header, setup */
|
1999-10-20 21:20:49 +00:00
|
|
|
|
jpeg_create_decompress (&cinfo);
|
2002-04-11 21:18:40 +00:00
|
|
|
|
|
|
|
|
|
cinfo.src = (struct jpeg_source_mgr *)
|
|
|
|
|
(*cinfo.mem->alloc_small) ((j_common_ptr) &cinfo, JPOOL_PERMANENT,
|
|
|
|
|
sizeof (stdio_source_mgr));
|
|
|
|
|
src = (stdio_src_ptr) cinfo.src;
|
|
|
|
|
src->buffer = (JOCTET *)
|
|
|
|
|
(*cinfo.mem->alloc_small) ((j_common_ptr) &cinfo, JPOOL_PERMANENT,
|
|
|
|
|
JPEG_PROG_BUF_SIZE * sizeof (JOCTET));
|
|
|
|
|
|
|
|
|
|
src->pub.init_source = stdio_init_source;
|
|
|
|
|
src->pub.fill_input_buffer = stdio_fill_input_buffer;
|
|
|
|
|
src->pub.skip_input_data = stdio_skip_input_data;
|
|
|
|
|
src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */
|
|
|
|
|
src->pub.term_source = stdio_term_source;
|
|
|
|
|
src->infile = f;
|
|
|
|
|
src->pub.bytes_in_buffer = 0; /* forces fill_input_buffer on first read */
|
|
|
|
|
src->pub.next_input_byte = NULL; /* until buffer loaded */
|
|
|
|
|
|
2007-05-18 14:19:47 +00:00
|
|
|
|
jpeg_save_markers (&cinfo, EXIF_JPEG_MARKER, 0xffff);
|
1999-10-20 21:20:49 +00:00
|
|
|
|
jpeg_read_header (&cinfo, TRUE);
|
2007-05-18 14:19:47 +00:00
|
|
|
|
|
|
|
|
|
/* check for orientation tag */
|
|
|
|
|
is_otag = get_orientation (&cinfo);
|
|
|
|
|
|
1999-10-20 21:20:49 +00:00
|
|
|
|
jpeg_start_decompress (&cinfo);
|
1999-06-29 11:13:31 +00:00
|
|
|
|
cinfo.do_fancy_upsampling = FALSE;
|
|
|
|
|
cinfo.do_block_smoothing = FALSE;
|
1999-07-12 04:55:16 +00:00
|
|
|
|
|
2002-07-01 22:20:20 +00:00
|
|
|
|
pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
|
|
|
|
|
cinfo.out_color_components == 4 ? TRUE : FALSE,
|
|
|
|
|
8, cinfo.output_width, cinfo.output_height);
|
|
|
|
|
|
2002-04-11 21:18:40 +00:00
|
|
|
|
if (!pixbuf) {
|
1999-10-20 21:20:49 +00:00
|
|
|
|
jpeg_destroy_decompress (&cinfo);
|
2000-10-18 18:42:54 +00:00
|
|
|
|
|
|
|
|
|
/* broken check for *error == NULL for robustness against
|
|
|
|
|
* crappy JPEG library
|
|
|
|
|
*/
|
|
|
|
|
if (error && *error == NULL) {
|
2008-06-19 12:47:48 +00:00
|
|
|
|
g_set_error_literal (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
|
|
|
|
|
_("Insufficient memory to load image, try exiting some applications to free memory"));
|
2000-10-18 18:42:54 +00:00
|
|
|
|
}
|
|
|
|
|
|
1999-06-29 11:13:31 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
1999-10-20 21:20:49 +00:00
|
|
|
|
|
2007-05-18 14:19:47 +00:00
|
|
|
|
/* if orientation tag was found set an option to remember its value */
|
|
|
|
|
if (is_otag) {
|
2007-06-15 15:18:48 +00:00
|
|
|
|
g_snprintf (otag_str, sizeof (otag_str), "%d", is_otag);
|
2007-05-18 14:19:47 +00:00
|
|
|
|
gdk_pixbuf_set_option (pixbuf, "orientation", otag_str);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2002-04-11 21:18:40 +00:00
|
|
|
|
dptr = pixbuf->pixels;
|
1999-06-29 11:13:31 +00:00
|
|
|
|
|
|
|
|
|
/* decompress all the lines, a few at a time */
|
|
|
|
|
while (cinfo.output_scanline < cinfo.output_height) {
|
|
|
|
|
lptr = lines;
|
1999-10-20 21:20:49 +00:00
|
|
|
|
for (i = 0; i < cinfo.rec_outbuf_height; i++) {
|
|
|
|
|
*lptr++ = dptr;
|
2002-04-11 21:18:40 +00:00
|
|
|
|
dptr += pixbuf->rowstride;
|
1999-06-29 11:13:31 +00:00
|
|
|
|
}
|
1999-10-20 21:20:49 +00:00
|
|
|
|
|
|
|
|
|
jpeg_read_scanlines (&cinfo, lines, cinfo.rec_outbuf_height);
|
1999-10-29 22:37:27 +00:00
|
|
|
|
|
2002-07-01 22:20:20 +00:00
|
|
|
|
switch (cinfo.out_color_space) {
|
|
|
|
|
case JCS_GRAYSCALE:
|
|
|
|
|
explode_gray_into_buf (&cinfo, lines);
|
|
|
|
|
break;
|
|
|
|
|
case JCS_RGB:
|
|
|
|
|
/* do nothing */
|
|
|
|
|
break;
|
|
|
|
|
case JCS_CMYK:
|
|
|
|
|
convert_cmyk_to_rgb (&cinfo, lines);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
2002-09-12 20:05:28 +00:00
|
|
|
|
g_object_unref (pixbuf);
|
2002-07-01 22:20:20 +00:00
|
|
|
|
if (error && *error == NULL) {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_UNKNOWN_TYPE,
|
|
|
|
|
_("Unsupported JPEG color space (%s)"),
|
|
|
|
|
colorspace_name (cinfo.out_color_space));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jpeg_destroy_decompress (&cinfo);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
1999-06-29 11:13:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
1999-10-20 21:20:49 +00:00
|
|
|
|
jpeg_finish_decompress (&cinfo);
|
|
|
|
|
jpeg_destroy_decompress (&cinfo);
|
|
|
|
|
|
2002-04-11 21:18:40 +00:00
|
|
|
|
return pixbuf;
|
1999-06-29 11:13:31 +00:00
|
|
|
|
}
|
1999-10-29 22:37:27 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**** Progressive image loading handling *****/
|
|
|
|
|
|
|
|
|
|
/* these routines required because we are acting as a source manager for */
|
|
|
|
|
/* libjpeg. */
|
|
|
|
|
static void
|
|
|
|
|
init_source (j_decompress_ptr cinfo)
|
|
|
|
|
{
|
|
|
|
|
my_src_ptr src = (my_src_ptr) cinfo->src;
|
|
|
|
|
|
|
|
|
|
src->skip_next = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
term_source (j_decompress_ptr cinfo)
|
|
|
|
|
{
|
|
|
|
|
/* XXXX - probably should scream something has happened */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* for progressive loading (called "I/O Suspension" by libjpeg docs) */
|
|
|
|
|
/* we do nothing except return "FALSE" */
|
|
|
|
|
static boolean
|
|
|
|
|
fill_input_buffer (j_decompress_ptr cinfo)
|
|
|
|
|
{
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
skip_input_data (j_decompress_ptr cinfo, long num_bytes)
|
|
|
|
|
{
|
|
|
|
|
my_src_ptr src = (my_src_ptr) cinfo->src;
|
|
|
|
|
long num_can_do;
|
|
|
|
|
|
|
|
|
|
/* move as far as we can into current buffer */
|
|
|
|
|
/* then set skip_next to catch the rest */
|
|
|
|
|
if (num_bytes > 0) {
|
|
|
|
|
num_can_do = MIN (src->pub.bytes_in_buffer, num_bytes);
|
|
|
|
|
src->pub.next_input_byte += (size_t) num_can_do;
|
|
|
|
|
src->pub.bytes_in_buffer -= (size_t) num_can_do;
|
|
|
|
|
|
|
|
|
|
src->skip_next = num_bytes - num_can_do;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* func - called when we have pixmap created (but no image data)
|
|
|
|
|
* user_data - passed as arg 1 to func
|
|
|
|
|
* return context (opaque to user)
|
|
|
|
|
*/
|
|
|
|
|
|
2003-03-21 00:13:17 +00:00
|
|
|
|
static gpointer
|
2002-10-03 22:39:51 +00:00
|
|
|
|
gdk_pixbuf__jpeg_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-10-29 22:37:27 +00:00
|
|
|
|
{
|
|
|
|
|
JpegProgContext *context;
|
|
|
|
|
my_source_mgr *src;
|
|
|
|
|
|
1999-11-03 17:17:32 +00:00
|
|
|
|
context = g_new0 (JpegProgContext, 1);
|
2002-07-06 23:10:46 +00:00
|
|
|
|
context->size_func = size_func;
|
1999-11-04 20:02:37 +00:00
|
|
|
|
context->prepared_func = prepared_func;
|
|
|
|
|
context->updated_func = updated_func;
|
|
|
|
|
context->user_data = user_data;
|
1999-10-29 22:37:27 +00:00
|
|
|
|
context->pixbuf = NULL;
|
|
|
|
|
context->got_header = FALSE;
|
|
|
|
|
context->did_prescan = FALSE;
|
|
|
|
|
context->src_initialized = FALSE;
|
2002-04-11 21:18:40 +00:00
|
|
|
|
context->in_output = FALSE;
|
1999-10-29 22:37:27 +00:00
|
|
|
|
|
|
|
|
|
/* create libjpeg structures */
|
|
|
|
|
jpeg_create_decompress (&context->cinfo);
|
|
|
|
|
|
2001-09-14 22:04:55 +00:00
|
|
|
|
context->cinfo.src = (struct jpeg_source_mgr *) g_try_malloc (sizeof (my_source_mgr));
|
|
|
|
|
if (!context->cinfo.src) {
|
2008-06-19 12:47:48 +00:00
|
|
|
|
g_set_error_literal (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
|
|
|
|
|
_("Couldn't allocate memory for loading JPEG file"));
|
2002-07-06 23:10:46 +00:00
|
|
|
|
return NULL;
|
2001-09-14 22:04:55 +00:00
|
|
|
|
}
|
|
|
|
|
memset (context->cinfo.src, 0, sizeof (my_source_mgr));
|
|
|
|
|
|
1999-10-29 22:37:27 +00:00
|
|
|
|
src = (my_src_ptr) context->cinfo.src;
|
|
|
|
|
|
|
|
|
|
context->cinfo.err = jpeg_std_error (&context->jerr.pub);
|
2000-05-31 02:07:07 +00:00
|
|
|
|
context->jerr.pub.error_exit = fatal_error_handler;
|
2000-10-18 18:42:54 +00:00
|
|
|
|
context->jerr.pub.output_message = output_message_handler;
|
|
|
|
|
context->jerr.error = error;
|
|
|
|
|
|
1999-10-29 22:37:27 +00:00
|
|
|
|
src = (my_src_ptr) context->cinfo.src;
|
|
|
|
|
src->pub.init_source = init_source;
|
|
|
|
|
src->pub.fill_input_buffer = fill_input_buffer;
|
|
|
|
|
src->pub.skip_input_data = skip_input_data;
|
|
|
|
|
src->pub.resync_to_restart = jpeg_resync_to_restart;
|
|
|
|
|
src->pub.term_source = term_source;
|
|
|
|
|
src->pub.bytes_in_buffer = 0;
|
|
|
|
|
src->pub.next_input_byte = NULL;
|
|
|
|
|
|
2000-10-18 18:42:54 +00:00
|
|
|
|
context->jerr.error = NULL;
|
|
|
|
|
|
1999-10-29 22:37:27 +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__jpeg_image_stop_load (gpointer data, GError **error)
|
1999-10-29 22:37:27 +00:00
|
|
|
|
{
|
|
|
|
|
JpegProgContext *context = (JpegProgContext *) data;
|
2007-03-28 13:29:17 +00:00
|
|
|
|
gboolean retval;
|
1999-11-03 17:17:32 +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);
|
2002-07-06 23:10:46 +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
|
|
|
|
|
*/
|
|
|
|
|
|
1999-10-29 22:37:27 +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);
|
2002-07-06 23:10:46 +00:00
|
|
|
|
|
2000-05-31 02:07:07 +00:00
|
|
|
|
/* if we have an error? */
|
2007-05-30 16:11:48 +00:00
|
|
|
|
context->jerr.error = error;
|
2000-05-31 02:07:07 +00:00
|
|
|
|
if (sigsetjmp (context->jerr.setjmp_buffer, 1)) {
|
2007-03-28 13:29:17 +00:00
|
|
|
|
retval = FALSE;
|
2000-05-31 02:07:07 +00:00
|
|
|
|
} else {
|
2007-03-28 13:29:17 +00:00
|
|
|
|
jpeg_finish_decompress (&context->cinfo);
|
|
|
|
|
retval = TRUE;
|
2000-05-31 02:07:07 +00:00
|
|
|
|
}
|
1999-11-03 22:00:27 +00:00
|
|
|
|
|
2007-03-28 13:29:17 +00:00
|
|
|
|
jpeg_destroy_decompress (&context->cinfo);
|
|
|
|
|
|
1999-10-29 22:37:27 +00:00
|
|
|
|
if (context->cinfo.src) {
|
|
|
|
|
my_src_ptr src = (my_src_ptr) context->cinfo.src;
|
|
|
|
|
|
|
|
|
|
g_free (src);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
2007-03-28 13:29:17 +00:00
|
|
|
|
return retval;
|
1999-10-29 22:37:27 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-12-14 13:58:02 +00:00
|
|
|
|
static gboolean
|
|
|
|
|
gdk_pixbuf__jpeg_image_load_lines (JpegProgContext *context,
|
|
|
|
|
GError **error)
|
|
|
|
|
{
|
|
|
|
|
struct jpeg_decompress_struct *cinfo = &context->cinfo;
|
|
|
|
|
guchar *lines[4];
|
|
|
|
|
guchar **lptr;
|
|
|
|
|
guchar *rowptr;
|
|
|
|
|
gint nlines, i;
|
|
|
|
|
|
|
|
|
|
/* keep going until we've done all scanlines */
|
|
|
|
|
while (cinfo->output_scanline < cinfo->output_height) {
|
|
|
|
|
lptr = lines;
|
|
|
|
|
rowptr = context->dptr;
|
|
|
|
|
for (i=0; i < cinfo->rec_outbuf_height; i++) {
|
|
|
|
|
*lptr++ = rowptr;
|
|
|
|
|
rowptr += context->pixbuf->rowstride;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
nlines = jpeg_read_scanlines (cinfo, lines,
|
|
|
|
|
cinfo->rec_outbuf_height);
|
|
|
|
|
if (nlines == 0)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
switch (cinfo->out_color_space) {
|
|
|
|
|
case JCS_GRAYSCALE:
|
|
|
|
|
explode_gray_into_buf (cinfo, lines);
|
|
|
|
|
break;
|
|
|
|
|
case JCS_RGB:
|
|
|
|
|
/* do nothing */
|
|
|
|
|
break;
|
|
|
|
|
case JCS_CMYK:
|
|
|
|
|
convert_cmyk_to_rgb (cinfo, lines);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
if (error && *error == NULL) {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_UNKNOWN_TYPE,
|
|
|
|
|
_("Unsupported JPEG color space (%s)"),
|
|
|
|
|
colorspace_name (cinfo->out_color_space));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
context->dptr += nlines * context->pixbuf->rowstride;
|
|
|
|
|
|
|
|
|
|
/* send updated signal */
|
2006-02-10 19:02:38 +00:00
|
|
|
|
if (context->updated_func)
|
|
|
|
|
(* context->updated_func) (context->pixbuf,
|
|
|
|
|
0,
|
|
|
|
|
cinfo->output_scanline - 1,
|
|
|
|
|
cinfo->image_width,
|
|
|
|
|
nlines,
|
|
|
|
|
context->user_data);
|
2005-12-14 13:58:02 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
1999-10-29 22:37:27 +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__jpeg_image_load_increment (gpointer data,
|
|
|
|
|
const guchar *buf, guint size,
|
2000-10-18 18:42:54 +00:00
|
|
|
|
GError **error)
|
1999-10-29 22:37:27 +00:00
|
|
|
|
{
|
|
|
|
|
JpegProgContext *context = (JpegProgContext *)data;
|
2007-05-18 14:19:47 +00:00
|
|
|
|
struct jpeg_decompress_struct *cinfo;
|
|
|
|
|
my_src_ptr src;
|
|
|
|
|
guint num_left, num_copy;
|
2007-12-09 18:55:12 +00:00
|
|
|
|
guint last_num_left, last_bytes_left;
|
2007-05-18 14:19:47 +00:00
|
|
|
|
guint spinguard;
|
|
|
|
|
gboolean first;
|
|
|
|
|
const guchar *bufhd;
|
|
|
|
|
gint width, height;
|
|
|
|
|
int is_otag;
|
|
|
|
|
char otag_str[5];
|
1999-10-29 22:37:27 +00:00
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (context != NULL, FALSE);
|
|
|
|
|
g_return_val_if_fail (buf != NULL, FALSE);
|
|
|
|
|
|
|
|
|
|
src = (my_src_ptr) context->cinfo.src;
|
1999-11-03 17:17:32 +00:00
|
|
|
|
|
1999-10-29 22:37:27 +00:00
|
|
|
|
cinfo = &context->cinfo;
|
|
|
|
|
|
2000-10-18 18:42:54 +00:00
|
|
|
|
context->jerr.error = error;
|
|
|
|
|
|
2000-05-31 02:07:07 +00:00
|
|
|
|
/* check for fatal error */
|
|
|
|
|
if (sigsetjmp (context->jerr.setjmp_buffer, 1)) {
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
1999-11-03 22:00:27 +00:00
|
|
|
|
|
1999-10-29 22:37:27 +00:00
|
|
|
|
/* skip over data if requested, handle unsigned int sizes cleanly */
|
|
|
|
|
/* only can happen if we've already called jpeg_get_header once */
|
|
|
|
|
if (context->src_initialized && src->skip_next) {
|
|
|
|
|
if (src->skip_next > size) {
|
|
|
|
|
src->skip_next -= size;
|
|
|
|
|
return TRUE;
|
|
|
|
|
} else {
|
|
|
|
|
num_left = size - src->skip_next;
|
1999-11-03 22:00:27 +00:00
|
|
|
|
bufhd = buf + src->skip_next;
|
1999-10-29 22:37:27 +00:00
|
|
|
|
src->skip_next = 0;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
num_left = size;
|
1999-11-03 22:00:27 +00:00
|
|
|
|
bufhd = buf;
|
1999-10-29 22:37:27 +00:00
|
|
|
|
}
|
|
|
|
|
|
1999-11-09 17:24:15 +00:00
|
|
|
|
if (num_left == 0)
|
|
|
|
|
return TRUE;
|
1999-11-03 17:17:32 +00:00
|
|
|
|
|
2007-12-09 18:55:12 +00:00
|
|
|
|
last_num_left = num_left;
|
1999-11-03 22:00:27 +00:00
|
|
|
|
last_bytes_left = 0;
|
|
|
|
|
spinguard = 0;
|
1999-11-09 17:24:15 +00:00
|
|
|
|
first = TRUE;
|
|
|
|
|
while (TRUE) {
|
1999-11-03 22:00:27 +00:00
|
|
|
|
|
|
|
|
|
/* handle any data from caller we haven't processed yet */
|
|
|
|
|
if (num_left > 0) {
|
|
|
|
|
if(src->pub.bytes_in_buffer &&
|
|
|
|
|
src->pub.next_input_byte != src->buffer)
|
|
|
|
|
memmove(src->buffer, src->pub.next_input_byte,
|
|
|
|
|
src->pub.bytes_in_buffer);
|
1999-11-03 17:17:32 +00:00
|
|
|
|
|
|
|
|
|
|
1999-11-03 22:00:27 +00:00
|
|
|
|
num_copy = MIN (JPEG_PROG_BUF_SIZE - src->pub.bytes_in_buffer,
|
|
|
|
|
num_left);
|
1999-11-02 17:17:00 +00:00
|
|
|
|
|
1999-11-03 22:00:27 +00:00
|
|
|
|
memcpy(src->buffer + src->pub.bytes_in_buffer, bufhd,num_copy);
|
|
|
|
|
src->pub.next_input_byte = src->buffer;
|
|
|
|
|
src->pub.bytes_in_buffer += num_copy;
|
|
|
|
|
bufhd += num_copy;
|
|
|
|
|
num_left -= num_copy;
|
|
|
|
|
}
|
1999-11-02 17:17:00 +00:00
|
|
|
|
|
2007-03-28 13:29:17 +00:00
|
|
|
|
/* did anything change from last pass, if not return */
|
|
|
|
|
if (first) {
|
|
|
|
|
last_bytes_left = src->pub.bytes_in_buffer;
|
|
|
|
|
first = FALSE;
|
2007-12-09 18:55:12 +00:00
|
|
|
|
} else if (src->pub.bytes_in_buffer == last_bytes_left
|
|
|
|
|
&& num_left == last_num_left) {
|
2007-03-28 13:29:17 +00:00
|
|
|
|
spinguard++;
|
2007-12-09 18:55:12 +00:00
|
|
|
|
} else {
|
2007-03-28 13:29:17 +00:00
|
|
|
|
last_bytes_left = src->pub.bytes_in_buffer;
|
2007-12-09 18:55:12 +00:00
|
|
|
|
last_num_left = num_left;
|
|
|
|
|
}
|
2007-03-28 13:29:17 +00:00
|
|
|
|
|
1999-11-03 22:00:27 +00:00
|
|
|
|
/* should not go through twice and not pull bytes out of buf */
|
|
|
|
|
if (spinguard > 2)
|
|
|
|
|
return TRUE;
|
1999-10-29 22:37:27 +00:00
|
|
|
|
|
|
|
|
|
/* try to load jpeg header */
|
|
|
|
|
if (!context->got_header) {
|
|
|
|
|
int rc;
|
2007-05-18 14:19:47 +00:00
|
|
|
|
|
|
|
|
|
jpeg_save_markers (cinfo, EXIF_JPEG_MARKER, 0xffff);
|
1999-10-29 22:37:27 +00:00
|
|
|
|
rc = jpeg_read_header (cinfo, TRUE);
|
|
|
|
|
context->src_initialized = TRUE;
|
2002-07-06 23:10:46 +00:00
|
|
|
|
|
1999-10-29 22:37:27 +00:00
|
|
|
|
if (rc == JPEG_SUSPENDED)
|
|
|
|
|
continue;
|
2002-07-06 23:10:46 +00:00
|
|
|
|
|
1999-10-29 22:37:27 +00:00
|
|
|
|
context->got_header = TRUE;
|
2007-05-18 14:19:47 +00:00
|
|
|
|
|
|
|
|
|
/* check for orientation tag */
|
|
|
|
|
is_otag = get_orientation (cinfo);
|
|
|
|
|
|
2002-07-06 23:10:46 +00:00
|
|
|
|
width = cinfo->image_width;
|
|
|
|
|
height = cinfo->image_height;
|
2004-01-07 00:26:58 +00:00
|
|
|
|
if (context->size_func) {
|
|
|
|
|
(* context->size_func) (&width, &height, context->user_data);
|
2007-02-07 14:47:36 +00:00
|
|
|
|
if (width == 0 || height == 0) {
|
2008-06-19 12:47:48 +00:00
|
|
|
|
g_set_error_literal (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
|
_("Transformed JPEG has zero width or height."));
|
2004-01-07 00:26:58 +00:00
|
|
|
|
return FALSE;
|
2007-02-07 14:47:36 +00:00
|
|
|
|
}
|
2004-01-07 00:26:58 +00:00
|
|
|
|
}
|
|
|
|
|
|
2002-07-06 23:10:46 +00:00
|
|
|
|
for (cinfo->scale_denom = 2; cinfo->scale_denom <= 8; cinfo->scale_denom *= 2) {
|
|
|
|
|
jpeg_calc_output_dimensions (cinfo);
|
|
|
|
|
if (cinfo->output_width < width || cinfo->output_height < height) {
|
|
|
|
|
cinfo->scale_denom /= 2;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
jpeg_calc_output_dimensions (cinfo);
|
|
|
|
|
|
|
|
|
|
context->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
|
|
|
|
|
cinfo->output_components == 4 ? TRUE : FALSE,
|
|
|
|
|
8,
|
|
|
|
|
cinfo->output_width,
|
|
|
|
|
cinfo->output_height);
|
1999-10-29 22:37:27 +00:00
|
|
|
|
|
|
|
|
|
if (context->pixbuf == NULL) {
|
2008-06-19 12:47:48 +00:00
|
|
|
|
g_set_error_literal (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
|
|
|
|
|
_("Couldn't allocate memory for loading JPEG 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
|
|
|
|
return FALSE;
|
1999-10-29 22:37:27 +00:00
|
|
|
|
}
|
2007-05-18 14:19:47 +00:00
|
|
|
|
|
|
|
|
|
/* if orientation tag was found set an option to remember its value */
|
|
|
|
|
if (is_otag) {
|
2007-06-15 15:18:48 +00:00
|
|
|
|
g_snprintf (otag_str, sizeof (otag_str), "%d", is_otag);
|
2007-05-18 14:19:47 +00:00
|
|
|
|
gdk_pixbuf_set_option (context->pixbuf, "orientation", otag_str);
|
|
|
|
|
}
|
|
|
|
|
|
1999-10-29 22:54:02 +00:00
|
|
|
|
/* Use pixbuf buffer to store decompressed data */
|
2000-04-11 07:03:25 +00:00
|
|
|
|
context->dptr = context->pixbuf->pixels;
|
2002-07-06 23:10:46 +00:00
|
|
|
|
|
1999-10-29 22:37:27 +00:00
|
|
|
|
/* Notify the client that we are ready to go */
|
2006-02-10 19:02:38 +00:00
|
|
|
|
if (context->prepared_func)
|
|
|
|
|
(* context->prepared_func) (context->pixbuf,
|
|
|
|
|
NULL,
|
|
|
|
|
context->user_data);
|
2002-04-11 21:18:40 +00:00
|
|
|
|
|
2002-07-06 23:10:46 +00:00
|
|
|
|
} else if (!context->did_prescan) {
|
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
|
|
/* start decompression */
|
2005-12-14 12:47:49 +00:00
|
|
|
|
cinfo->buffered_image = cinfo->progressive_mode;
|
2002-07-06 23:10:46 +00:00
|
|
|
|
rc = jpeg_start_decompress (cinfo);
|
|
|
|
|
cinfo->do_fancy_upsampling = FALSE;
|
|
|
|
|
cinfo->do_block_smoothing = FALSE;
|
|
|
|
|
|
1999-10-29 22:37:27 +00:00
|
|
|
|
if (rc == JPEG_SUSPENDED)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
context->did_prescan = TRUE;
|
2005-12-14 12:47:49 +00:00
|
|
|
|
} else if (!cinfo->buffered_image) {
|
|
|
|
|
/* we're decompressing unbuffered so
|
2005-12-14 13:58:02 +00:00
|
|
|
|
* simply get scanline by scanline from jpeg lib
|
2005-12-14 12:47:49 +00:00
|
|
|
|
*/
|
2005-12-14 13:58:02 +00:00
|
|
|
|
if (! gdk_pixbuf__jpeg_image_load_lines (context,
|
|
|
|
|
error))
|
|
|
|
|
return FALSE;
|
2005-12-14 12:47:49 +00:00
|
|
|
|
|
|
|
|
|
if (cinfo->output_scanline >= cinfo->output_height)
|
|
|
|
|
return TRUE;
|
1999-10-29 22:37:27 +00:00
|
|
|
|
} else {
|
2005-12-14 13:58:02 +00:00
|
|
|
|
/* we're decompressing buffered (progressive)
|
|
|
|
|
* so feed jpeg lib scanlines
|
2005-12-14 12:47:49 +00:00
|
|
|
|
*/
|
1999-10-29 23:07:23 +00:00
|
|
|
|
|
2002-04-11 21:18:40 +00:00
|
|
|
|
/* keep going until we've done all passes */
|
|
|
|
|
while (!jpeg_input_complete (cinfo)) {
|
|
|
|
|
if (!context->in_output) {
|
|
|
|
|
if (jpeg_start_output (cinfo, cinfo->input_scan_number)) {
|
|
|
|
|
context->in_output = TRUE;
|
|
|
|
|
context->dptr = context->pixbuf->pixels;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2005-12-14 13:58:02 +00:00
|
|
|
|
/* get scanlines from jpeg lib */
|
|
|
|
|
if (! gdk_pixbuf__jpeg_image_load_lines (context,
|
|
|
|
|
error))
|
|
|
|
|
return FALSE;
|
2002-07-01 22:20:20 +00:00
|
|
|
|
|
2005-12-14 13:58:02 +00:00
|
|
|
|
if (cinfo->output_scanline >= cinfo->output_height &&
|
2002-04-11 21:18:40 +00:00
|
|
|
|
jpeg_finish_output (cinfo))
|
|
|
|
|
context->in_output = FALSE;
|
|
|
|
|
else
|
1999-10-29 22:37:27 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
2002-04-11 21:18:40 +00:00
|
|
|
|
if (jpeg_input_complete (cinfo))
|
|
|
|
|
/* did entire image */
|
1999-11-03 22:00:27 +00:00
|
|
|
|
return TRUE;
|
|
|
|
|
else
|
|
|
|
|
continue;
|
1999-10-29 22:37:27 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2000-10-06 18:19:18 +00:00
|
|
|
|
|
2004-01-07 01:57:42 +00:00
|
|
|
|
/* Save */
|
|
|
|
|
|
|
|
|
|
#define TO_FUNCTION_BUF_SIZE 4096
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
|
struct jpeg_destination_mgr pub;
|
|
|
|
|
JOCTET *buffer;
|
|
|
|
|
GdkPixbufSaveFunc save_func;
|
|
|
|
|
gpointer user_data;
|
|
|
|
|
GError **error;
|
|
|
|
|
} ToFunctionDestinationManager;
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
to_callback_init (j_compress_ptr cinfo)
|
|
|
|
|
{
|
|
|
|
|
ToFunctionDestinationManager *destmgr;
|
|
|
|
|
|
|
|
|
|
destmgr = (ToFunctionDestinationManager*) cinfo->dest;
|
|
|
|
|
destmgr->pub.next_output_byte = destmgr->buffer;
|
|
|
|
|
destmgr->pub.free_in_buffer = TO_FUNCTION_BUF_SIZE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
to_callback_do_write (j_compress_ptr cinfo, gsize length)
|
|
|
|
|
{
|
|
|
|
|
ToFunctionDestinationManager *destmgr;
|
|
|
|
|
|
|
|
|
|
destmgr = (ToFunctionDestinationManager*) cinfo->dest;
|
|
|
|
|
if (!destmgr->save_func (destmgr->buffer,
|
|
|
|
|
length,
|
|
|
|
|
destmgr->error,
|
|
|
|
|
destmgr->user_data)) {
|
|
|
|
|
struct error_handler_data *errmgr;
|
|
|
|
|
|
|
|
|
|
errmgr = (struct error_handler_data *) cinfo->err;
|
|
|
|
|
/* Use a default error message if the callback didn't set one,
|
|
|
|
|
* which it should have.
|
|
|
|
|
*/
|
|
|
|
|
if (errmgr->error && *errmgr->error == NULL) {
|
2008-06-19 12:47:48 +00:00
|
|
|
|
g_set_error_literal (errmgr->error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
|
"write function failed");
|
2004-01-07 01:57:42 +00:00
|
|
|
|
}
|
|
|
|
|
siglongjmp (errmgr->setjmp_buffer, 1);
|
|
|
|
|
g_assert_not_reached ();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-02-08 09:13:18 +00:00
|
|
|
|
static boolean
|
2004-01-07 01:57:42 +00:00
|
|
|
|
to_callback_empty_output_buffer (j_compress_ptr cinfo)
|
|
|
|
|
{
|
|
|
|
|
ToFunctionDestinationManager *destmgr;
|
|
|
|
|
|
|
|
|
|
destmgr = (ToFunctionDestinationManager*) cinfo->dest;
|
|
|
|
|
to_callback_do_write (cinfo, TO_FUNCTION_BUF_SIZE);
|
|
|
|
|
destmgr->pub.next_output_byte = destmgr->buffer;
|
|
|
|
|
destmgr->pub.free_in_buffer = TO_FUNCTION_BUF_SIZE;
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
to_callback_terminate (j_compress_ptr cinfo)
|
|
|
|
|
{
|
|
|
|
|
ToFunctionDestinationManager *destmgr;
|
|
|
|
|
|
|
|
|
|
destmgr = (ToFunctionDestinationManager*) cinfo->dest;
|
|
|
|
|
to_callback_do_write (cinfo, TO_FUNCTION_BUF_SIZE - destmgr->pub.free_in_buffer);
|
|
|
|
|
}
|
|
|
|
|
|
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
|
2004-01-07 01:57:42 +00:00
|
|
|
|
real_save_jpeg (GdkPixbuf *pixbuf,
|
|
|
|
|
gchar **keys,
|
|
|
|
|
gchar **values,
|
|
|
|
|
GError **error,
|
|
|
|
|
gboolean to_callback,
|
|
|
|
|
FILE *f,
|
|
|
|
|
GdkPixbufSaveFunc save_func,
|
|
|
|
|
gpointer user_data)
|
2000-10-06 18:19:18 +00:00
|
|
|
|
{
|
|
|
|
|
/* FIXME error handling is broken */
|
|
|
|
|
|
|
|
|
|
struct jpeg_compress_struct cinfo;
|
|
|
|
|
guchar *buf = NULL;
|
|
|
|
|
guchar *ptr;
|
|
|
|
|
guchar *pixels = NULL;
|
|
|
|
|
JSAMPROW *jbuf;
|
|
|
|
|
int y = 0;
|
2002-04-11 21:18:40 +00:00
|
|
|
|
volatile int quality = 75; /* default; must be between 0 and 100 */
|
2000-10-06 18:19:18 +00:00
|
|
|
|
int i, j;
|
|
|
|
|
int w, h = 0;
|
|
|
|
|
int rowstride = 0;
|
2004-09-13 23:34:34 +00:00
|
|
|
|
int n_channels;
|
2000-10-06 18:19:18 +00:00
|
|
|
|
struct error_handler_data jerr;
|
2004-01-07 01:57:42 +00:00
|
|
|
|
ToFunctionDestinationManager to_callback_destmgr;
|
|
|
|
|
|
|
|
|
|
to_callback_destmgr.buffer = NULL;
|
2000-10-06 18:19:18 +00:00
|
|
|
|
|
|
|
|
|
if (keys && *keys) {
|
|
|
|
|
gchar **kiter = keys;
|
|
|
|
|
gchar **viter = values;
|
|
|
|
|
|
|
|
|
|
while (*kiter) {
|
|
|
|
|
if (strcmp (*kiter, "quality") == 0) {
|
|
|
|
|
char *endptr = NULL;
|
|
|
|
|
quality = strtol (*viter, &endptr, 10);
|
|
|
|
|
|
|
|
|
|
if (endptr == *viter) {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
2001-10-05 18:51:47 +00:00
|
|
|
|
GDK_PIXBUF_ERROR_BAD_OPTION,
|
2000-10-06 18:19:18 +00:00
|
|
|
|
_("JPEG quality must be a value between 0 and 100; value '%s' could not be parsed."),
|
|
|
|
|
*viter);
|
|
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (quality < 0 ||
|
|
|
|
|
quality > 100) {
|
|
|
|
|
/* This is a user-visible error;
|
|
|
|
|
* lets people skip the range-checking
|
|
|
|
|
* in their app.
|
|
|
|
|
*/
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
2001-10-05 18:51:47 +00:00
|
|
|
|
GDK_PIXBUF_ERROR_BAD_OPTION,
|
2000-10-06 18:19:18 +00:00
|
|
|
|
_("JPEG quality must be a value between 0 and 100; value '%d' is not allowed."),
|
|
|
|
|
quality);
|
|
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
2007-04-28 14:48:22 +00:00
|
|
|
|
g_warning ("Unrecognized parameter (%s) passed to JPEG saver.", *kiter);
|
2000-10-06 18:19:18 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
++kiter;
|
|
|
|
|
++viter;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rowstride = gdk_pixbuf_get_rowstride (pixbuf);
|
2004-09-13 23:34:34 +00:00
|
|
|
|
n_channels = gdk_pixbuf_get_n_channels (pixbuf);
|
2000-10-06 18:19:18 +00:00
|
|
|
|
|
|
|
|
|
w = gdk_pixbuf_get_width (pixbuf);
|
|
|
|
|
h = gdk_pixbuf_get_height (pixbuf);
|
|
|
|
|
pixels = gdk_pixbuf_get_pixels (pixbuf);
|
2007-04-28 14:48:22 +00:00
|
|
|
|
|
2004-01-07 01:57:42 +00:00
|
|
|
|
/* Allocate a small buffer to convert image data,
|
|
|
|
|
* and a larger buffer if doing to_callback save.
|
|
|
|
|
*/
|
2001-08-20 06:47:28 +00:00
|
|
|
|
buf = g_try_malloc (w * 3 * sizeof (guchar));
|
|
|
|
|
if (!buf) {
|
2008-06-19 12:47:48 +00:00
|
|
|
|
g_set_error_literal (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
|
|
|
|
|
_("Couldn't allocate memory for loading JPEG file"));
|
2001-08-20 06:47:28 +00:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
2004-01-07 01:57:42 +00:00
|
|
|
|
if (to_callback) {
|
|
|
|
|
to_callback_destmgr.buffer = g_try_malloc (TO_FUNCTION_BUF_SIZE);
|
|
|
|
|
if (!to_callback_destmgr.buffer) {
|
2008-06-19 12:47:48 +00:00
|
|
|
|
g_set_error_literal (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
|
|
|
|
|
_("Couldn't allocate memory for loading JPEG file"));
|
2004-01-07 01:57:42 +00:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
2000-10-06 18:19:18 +00:00
|
|
|
|
|
|
|
|
|
/* set up error handling */
|
|
|
|
|
jerr.pub.error_exit = fatal_error_handler;
|
2000-10-18 18:42:54 +00:00
|
|
|
|
jerr.pub.output_message = output_message_handler;
|
|
|
|
|
jerr.error = error;
|
|
|
|
|
|
2000-10-06 18:19:18 +00:00
|
|
|
|
cinfo.err = jpeg_std_error (&(jerr.pub));
|
|
|
|
|
if (sigsetjmp (jerr.setjmp_buffer, 1)) {
|
|
|
|
|
jpeg_destroy_compress (&cinfo);
|
2002-01-20 04:52:47 +00:00
|
|
|
|
g_free (buf);
|
2004-01-07 01:57:42 +00:00
|
|
|
|
g_free (to_callback_destmgr.buffer);
|
2000-10-06 18:19:18 +00:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* setup compress params */
|
|
|
|
|
jpeg_create_compress (&cinfo);
|
2004-01-07 01:57:42 +00:00
|
|
|
|
if (to_callback) {
|
|
|
|
|
to_callback_destmgr.pub.init_destination = to_callback_init;
|
|
|
|
|
to_callback_destmgr.pub.empty_output_buffer = to_callback_empty_output_buffer;
|
|
|
|
|
to_callback_destmgr.pub.term_destination = to_callback_terminate;
|
|
|
|
|
to_callback_destmgr.error = error;
|
|
|
|
|
to_callback_destmgr.save_func = save_func;
|
|
|
|
|
to_callback_destmgr.user_data = user_data;
|
|
|
|
|
cinfo.dest = (struct jpeg_destination_mgr*) &to_callback_destmgr;
|
|
|
|
|
} else {
|
|
|
|
|
jpeg_stdio_dest (&cinfo, f);
|
|
|
|
|
}
|
2000-10-06 18:19:18 +00:00
|
|
|
|
cinfo.image_width = w;
|
|
|
|
|
cinfo.image_height = h;
|
|
|
|
|
cinfo.input_components = 3;
|
|
|
|
|
cinfo.in_color_space = JCS_RGB;
|
|
|
|
|
|
|
|
|
|
/* set up jepg compression parameters */
|
|
|
|
|
jpeg_set_defaults (&cinfo);
|
|
|
|
|
jpeg_set_quality (&cinfo, quality, TRUE);
|
|
|
|
|
jpeg_start_compress (&cinfo, TRUE);
|
|
|
|
|
/* get the start pointer */
|
|
|
|
|
ptr = pixels;
|
|
|
|
|
/* go one scanline at a time... and save */
|
|
|
|
|
i = 0;
|
|
|
|
|
while (cinfo.next_scanline < cinfo.image_height) {
|
|
|
|
|
/* convert scanline from ARGB to RGB packed */
|
|
|
|
|
for (j = 0; j < w; j++)
|
2004-09-13 23:34:34 +00:00
|
|
|
|
memcpy (&(buf[j*3]), &(ptr[i*rowstride + j*n_channels]), 3);
|
2000-10-06 18:19:18 +00:00
|
|
|
|
|
|
|
|
|
/* write scanline */
|
|
|
|
|
jbuf = (JSAMPROW *)(&buf);
|
|
|
|
|
jpeg_write_scanlines (&cinfo, jbuf, 1);
|
|
|
|
|
i++;
|
|
|
|
|
y++;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* finish off */
|
2002-10-03 22:32:39 +00:00
|
|
|
|
jpeg_finish_compress (&cinfo);
|
|
|
|
|
jpeg_destroy_compress(&cinfo);
|
2002-01-20 04:52:47 +00:00
|
|
|
|
g_free (buf);
|
2004-01-07 01:57:42 +00:00
|
|
|
|
g_free (to_callback_destmgr.buffer);
|
2000-10-06 18:19:18 +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
|
|
|
|
|
2004-01-07 01:57:42 +00:00
|
|
|
|
static gboolean
|
|
|
|
|
gdk_pixbuf__jpeg_image_save (FILE *f,
|
|
|
|
|
GdkPixbuf *pixbuf,
|
|
|
|
|
gchar **keys,
|
|
|
|
|
gchar **values,
|
|
|
|
|
GError **error)
|
|
|
|
|
{
|
|
|
|
|
return real_save_jpeg (pixbuf, keys, values, error,
|
|
|
|
|
FALSE, f, NULL, NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
|
gdk_pixbuf__jpeg_image_save_to_callback (GdkPixbufSaveFunc save_func,
|
|
|
|
|
gpointer user_data,
|
|
|
|
|
GdkPixbuf *pixbuf,
|
|
|
|
|
gchar **keys,
|
|
|
|
|
gchar **values,
|
|
|
|
|
GError **error)
|
|
|
|
|
{
|
|
|
|
|
return real_save_jpeg (pixbuf, keys, values, error,
|
|
|
|
|
TRUE, NULL, save_func, user_data);
|
|
|
|
|
}
|
|
|
|
|
|
2006-10-11 12:41:14 +00:00
|
|
|
|
#ifndef INCLUDE_jpeg
|
2008-05-27 16:51:33 +00:00
|
|
|
|
#define MODULE_ENTRY(function) G_MODULE_EXPORT void function
|
2006-10-11 12:41:14 +00:00
|
|
|
|
#else
|
2008-05-27 16:51:33 +00:00
|
|
|
|
#define MODULE_ENTRY(function) void _gdk_pixbuf__jpeg_ ## function
|
2006-10-11 12:41:14 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
2008-05-27 16:51:33 +00:00
|
|
|
|
MODULE_ENTRY (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__jpeg_image_load;
|
|
|
|
|
module->begin_load = gdk_pixbuf__jpeg_image_begin_load;
|
|
|
|
|
module->stop_load = gdk_pixbuf__jpeg_image_stop_load;
|
|
|
|
|
module->load_increment = gdk_pixbuf__jpeg_image_load_increment;
|
|
|
|
|
module->save = gdk_pixbuf__jpeg_image_save;
|
2004-01-07 01:57:42 +00:00
|
|
|
|
module->save_to_callback = gdk_pixbuf__jpeg_image_save_to_callback;
|
2002-10-03 22:39:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
2008-05-27 16:51:33 +00:00
|
|
|
|
MODULE_ENTRY (fill_info) (GdkPixbufFormat *info)
|
2002-10-03 22:39:51 +00:00
|
|
|
|
{
|
|
|
|
|
static GdkPixbufModulePattern signature[] = {
|
|
|
|
|
{ "\xff\xd8", NULL, 100 },
|
|
|
|
|
{ NULL, NULL, 0 }
|
|
|
|
|
};
|
|
|
|
|
static gchar * mime_types[] = {
|
|
|
|
|
"image/jpeg",
|
|
|
|
|
NULL
|
|
|
|
|
};
|
|
|
|
|
static gchar * extensions[] = {
|
|
|
|
|
"jpeg",
|
|
|
|
|
"jpe",
|
|
|
|
|
"jpg",
|
|
|
|
|
NULL
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
info->name = "jpeg";
|
|
|
|
|
info->signature = signature;
|
|
|
|
|
info->description = N_("The JPEG image format");
|
|
|
|
|
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_WRITABLE | 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
|
|
|
|
}
|