summaryrefslogtreecommitdiff
path: root/gdk-pixbuf
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2020-04-01 16:25:26 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2020-06-26 17:26:20 +0100
commit4a278c66bd4f688e5c5a069e9eeba654168c998a (patch)
tree9d3fe0ebaf4d8c48a35aee13c3977a03d577cbec /gdk-pixbuf
parent79798c0aafe5f2e3cb1546696e2a353f403a200d (diff)
downloadgdk-pixbuf-4a278c66bd4f688e5c5a069e9eeba654168c998a.tar.gz
Remove the libjasper-based JPEG2000 loader
Libjasper is not really maintained any more, and has been dropped by various Linux distributions over the years. GdkPixbuf has not enabled the JPEG2000 loader by default in many years, relying on downstream distributors to do so if they also shipped libjasper. This means that it's unlikely anybody has relied on GdkPixbuf to load a JPEG2000 image for the past 3 to 5 years, if at all. The only other option for loading JPEG2000 images is to use OpenJPEG, and for that there is an out of tree GdkPixbuf module available: https://notabug.org/necklace/jp2-pixbuf-loader Fixes: #152, #137
Diffstat (limited to 'gdk-pixbuf')
-rw-r--r--gdk-pixbuf/gdk-pixbuf-io.c7
-rw-r--r--gdk-pixbuf/io-jasper.c344
-rw-r--r--gdk-pixbuf/meson.build1
3 files changed, 0 insertions, 352 deletions
diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index ce0ed633f..58bb74879 100644
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -649,9 +649,6 @@ gdk_pixbuf_io_init_builtin (void)
#ifdef INCLUDE_icns
load_one_builtin_module (icns);
#endif
-#ifdef INCLUDE_jasper
- load_one_builtin_module (jasper);
-#endif
#ifdef INCLUDE_qtif
load_one_builtin_module (qtif);
#endif
@@ -704,7 +701,6 @@ module (bmp);
module (xbm);
module (tga);
module (icns);
-module (jasper);
module (qtif);
module (gdip_ico);
module (gdip_wmf);
@@ -785,9 +781,6 @@ gdk_pixbuf_load_module_unlocked (GdkPixbufModule *image_module,
#ifdef INCLUDE_icns
try_module (icns,icns);
#endif
-#ifdef INCLUDE_jasper
- try_module (jasper,jasper);
-#endif
#ifdef INCLUDE_qtif
try_module (qtif,qtif);
#endif
diff --git a/gdk-pixbuf/io-jasper.c b/gdk-pixbuf/io-jasper.c
deleted file mode 100644
index 103ac0a80..000000000
--- a/gdk-pixbuf/io-jasper.c
+++ /dev/null
@@ -1,344 +0,0 @@
-/* JPEG 2000 loader
- *
- * Copyright (c) 2007 Bastien Nocera <hadess@hadess.net>
- * Inspired by work by Ben Karel <web+moz@eschew.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-#include <jasper/jasper.h>
-
-#include <glib/gi18n-lib.h>
-#include "gdk-pixbuf-io.h"
-
-G_MODULE_EXPORT void fill_vtable (GdkPixbufModule * module);
-G_MODULE_EXPORT void fill_info (GdkPixbufFormat * info);
-
-struct jasper_context {
- GdkPixbuf *pixbuf;
-
- GdkPixbufModuleSizeFunc size_func;
- GdkPixbufModuleUpdatedFunc updated_func;
- GdkPixbufModulePreparedFunc prepared_func;
- gpointer user_data;
-
- jas_stream_t *stream;
-
- int width, height;
-};
-
-static void
-free_jasper_context (struct jasper_context *context)
-{
- if (!context)
- return;
-
- if (context->stream) {
- jas_stream_close (context->stream);
- context->stream = NULL;
- }
-
- g_free (context);
-}
-
-static gpointer
-jasper_image_begin_load (GdkPixbufModuleSizeFunc size_func,
- GdkPixbufModulePreparedFunc prepared_func,
- GdkPixbufModuleUpdatedFunc updated_func,
- gpointer user_data, GError **error)
-{
- struct jasper_context *context;
- jas_stream_t *stream;
-
- g_assert (size_func != NULL);
- g_assert (prepared_func != NULL);
- g_assert (updated_func != NULL);
-
- jas_init ();
-
- stream = jas_stream_memopen (NULL, 0);
- if (!stream) {
- g_set_error_literal (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
- _("Couldn’t allocate memory for stream"));
- return NULL;
- }
-
- context = g_new0 (struct jasper_context, 1);
- if (!context)
- return NULL;
-
- context->size_func = size_func;
- context->updated_func = updated_func;
- context->prepared_func = prepared_func;
- context->user_data = user_data;
- context->width = context->height = -1;
-
- context->stream = stream;
-
- return context;
-}
-
-static const char *
-colourspace_to_str (int c)
-{
- switch (c) {
- case JAS_CLRSPC_FAM_UNKNOWN:
- return "Unknown";
- case JAS_CLRSPC_FAM_XYZ:
- return "XYZ";
- case JAS_CLRSPC_FAM_LAB:
- return "LAB";
- case JAS_CLRSPC_FAM_GRAY:
- return "GRAY";
- case JAS_CLRSPC_FAM_RGB:
- return "RGB";
- case JAS_CLRSPC_FAM_YCBCR:
- return "YCbCr";
- default:
- return "Invalid";
- }
-}
-
-static gboolean
-jasper_image_try_load (struct jasper_context *context, GError **error)
-{
- jas_image_t *raw_image, *image;
- int num_components, colourspace_family;
- int i, rowstride, shift;
- guchar *pixels;
-
- raw_image = jas_image_decode (context->stream, -1, 0);
- if (!raw_image) {
- g_set_error_literal (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
- _("Couldn’t decode image"));
- return FALSE;
- }
-
- if (context->width == -1 && context->height == -1) {
- int width, height;
-
- context->width = width = jas_image_cmptwidth (raw_image, 0);
- context->height = height = jas_image_cmptheight (raw_image, 0);
-
- (*context->size_func) (&width, &height, context->user_data);
-
- if (width == 0 || height == 0) {
- jas_image_destroy(raw_image);
- g_set_error_literal (error,
- GDK_PIXBUF_ERROR,
- GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
- _("Transformed JPEG2000 has zero width or height"));
- return FALSE;
- }
- }
-
- /* We only know how to handle grayscale and RGB images */
- num_components = jas_image_numcmpts (raw_image);
- colourspace_family = jas_clrspc_fam (jas_image_clrspc (raw_image));
-
- if ((num_components != 3 && num_components != 4 && num_components != 1) ||
- (colourspace_family != JAS_CLRSPC_FAM_RGB && colourspace_family != JAS_CLRSPC_FAM_GRAY)) {
- jas_image_destroy (raw_image);
- g_debug ("Unsupported colourspace %s (num components: %d)",
- colourspace_to_str (colourspace_family), num_components);
- g_set_error_literal (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_UNKNOWN_TYPE,
- _("Image type currently not supported"));
- return FALSE;
- }
-
- /* Apply the colour profile to the image, creating a new one */
- if (jas_image_clrspc (raw_image) != JAS_CLRSPC_SRGB) {
- jas_cmprof_t *profile;
-
- profile = jas_cmprof_createfromclrspc (JAS_CLRSPC_SRGB);
- if (!profile) {
- jas_image_destroy (raw_image);
- g_set_error_literal (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
- _("Couldn’t allocate memory for color profile"));
- return FALSE;
- }
-
- image = jas_image_chclrspc (raw_image, profile, JAS_CMXFORM_INTENT_PER);
- if (!image) {
- jas_image_destroy (raw_image);
- g_set_error_literal (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
- _("Couldn’t allocate memory for color profile"));
- return FALSE;
- }
- } else {
- image = raw_image;
- }
-
- if (!context->pixbuf) {
- int bits_per_sample;
-
- /* Unfortunately, gdk-pixbuf doesn't support 16 bpp images
- * bits_per_sample = jas_image_cmptprec (image, 0);
- if (bits_per_sample < 8)
- bits_per_sample = 8;
- else if (bits_per_sample > 8)
- bits_per_sample = 16;
- */
- bits_per_sample = 8;
-
- context->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
- FALSE, bits_per_sample,
- context->width, context->height);
- if (context->pixbuf == NULL) {
- g_set_error_literal (error,
- GDK_PIXBUF_ERROR,
- GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
- _("Insufficient memory to open JPEG 2000 file"));
- return FALSE;
- }
- context->prepared_func (context->pixbuf, NULL, context->user_data);
- }
-
- /* We calculate how much we should shift the pixel
- * data by to make it fit into our pixbuf */
- shift = MAX (jas_image_cmptprec (image, 0) - gdk_pixbuf_get_bits_per_sample (context->pixbuf), 0);
-
- /* Loop over the 3 colourspaces */
- rowstride = gdk_pixbuf_get_rowstride (context->pixbuf);
- pixels = gdk_pixbuf_get_pixels (context->pixbuf);
-
- for (i = 0; i < num_components; i++) {
- jas_matrix_t *matrix;
- int j;
-
- matrix = jas_matrix_create (context->height, context->width);
-
- if (matrix == NULL) {
- g_set_error_literal (error,
- GDK_PIXBUF_ERROR,
- GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
- _("Insufficient memory to open JPEG 2000 file"));
- return FALSE;
- }
-
- /* in libjasper, R is 0, G is 1, etc. we're lucky :)
- * but we need to handle the "opacity" channel ourselves */
- if (i != 4) {
- jas_image_readcmpt (image, i, 0, 0, context->width, context->height, matrix);
- } else {
- jas_image_readcmpt (image, JAS_IMAGE_CT_OPACITY, 0, 0, context->width, context->height, matrix);
- }
-
- for (j = 0; j < context->height; j++) {
- int k;
-
- for (k = 0; k < context->width; k++) {
- if (num_components == 3 || num_components == 4) {
- pixels[j * rowstride + k * 3 + i] = jas_matrix_get (matrix, j, k) >> shift;
- } else {
- pixels[j * rowstride + k * 3] =
- pixels[j * rowstride + k * 3 + 1] =
- pixels[j * rowstride + k * 3 + 2] = jas_matrix_get (matrix, j, k) >> shift;
- }
- }
- /* Update once per line for the last component, otherwise
- * we might contain garbage */
- if ((i == num_components - 1) && k != 0) {
- context->updated_func (context->pixbuf, 0, j, k, 1, context->user_data);
- }
- }
-
- jas_matrix_destroy (matrix);
- }
-
- if (image != raw_image)
- jas_image_destroy (image);
- jas_image_destroy (raw_image);
-
- return TRUE;
-}
-
-static gboolean
-jasper_image_stop_load (gpointer data, GError **error)
-{
- struct jasper_context *context = (struct jasper_context *) data;
- gboolean ret;
-
- jas_stream_rewind (context->stream);
- ret = jasper_image_try_load (context, error);
-
- free_jasper_context (context);
-
- return ret;
-}
-
-static gboolean
-jasper_image_load_increment (gpointer data, const guchar *buf, guint size, GError **error)
-{
- struct jasper_context *context = (struct jasper_context *) data;
-
- if (jas_stream_write (context->stream, buf, size) < 0) {
- g_set_error_literal (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
- _("Couldn’t allocate memory to buffer image data"));
- return FALSE;
- }
-
- return TRUE;
-}
-
-#ifndef INCLUDE_jasper
-#define MODULE_ENTRY(function) G_MODULE_EXPORT void function
-#else
-#define MODULE_ENTRY(function) void _gdk_pixbuf__jasper_ ## function
-#endif
-
-MODULE_ENTRY (fill_vtable) (GdkPixbufModule * module)
-{
- module->begin_load = jasper_image_begin_load;
- module->stop_load = jasper_image_stop_load;
- module->load_increment = jasper_image_load_increment;
-}
-
-MODULE_ENTRY (fill_info) (GdkPixbufFormat * info)
-{
- static const GdkPixbufModulePattern signature[] = {
- { " jP", "!!!! ", 100 }, /* file begins with 'jP' at offset 4 */
- { "\xff\x4f\xff\x51\x00", NULL, 100 }, /* file starts with FF 4F FF 51 00 */
- { NULL, NULL, 0 }
- };
- static const gchar *mime_types[] = {
- "image/jp2",
- "image/jpeg2000",
- "image/jpx",
- NULL
- };
- static const gchar *extensions[] = {
- "jp2",
- "jpc",
- "jpx",
- "j2k",
- "jpf",
- NULL
- };
-
- info->name = "jpeg2000";
- info->signature = (GdkPixbufModulePattern *) signature;
- info->description = NC_("image format", "JPEG 2000");
- info->mime_types = (gchar **) mime_types;
- info->extensions = (gchar **) extensions;
- info->flags = GDK_PIXBUF_FORMAT_THREADSAFE;
- info->license = "LGPL";
- info->disabled = FALSE;
-}
-
diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
index 12f6ddbb1..fdf98da52 100644
--- a/gdk-pixbuf/meson.build
+++ b/gdk-pixbuf/meson.build
@@ -20,7 +20,6 @@ loaders = [
[ 'xbm', [ 'io-xbm.c' ] ],
[ 'tga', [ 'io-tga.c', 'gdk-pixbuf-buffer-queue.c' ] ],
[ 'icns', [ 'io-icns.c' ] ],
- [ 'jasper', [ 'io-jasper.c' ], enabled_loaders.contains('jasper'), jasper_extra_cflags ],
[ 'qtif', [ 'io-qtif.c' ] ]
]