/*
- * Geeqie
- * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2011 The Geeqie Team
- *
- * Author: Vladimir Nadvornik
- *
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
- */
-
-/* based on code from GdkPixbuf library - JPEG image loader
- *
* Copyright (C) 1999 Michael Zucchi
* Copyright (C) 1999 The Free Software Foundation
- *
- * Progressive loading code Copyright (C) 1999 Red Hat, Inc.
+ * Copyright (C) 2004 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
*
* Authors: Michael Zucchi <zucchi@zedzone.mmc.com.au>
* Federico Mena-Quintero <federico@gimp.org>
* Michael Fulbright <drmike@redhat.com>
+ * Vladimir Nadvornik
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
#include "main.h"
#include "image-load.h"
ImageLoaderBackendCbAreaUpdated area_updated_cb;
ImageLoaderBackendCbSize size_cb;
ImageLoaderBackendCbAreaPrepared area_prepared_cb;
-
+
gpointer data;
-
+
GdkPixbuf *pixbuf;
guint requested_width;
guint requested_height;
-
+
gboolean abort;
gboolean stereo;
-
+
};
/* error handler data */
/* 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)
+ guchar **lines)
{
gint i, j;
guint w;
w = cinfo->output_width;
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--) {
static void
convert_cmyk_to_rgb (struct jpeg_decompress_struct *cinfo,
- guchar **lines)
+ guchar **lines)
{
- gint i, j;
+ gint i;
+ guint j;
g_return_if_fail (cinfo != NULL);
g_return_if_fail (cinfo->output_components == 4);
for (i = cinfo->rec_outbuf_height - 1; i >= 0; i--) {
guchar *p;
-
+
p = lines[i];
for (j = 0; j < cinfo->output_width; j++) {
int c, m, y, k;
static gpointer image_loader_jpeg_new(ImageLoaderBackendCbAreaUpdated area_updated_cb, ImageLoaderBackendCbSize size_cb, ImageLoaderBackendCbAreaPrepared area_prepared_cb, gpointer data)
{
ImageLoaderJpeg *loader = g_new0(ImageLoaderJpeg, 1);
-
+
loader->area_updated_cb = area_updated_cb;
loader->size_cb = size_cb;
loader->area_prepared_cb = area_prepared_cb;
{
struct error_handler_data *errmgr;
char buffer[JMSG_LENGTH_MAX];
-
+
errmgr = (struct error_handler_data *) cinfo->err;
-
+
/* Create the message */
(* cinfo->err->format_message) (cinfo, buffer);
if (errmgr->error && *errmgr->error == NULL) {
g_set_error (errmgr->error,
GDK_PIXBUF_ERROR,
- cinfo->err->msg_code == JERR_OUT_OF_MEMORY
- ? GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY
+ cinfo->err->msg_code == JERR_OUT_OF_MEMORY
+ ? GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY
: GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
_("Error interpreting JPEG image file (%s)"),
buffer);
}
-
+
siglongjmp (errmgr->setjmp_buffer, 1);
g_assert_not_reached ();
gint i;
lptr = lines;
- for (i = 0; i < cinfo->rec_outbuf_height; i++)
+ for (i = 0; i < cinfo->rec_outbuf_height; i++)
{
*lptr++ = *dptr;
*dptr += rowstride;
jpeg_read_scanlines (cinfo, lines, cinfo->rec_outbuf_height);
- switch (cinfo->out_color_space)
+ switch (cinfo->out_color_space)
{
case JCS_GRAYSCALE:
explode_gray_into_buf (cinfo, lines);
{
struct jpeg_source_mgr* src = (struct jpeg_source_mgr*) cinfo->src;
- if (num_bytes > 0)
+ if ((gulong)num_bytes > src->bytes_in_buffer)
+ {
+ ERREXIT(cinfo, JERR_INPUT_EOF);
+ }
+ else if (num_bytes > 0)
{
src->next_input_byte += (size_t) num_bytes;
src->bytes_in_buffer -= (size_t) num_bytes;
{
struct jpeg_source_mgr* src;
- if (cinfo->src == NULL)
+ if (cinfo->src == NULL)
{ /* first time for this JPEG object? */
cinfo->src = (struct jpeg_source_mgr *) (*cinfo->mem->alloc_small) (
(j_common_ptr) cinfo, JPOOL_PERMANENT,
guint stereo_length = 0;
struct error_handler_data jerr;
-
+
lj->stereo = FALSE;
+// DEBUG_1("TG: JPG requested size w=%d:h=%d", lj->requested_width > 0, lj->requested_height);
MPOData *mpo = jpeg_get_mpo_data(buf, count);
if (mpo && mpo->num_images > 1)
guint i;
gint idx1 = -1, idx2 = -1;
guint num2 = 1;
-
+
for (i = 0; i < mpo->num_images; i++)
{
if (mpo->images[i].type_code == 0x20002)
}
}
}
-
+
if (idx1 >= 0 && idx2 >= 0)
{
lj->stereo = TRUE;
jerr.error = error;
- if (setjmp(jerr.setjmp_buffer))
+ if (setjmp(jerr.setjmp_buffer))
{
/* If we get here, the JPEG code has signaled an error.
* We need to clean up the JPEG object, close the input file, and return.
if (lj->stereo) jpeg_destroy_decompress(&cinfo2);
return FALSE;
}
-
+
jpeg_create_decompress(&cinfo);
set_mem_src(&cinfo, (unsigned char *)buf, count);
jpeg_read_header(&cinfo, TRUE);
-
+
if (lj->stereo)
{
jpeg_create_decompress(&cinfo2);
set_mem_src(&cinfo2, stereo_buf2, stereo_length);
jpeg_read_header(&cinfo2, TRUE);
-
+
if (cinfo.image_width != cinfo2.image_width ||
- cinfo.image_height != cinfo2.image_height)
+ cinfo.image_height != cinfo2.image_height)
{
DEBUG_1("stereo data with different size");
jpeg_destroy_decompress(&cinfo2);
}
}
-
+
lj->requested_width = lj->stereo ? cinfo.image_width * 2: cinfo.image_width;
lj->requested_height = cinfo.image_height;
+// DEBUG_1("TG: JPG requested size v2 w=%d:h=%d", lj->requested_width > 0, lj->requested_height);
lj->size_cb(loader, lj->requested_width, lj->requested_height, lj->data);
-
+
cinfo.scale_num = 1;
for (cinfo.scale_denom = 2; cinfo.scale_denom <= 8; cinfo.scale_denom *= 2) {
jpeg_calc_output_dimensions(&cinfo);
jpeg_calc_output_dimensions(&cinfo2);
jpeg_start_decompress(&cinfo2);
}
-
+
jpeg_start_decompress(&cinfo);
-
+
if (lj->stereo)
{
if (cinfo.output_width != cinfo2.output_width ||
cinfo.output_height != cinfo2.output_height ||
- cinfo.out_color_components != cinfo2.out_color_components)
+ cinfo.out_color_components != cinfo2.out_color_components)
{
DEBUG_1("stereo data with different output size");
jpeg_destroy_decompress(&cinfo2);
lj->stereo = FALSE;
}
}
-
-
- lj->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
- cinfo.out_color_components == 4 ? TRUE : FALSE,
+
+
+ lj->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
+ cinfo.out_color_components == 4 ? TRUE : FALSE,
8, lj->stereo ? cinfo.output_width * 2: cinfo.output_width, cinfo.output_height);
- if (!lj->pixbuf)
+ if (!lj->pixbuf)
{
jpeg_destroy_decompress (&cinfo);
if (lj->stereo) jpeg_destroy_decompress (&cinfo2);
rowstride = gdk_pixbuf_get_rowstride(lj->pixbuf);
dptr = gdk_pixbuf_get_pixels(lj->pixbuf);
dptr2 = gdk_pixbuf_get_pixels(lj->pixbuf) + ((cinfo.out_color_components == 4) ? 4 * cinfo.output_width : 3 * cinfo.output_width);
-
- while (cinfo.output_scanline < cinfo.output_height && !lj->abort)
+
+ while (cinfo.output_scanline < cinfo.output_height && !lj->abort)
{
guint scanline = cinfo.output_scanline;
image_loader_jpeg_read_scanline(&cinfo, &dptr, rowstride);
funcs->close = image_loader_jpeg_close;
funcs->abort = image_loader_jpeg_abort;
funcs->free = image_loader_jpeg_free;
-
+
funcs->get_format_name = image_loader_jpeg_get_format_name;
funcs->get_format_mime_types = image_loader_jpeg_get_format_mime_types;
}
-#endif
\ No newline at end of file
+#endif
+
+
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */