Ref #744: Support Canon cr3 files
authorColin Clark <colin.clark@cclark.uk>
Mon, 30 Mar 2020 18:23:37 +0000 (19:23 +0100)
committerColin Clark <colin.clark@cclark.uk>
Mon, 30 Mar 2020 18:23:37 +0000 (19:23 +0100)
https://github.com/BestImageViewer/geeqie/issues/744

This is a temporary solution.
The code is a copy of image_load_jpeg.c, with addresses modified to suit
.cr3 files.
Instead of following pointers to the start of the full size jpeg, a
fixed address is used.

No doubt at some time someone will write a proper decoder.

src/Makefile.am
src/image-load.c
src/image_load_cr3.c [new file with mode: 0644]
src/image_load_cr3.h [new file with mode: 0644]

index 350f95d..6074560 100644 (file)
@@ -181,6 +181,8 @@ geeqie_SOURCES = \
        image.h         \
        image-load.c    \
        image-load.h    \
+       image_load_cr3.c\
+       image_load_cr3.h\
        image_load_gdk.c\
        image_load_gdk.h\
        image_load_jpeg.c\
index 136e8d4..b6d0286 100644 (file)
@@ -21,6 +21,7 @@
 
 #include "main.h"
 #include "image-load.h"
+#include "image_load_cr3.h"
 #include "image_load_gdk.h"
 #include "image_load_jpeg.h"
 #include "image_load_tiff.h"
@@ -674,6 +675,14 @@ static void image_loader_setup_loader(ImageLoader *il)
                image_loader_backend_set_jpeg(&il->backend);
                }
        else
+       if (il->bytes_total >= 11 &&
+               (memcmp(il->mapped_file + 4, "ftypcrx", 7) == 0) &&
+               (memcmp(il->mapped_file + 64, "CanonCR3", 8) == 0))
+               {
+               DEBUG_1("Using custom cr3 loader");
+               image_loader_backend_set_cr3(&il->backend);
+               }
+       else
 #endif
 #ifdef HAVE_TIFF
        if (il->bytes_total >= 10 &&
diff --git a/src/image_load_cr3.c b/src/image_load_cr3.c
new file mode 100644 (file)
index 0000000..fefeae5
--- /dev/null
@@ -0,0 +1,515 @@
+/*
+ * Copyright (C) 2020 The Geeqie Team
+ *
+ * Authors: Colin Clark
+ *
+ * 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 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 General Public License for more details.
+ *
+ * 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.
+ */
+
+/* FIXME: This is just a copy of image_load_jpeg.c, with an adjusted
+ * start address for a .cr3 file
+ */
+#include "main.h"
+
+#include "image-load.h"
+#include "image_load_cr3.h"
+#include "jpeg_parser.h"
+
+#ifdef HAVE_JPEG
+
+#include <setjmp.h>
+#include <jpeglib.h>
+#include <jerror.h>
+
+typedef struct _ImageLoaderJpeg ImageLoaderJpeg;
+struct _ImageLoaderJpeg {
+       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 */
+struct error_handler_data {
+       struct jpeg_error_mgr pub;
+       sigjmp_buf setjmp_buffer;
+        GError **error;
+};
+
+/* 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);
+       g_return_if_fail (cinfo->out_color_space == JCS_GRAYSCALE);
+
+       /* Expand grey->colour.  Expand from the end of the
+        * memory down, so we can use the same buffer.
+        */
+       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--) {
+                       to[0] = from[0];
+                       to[1] = from[0];
+                       to[2] = from[0];
+                       to -= 3;
+                       from--;
+               }
+       }
+}
+
+
+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];
+               for (j = 0; j < cinfo->output_width; j++) {
+                       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;
+               }
+       }
+}
+
+
+static gpointer image_loader_cr3_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;
+       loader->data = data;
+       return (gpointer) loader;
+}
+
+static void
+fatal_error_handler (j_common_ptr cinfo)
+{
+       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);
+
+        /* 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,
+                             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 ();
+}
+
+static void
+output_message_handler (j_common_ptr cinfo)
+{
+  /* This method keeps libjpeg from dumping crap to stderr */
+
+  /* do nothing */
+}
+
+
+static void image_loader_cr3_read_scanline(struct jpeg_decompress_struct *cinfo, guchar **dptr, guint rowstride)
+{
+       guchar *lines[4];
+       guchar **lptr;
+       gint i;
+
+       lptr = lines;
+       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)
+               {
+                   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:
+                     break;
+               }
+}
+
+
+static void init_source (j_decompress_ptr cinfo) {}
+static boolean fill_input_buffer (j_decompress_ptr cinfo)
+{
+       ERREXIT(cinfo, JERR_INPUT_EMPTY);
+       return TRUE;
+}
+static void skip_input_data (j_decompress_ptr cinfo, long num_bytes)
+{
+       struct jpeg_source_mgr* src = (struct jpeg_source_mgr*) cinfo->src;
+
+       if (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;
+               }
+}
+static void term_source (j_decompress_ptr cinfo) {}
+static void set_mem_src (j_decompress_ptr cinfo, void* buffer, long nbytes)
+{
+       struct jpeg_source_mgr* src;
+
+       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,
+                                       sizeof(struct jpeg_source_mgr));
+               }
+
+       src = (struct jpeg_source_mgr*) cinfo->src;
+       src->init_source = init_source;
+       src->fill_input_buffer = fill_input_buffer;
+       src->skip_input_data = skip_input_data;
+       src->resync_to_restart = jpeg_resync_to_restart; /* use default method */
+       src->term_source = term_source;
+       src->bytes_in_buffer = nbytes;
+       src->next_input_byte = (JOCTET*)buffer;
+}
+
+
+static gboolean image_loader_cr3_load (gpointer loader, const guchar *buf, gsize count, GError **error)
+{
+       ImageLoaderJpeg *lj = (ImageLoaderJpeg *) loader;
+       struct jpeg_decompress_struct cinfo;
+       struct jpeg_decompress_struct cinfo2;
+       guchar *dptr, *dptr2;
+       guint rowstride;
+       guchar *stereo_buf2 = NULL;
+       guint stereo_length = 0;
+
+       struct error_handler_data jerr;
+
+/* FIXME: Just start search at where full size jpeg should be,
+ * / then search through the file looking for a jpeg end-marker
+ */
+       guint64 align_buf;
+       gboolean found = FALSE;
+       gint i;
+
+       memcpy(&align_buf, &buf[0xf2], sizeof(guint64));
+       buf = buf + GUINT64_FROM_BE(align_buf) + 0x10;
+
+       if (memcmp(&buf[0], "\xFF\xD8", 2) == 0)
+               {
+               i = 0;
+               while (!found )
+                       {
+                       if (memcmp(&buf[ i], "\xFF\xD9", 2) == 0)
+                               {
+                               found = TRUE;
+                               }
+                       i = i + 1;
+                       }
+               }
+       else
+               {
+               return FALSE;
+               }
+
+       count = i;
+
+       lj->stereo = FALSE;
+
+       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 (mpo->images[i].MPIndividualNum == 1)
+                                       {
+                                       idx1 = i;
+                                       }
+                               else if (mpo->images[i].MPIndividualNum > num2)
+                                       {
+                                       idx2 = i;
+                                       num2 = mpo->images[i].MPIndividualNum;
+                                       }
+                               }
+                       }
+
+               if (idx1 >= 0 && idx2 >= 0)
+                       {
+                       lj->stereo = TRUE;
+                       stereo_buf2 = (unsigned char *)buf + mpo->images[idx2].offset;
+                       stereo_length = mpo->images[idx2].length;
+                       buf = (unsigned char *)buf + mpo->images[idx1].offset;
+                       count = mpo->images[idx1].length;
+                       }
+               }
+       jpeg_mpo_data_free(mpo);
+
+       /* setup error handler */
+       cinfo.err = jpeg_std_error (&jerr.pub);
+       if (lj->stereo) cinfo2.err = jpeg_std_error (&jerr.pub);
+       jerr.pub.error_exit = fatal_error_handler;
+        jerr.pub.output_message = output_message_handler;
+
+        jerr.error = error;
+
+
+       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.
+               */
+               jpeg_destroy_decompress(&cinfo);
+               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)
+                       {
+                       DEBUG_1("stereo data with different size");
+                       jpeg_destroy_decompress(&cinfo2);
+                       lj->stereo = FALSE;
+                       }
+               }
+
+
+
+       lj->requested_width = lj->stereo ? cinfo.image_width * 2: cinfo.image_width;
+       lj->requested_height = cinfo.image_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);
+               if (cinfo.output_width < (lj->stereo ? lj->requested_width / 2 : lj->requested_width) || cinfo.output_height < lj->requested_height) {
+                       cinfo.scale_denom /= 2;
+                       break;
+               }
+       }
+       jpeg_calc_output_dimensions(&cinfo);
+       if (lj->stereo)
+               {
+               cinfo2.scale_num = cinfo.scale_num;
+               cinfo2.scale_denom = cinfo.scale_denom;
+               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)
+                       {
+                       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,
+                                    8, lj->stereo ? cinfo.output_width * 2: cinfo.output_width, cinfo.output_height);
+
+       if (!lj->pixbuf)
+               {
+               jpeg_destroy_decompress (&cinfo);
+               if (lj->stereo) jpeg_destroy_decompress (&cinfo2);
+               return 0;
+               }
+       if (lj->stereo) g_object_set_data(G_OBJECT(lj->pixbuf), "stereo_data", GINT_TO_POINTER(STEREO_PIXBUF_CROSS));
+       lj->area_prepared_cb(loader, lj->data);
+
+       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)
+               {
+               guint scanline = cinfo.output_scanline;
+               image_loader_cr3_read_scanline(&cinfo, &dptr, rowstride);
+               lj->area_updated_cb(loader, 0, scanline, cinfo.output_width, cinfo.rec_outbuf_height, lj->data);
+               if (lj->stereo)
+                       {
+                       guint scanline = cinfo2.output_scanline;
+                       image_loader_cr3_read_scanline(&cinfo2, &dptr2, rowstride);
+                       lj->area_updated_cb(loader, cinfo.output_width, scanline, cinfo2.output_width, cinfo2.rec_outbuf_height, lj->data);
+                       }
+               }
+
+       jpeg_finish_decompress(&cinfo);
+       jpeg_destroy_decompress(&cinfo);
+       if (lj->stereo)
+               {
+               jpeg_finish_decompress(&cinfo);
+               jpeg_destroy_decompress(&cinfo);
+               }
+
+       return TRUE;
+}
+
+static void image_loader_cr3_set_size(gpointer loader, int width, int height)
+{
+       ImageLoaderJpeg *lj = (ImageLoaderJpeg *) loader;
+       lj->requested_width = width;
+       lj->requested_height = height;
+}
+
+static GdkPixbuf* image_loader_cr3_get_pixbuf(gpointer loader)
+{
+       ImageLoaderJpeg *lj = (ImageLoaderJpeg *) loader;
+       return lj->pixbuf;
+}
+
+static gchar* image_loader_cr3_get_format_name(gpointer loader)
+{
+       return g_strdup("cr3");
+}
+static gchar** image_loader_cr3_get_format_mime_types(gpointer loader)
+{
+       static gchar *mime[] = {"image/x-canon-cr3", NULL};
+       return g_strdupv(mime);
+}
+
+static gboolean image_loader_cr3_close(gpointer loader, GError **error)
+{
+       return TRUE;
+}
+
+static void image_loader_cr3_abort(gpointer loader)
+{
+       ImageLoaderJpeg *lj = (ImageLoaderJpeg *) loader;
+       lj->abort = TRUE;
+}
+
+static void image_loader_cr3_free(gpointer loader)
+{
+       ImageLoaderJpeg *lj = (ImageLoaderJpeg *) loader;
+       if (lj->pixbuf) g_object_unref(lj->pixbuf);
+       g_free(lj);
+}
+
+
+void image_loader_backend_set_cr3(ImageLoaderBackend *funcs)
+{
+       funcs->loader_new = image_loader_cr3_new;
+       funcs->set_size = image_loader_cr3_set_size;
+       funcs->load = image_loader_cr3_load;
+       funcs->write = NULL;
+       funcs->get_pixbuf = image_loader_cr3_get_pixbuf;
+       funcs->close = image_loader_cr3_close;
+       funcs->abort = image_loader_cr3_abort;
+       funcs->free = image_loader_cr3_free;
+
+       funcs->get_format_name = image_loader_cr3_get_format_name;
+       funcs->get_format_mime_types = image_loader_cr3_get_format_mime_types;
+}
+
+
+
+#endif
+
+
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
diff --git a/src/image_load_cr3.h b/src/image_load_cr3.h
new file mode 100644 (file)
index 0000000..fc21b11
--- /dev/null
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2020 The Geeqie Team
+ *
+ * Author: Colin Clark
+ *
+ * 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 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 General Public License for more details.
+ *
+ * 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.
+ */
+
+#ifndef IMAGE_LOAD_CR3_H
+#define IMAGE_LOAD_CR3_H
+
+#ifdef HAVE_JPEG
+void image_loader_backend_set_cr3(ImageLoaderBackend *funcs);
+#endif
+
+#endif
+
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */