summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--Makethird35
-rw-r--r--docs/thirdparty.txt4
-rw-r--r--include/mupdf/fitz/compressed-buffer.h2
-rw-r--r--source/cbz/mucbz.c2
-rw-r--r--source/cbz/muimg.c7
-rw-r--r--source/fitz/load-jxr.c450
-rw-r--r--source/fitz/load-tiff.c1
8 files changed, 498 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 38758966..cb4f40ff 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,7 @@ LIBS += $(FREETYPE_LIBS)
LIBS += $(HARFBUZZ_LIBS)
LIBS += $(JBIG2DEC_LIBS)
LIBS += $(JPEG_LIBS)
+LIBS += $(JPEGXR_LIB)
LIBS += $(MUJS_LIBS)
LIBS += $(OPENJPEG_LIBS)
LIBS += $(OPENSSL_LIBS)
@@ -32,6 +33,7 @@ CFLAGS += $(FREETYPE_CFLAGS)
CFLAGS += $(HARFBUZZ_CFLAGS)
CFLAGS += $(JBIG2DEC_CFLAGS)
CFLAGS += $(JPEG_CFLAGS)
+CFLAGS += $(JPEGXR_CFLAGS)
CFLAGS += $(MUJS_CFLAGS)
CFLAGS += $(OPENJPEG_CFLAGS)
CFLAGS += $(OPENSSL_CFLAGS)
@@ -153,7 +155,7 @@ MUPDF_LIB = $(OUT)/libmupdf.a
THIRD_LIB = $(OUT)/libmupdfthird.a
MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(SVG_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ)
-THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(JPEG_OBJ) $(LURATECH_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ)
+THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(JPEG_OBJ) $(JPEGXR_OBJ) $(LURATECH_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ)
$(MUPDF_LIB) : $(MUPDF_OBJ)
$(THIRD_LIB) : $(THIRD_OBJ)
diff --git a/Makethird b/Makethird
index c1672f75..628c1054 100644
--- a/Makethird
+++ b/Makethird
@@ -14,6 +14,7 @@ MUJS_DIR := thirdparty/mujs
OPENJPEG_DIR := thirdparty/openjpeg/src/lib/openjp2
ZLIB_DIR := thirdparty/zlib
LURATECH_DIR := thirdparty/luratech
+JPEGXR_DIR := thirdparty/jpegxr
CURL_DIR := thirdparty/curl
GLFW_DIR := thirdparty/glfw
@@ -462,6 +463,40 @@ JPEG_CFLAGS := $(SYS_JPEG_CFLAGS) -DSHARE_JPEG
JPEG_LIBS := $(SYS_JPEG_LIBS)
endif
+# --- jpegxr ---
+
+ifneq "$(wildcard $(JPEGXR_DIR)/T835E.pdf)" ""
+
+JPEGXR_OUT := $(OUT)/jpegxr
+JPEGXR_SRC := \
+ algo.c \
+ api.c \
+ flags.c \
+ init.c \
+ io.c \
+ cr_parse.c \
+ jpegxr_pixelformat.c \
+ r_parse.c \
+ r_strip.c \
+ r_tile_spatial.c \
+ r_tile_frequency.c \
+ x_strip.c
+
+JPEGXR_OBJ := $(addprefix $(JPEGXR_OUT)/, $(JPEGXR_SRC:%.c=%.o))
+
+$(JPEGXR_OUT):
+ $(MKDIR_CMD)
+
+$(JPEGXR_OUT)/%.o: $(JPEGXR_DIR)/Software/%.c | $(JPEGXR_OUT)
+ $(CC_CMD) $(JPEGXR_CFLAGS)
+
+JPEGXR_CFLAGS := \
+ -I$(JPEGXR_DIR) \
+ -I$(JPEGXR_DIR)/Software \
+ -DHAVE_JPEGXR
+
+endif
+
# --- ZLIB ---
ifneq "$(wildcard $(ZLIB_DIR)/README)" ""
diff --git a/docs/thirdparty.txt b/docs/thirdparty.txt
index e8dce82b..5f7563ba 100644
--- a/docs/thirdparty.txt
+++ b/docs/thirdparty.txt
@@ -35,4 +35,8 @@ Luratech JP2 JPEG 2000 commercial http://www.luratech.com/
Luratech JBIG2 JBIG2 commercial http://www.luratech.com/
decoding
+JPEG-XR 1.8 JPEG-XR special https://www.itu.int/rec/T-REC-T.835/
+reference (with patches) decoding
+
+
NOTE: jbig2dec and mujs are included in "thirdparty" but are copyright Artifex Software Inc.
diff --git a/include/mupdf/fitz/compressed-buffer.h b/include/mupdf/fitz/compressed-buffer.h
index 1eef070d..ab9961bb 100644
--- a/include/mupdf/fitz/compressed-buffer.h
+++ b/include/mupdf/fitz/compressed-buffer.h
@@ -28,7 +28,7 @@ enum
FZ_IMAGE_LZW = 8,
FZ_IMAGE_PNG = 9,
FZ_IMAGE_TIFF = 10,
- FZ_IMAGE_JXR = 11, /* Placeholder until supported */
+ FZ_IMAGE_JXR = 11,
FZ_IMAGE_GIF = 12,
FZ_IMAGE_BMP = 13,
};
diff --git a/source/cbz/mucbz.c b/source/cbz/mucbz.c
index 0b7b4d10..f9c73d6b 100644
--- a/source/cbz/mucbz.c
+++ b/source/cbz/mucbz.c
@@ -6,7 +6,7 @@ typedef struct cbz_document_s cbz_document;
typedef struct cbz_page_s cbz_page;
static const char *cbz_ext_list[] = {
- ".jpg", ".jpeg", ".png", ".gif", ".bmp", ".tif", ".tiff", ".jpx", ".jp2", ".j2k",
+ ".jpg", ".jpeg", ".png", ".gif", ".bmp", ".tif", ".tiff", ".jpx", ".jp2", ".j2k", ".wdp", ".hdp", ".jxr",
NULL
};
diff --git a/source/cbz/muimg.c b/source/cbz/muimg.c
index 4e0f97df..91b89dfa 100644
--- a/source/cbz/muimg.c
+++ b/source/cbz/muimg.c
@@ -161,7 +161,8 @@ img_recognize(fz_context *doc, const char *magic)
!fz_strcasecmp(ext, ".jfif-tbnl") || !fz_strcasecmp(ext, ".jpe") ||
!fz_strcasecmp(ext, ".gif") || !fz_strcasecmp(ext, ".bmp") ||
!fz_strcasecmp(ext, ".jpx") || !fz_strcasecmp(ext, ".jp2") ||
- !fz_strcasecmp(ext, ".j2k"))
+ !fz_strcasecmp(ext, ".j2k") || !fz_strcasecmp(ext, ".wdp") ||
+ !fz_strcasecmp(ext, ".hdp") || !fz_strcasecmp(ext, ".jxr"))
return 100;
}
if (!strcmp(magic, "png") || !strcmp(magic, "image/png") ||
@@ -172,7 +173,9 @@ img_recognize(fz_context *doc, const char *magic)
!strcmp(magic, "bmp") || !strcmp(magic, "image/bmp") ||
!strcmp(magic, "jpx") || !strcmp(magic, "image/jpx") ||
!strcmp(magic, "jp2") || !strcmp(magic, "image/jp2") ||
- !strcmp(magic, "j2k"))
+ !strcmp(magic, "j2k") || !strcmp(magic, "wdp") ||
+ !strcmp(magic, "hdp") || !strcmp(magic, "image/vnd.ms-photo") ||
+ !strcmp(magic, "jxr") || !strcmp(magic, "image/jxr"))
return 100;
return 0;
diff --git a/source/fitz/load-jxr.c b/source/fitz/load-jxr.c
index c898ef18..c73d2d85 100644
--- a/source/fitz/load-jxr.c
+++ b/source/fitz/load-jxr.c
@@ -1,6 +1,452 @@
#include "mupdf/fitz.h"
-/* TODO: implement JPEG-XR support */
+#ifdef HAVE_JPEGXR
+
+#include <jpegxr.h>
+
+struct info
+{
+ fz_context *ctx;
+
+ float xres, yres;
+ int width, height;
+ int format;
+ int has_alpha;
+ int has_premul;
+
+ int comps, stride;
+ unsigned char *samples;
+ fz_colorspace *cspace;
+};
+
+static const char *
+jxr_error_string(int rc)
+{
+ switch (rc)
+ {
+ case JXR_EC_OK: return "No error";
+ default:
+ case JXR_EC_ERROR: return "Unspecified error";
+ case JXR_EC_BADMAGIC: return "Stream lacks proper magic number";
+ case JXR_EC_FEATURE_NOT_IMPLEMENTED: return "Feature not implemented";
+ case JXR_EC_IO: return "Error reading/writing data";
+ case JXR_EC_BADFORMAT: return "Bad file format";
+ }
+}
+
+struct {
+ jxrc_t_pixelFormat format;
+ int comps;
+} pixelformats[] = {
+ {JXRC_FMT_BlackWhite, 1},
+ {JXRC_FMT_8bppGray, 1},
+ {JXRC_FMT_16bppGray, 1},
+ {JXRC_FMT_16bppGrayFixedPoint, 1},
+ {JXRC_FMT_16bppGrayHalf, 1},
+ {JXRC_FMT_32bppGrayFixedPoint, 1},
+ {JXRC_FMT_32bppGrayFloat, 1},
+ {JXRC_FMT_16bppBGR555, 3},
+ {JXRC_FMT_16bppBGR565, 3},
+ {JXRC_FMT_24bppBGR, 3},
+ {JXRC_FMT_24bppRGB, 3},
+ {JXRC_FMT_32bppBGR101010, 3},
+ {JXRC_FMT_32bppBGRA, 3},
+ {JXRC_FMT_32bppBGR, 3},
+ {JXRC_FMT_32bppPBGRA, 3},
+ {JXRC_FMT_48bppRGBFixedPoint, 3},
+ {JXRC_FMT_48bppRGBHalf, 3},
+ {JXRC_FMT_48bppRGB, 3},
+ {JXRC_FMT_64bppPRGBA, 3},
+ {JXRC_FMT_64bppRGBAFixedPoint, 3},
+ {JXRC_FMT_64bppRGBAHalf, 3},
+ {JXRC_FMT_64bppRGBA, 3},
+ {JXRC_FMT_64bppRGBFixedPoint, 3},
+ {JXRC_FMT_64bppRGBHalf, 3},
+ {JXRC_FMT_96bppRGBFixedPoint, 3},
+ {JXRC_FMT_128bppPRGBAFloat, 3},
+ {JXRC_FMT_128bppRGBAFixedPoint, 3},
+ {JXRC_FMT_128bppRGBAFloat, 3},
+ {JXRC_FMT_128bppRGBFixedPoint, 3},
+ {JXRC_FMT_128bppRGBFloat, 3},
+ {JXRC_FMT_32bppRGBE, 3},
+ {JXRC_FMT_32bppCMYK, 4},
+ {JXRC_FMT_40bppCMYKAlpha, 4},
+ {JXRC_FMT_64bppCMYK, 4},
+ {JXRC_FMT_80bppCMYKAlpha, 4},
+ {JXRC_FMT_24bpp3Channels, 3},
+ {JXRC_FMT_32bpp3ChannelsAlpha, 3},
+ {JXRC_FMT_32bpp4Channels, 4},
+ {JXRC_FMT_40bpp4ChannelsAlpha, 4},
+ {JXRC_FMT_40bpp5Channels, 5},
+ {JXRC_FMT_48bpp3Channels, 3},
+ {JXRC_FMT_48bpp5ChannelsAlpha, 5},
+ {JXRC_FMT_48bpp6Channels, 6},
+ {JXRC_FMT_56bpp6ChannelsAlpha, 6},
+ {JXRC_FMT_56bpp7Channels, 7},
+ {JXRC_FMT_64bpp3ChannelsAlpha, 3},
+ {JXRC_FMT_64bpp4Channels, 4},
+ {JXRC_FMT_64bpp7ChannelsAlpha, 7},
+ {JXRC_FMT_64bpp8Channels, 8},
+ {JXRC_FMT_72bpp8ChannelsAlpha, 8},
+ {JXRC_FMT_80bpp4ChannelsAlpha, 4},
+ {JXRC_FMT_80bpp5Channels, 5},
+ {JXRC_FMT_96bpp5ChannelsAlpha, 5},
+ {JXRC_FMT_96bpp6Channels, 6},
+ {JXRC_FMT_112bpp6ChannelsAlpha, 6},
+ {JXRC_FMT_112bpp7Channels, 7},
+ {JXRC_FMT_128bpp7ChannelsAlpha, 7},
+ {JXRC_FMT_128bpp8Channels, 8},
+ {JXRC_FMT_144bpp8ChannelsAlpha, 8},
+};
+
+static inline float
+float32_from_int32_bits(int v)
+{
+ return *((float*) &v);
+}
+
+static inline float
+float32_from_float16(int v)
+{
+ int s = (v >> 15) & 0x1;
+ int e = (v >> 10) & 0x1f;
+ int m = (v >> 0) & 0x3ff;
+ int i = (s << 31) | ((e - 15 + 127) << 23) | (m << 13);
+ return float32_from_int32_bits(i);
+}
+
+static inline float
+sRGB_from_scRGB(float v)
+{
+ if (v <= 0.0031308f)
+ return v * 12.92f;
+ return 1.055f * powf(v, 1.0f / 2.4f) - 0.055f;
+}
+
+static inline void
+jxr_unpack_sample(fz_context *ctx, struct info *info, jxr_image_t image, int *sp, unsigned char *dp)
+{
+ int k, bpc, comps, alpha;
+ float v;
+
+ if (info->format == JXRC_FMT_32bppRGBE)
+ {
+ dp[0] = sRGB_from_scRGB(ldexpf(sp[0], sp[3] - 128 - 8)) * 255 + 0.5f;
+ dp[1] = sRGB_from_scRGB(ldexpf(sp[1], sp[3] - 128 - 8)) * 255 + 0.5f;
+ dp[2] = sRGB_from_scRGB(ldexpf(sp[2], sp[3] - 128 - 8)) * 255 + 0.5f;
+ return;
+ }
+ if (info->format == JXRC_FMT_16bppBGR565)
+ {
+ dp[0] = sp[0] << 3;
+ dp[1] = sp[1] << 2;
+ dp[2] = sp[2] << 3;
+ return;
+ }
+
+ comps = fz_mini(info->cspace->n, jxr_get_IMAGE_CHANNELS(image));
+ alpha = jxr_get_ALPHACHANNEL_FLAG(image);
+ bpc = jxr_get_CONTAINER_BPC(image);
+
+ for (k = 0; k < comps + alpha; k++)
+ {
+ switch (bpc)
+ {
+ default: fz_throw(ctx, FZ_ERROR_GENERIC, "unknown sample type: %d", bpc);
+ case JXR_BD1WHITE1: dp[k] = sp[k] ? 255 : 0; break;
+ case JXR_BD1BLACK1: dp[k] = sp[k] ? 0 : 255; break;
+ case JXR_BD5: dp[k] = sp[k] << 3; break;
+ case JXR_BD8: dp[k] = sp[k]; break;
+ case JXR_BD10: dp[k] = sp[k] >> 2; break;
+ case JXR_BD16: dp[k] = sp[k] >> 8; break;
+
+ case JXR_BD16S:
+ v = sp[k] * (1.0f / (1 << 13));
+ goto decode_float32;
+ case JXR_BD32S:
+ v = sp[k] * (1.0f / (1 << 24));
+ goto decode_float32;
+ case JXR_BD16F:
+ v = float32_from_float16(sp[k]);
+ goto decode_float32;
+ case JXR_BD32F:
+ v = float32_from_int32_bits(sp[k]);
+ goto decode_float32;
+ decode_float32:
+ if (k < comps)
+ dp[k] = sRGB_from_scRGB(fz_clamp(v, 0, 1)) * 255 + 0.5f;
+ else
+ dp[k] = fz_clamp(v, 0, 1) * 255 + 0.5f;
+ break;
+ }
+ }
+}
+
+static inline void
+jxr_unpack_alpha_sample(fz_context *ctx, struct info *info, jxr_image_t image, int *sp, unsigned char *dp)
+{
+ int bpc = jxr_get_CONTAINER_BPC(image);
+ switch (bpc)
+ {
+ default: fz_throw(ctx, FZ_ERROR_GENERIC, "unknown alpha sample type: %d", bpc);
+ case JXR_BD8: dp[0] = sp[0]; break;
+ case JXR_BD10: dp[0] = sp[0] >> 2; break;
+ case JXR_BD16: dp[0] = sp[0] >> 8; break;
+
+ case JXR_BD16S:
+ dp[0] = fz_clamp(sp[0] * (1.0f / (1 << 13)), 0, 1) * 255 + 0.5f;
+ break;
+ case JXR_BD32S:
+ dp[0] = fz_clamp(sp[0] * (1.0f / (1 << 24)), 0, 1) * 255 + 0.5f;
+ break;
+ case JXR_BD16F:
+ dp[0] = fz_clamp(float32_from_float16(sp[0]), 0, 1) * 255 + 0.5f;
+ break;
+ case JXR_BD32F:
+ dp[0] = fz_clamp(float32_from_int32_bits(sp[0]), 0, 1) * 255 + 0.5f;
+ break;
+ }
+}
+
+static void
+jxr_decode_block(jxr_image_t image, int mx, int my, int *data)
+{
+ struct info *info = jxr_get_user_data(image);
+ fz_context *ctx = info->ctx;
+ unsigned char *p;
+ int x, y;
+
+ mx *= 16;
+ my *= 16;
+
+ for (y = 0; y < 16; y++)
+ {
+ if ((my + y) >= info->height)
+ return;
+
+ p = info->samples + (my + y) * info->stride + mx * (info->cspace->n + 1);
+
+ for (x = 0; x < 16; x++)
+ {
+ if ((mx + x) < info->width)
+ {
+ jxr_unpack_sample(ctx, info, image, data, p);
+ p += info->cspace->n + 1;
+ }
+
+ data += jxr_get_IMAGE_CHANNELS(image) + jxr_get_ALPHACHANNEL_FLAG(image);
+ data += (info->format == JXRC_FMT_32bppRGBE ? 1 : 0);
+ }
+ }
+}
+
+static void
+jxr_decode_block_alpha(jxr_image_t image, int mx, int my, int *data)
+{
+ struct info *info = jxr_get_user_data(image);
+ fz_context *ctx = info->ctx;
+ unsigned char *p;
+ int x, y;
+
+ mx *= 16;
+ my *= 16;
+
+ for (y = 0; y < 16; y++)
+ {
+ if ((my + y) >= info->height)
+ return;
+
+ p = info->samples + (my + y) * info->stride + mx * (info->cspace->n + 1);
+
+ for (x = 0; x < 16; x++)
+ {
+ if ((mx + x) < info->width)
+ {
+ jxr_unpack_alpha_sample(ctx, info, image, data, p + info->cspace->n);
+ p += info->cspace->n + 1;
+ }
+
+ data++;
+ }
+ }
+}
+
+static void
+jxr_read_image(fz_context *ctx, unsigned char *data, int size, struct info *info, int only_metadata)
+{
+ jxr_container_t container;
+ jxr_image_t image = NULL;
+ jxr_image_t alpha = NULL;
+ int rc, i;
+
+ fz_try(ctx)
+ {
+ container = jxr_create_container();
+
+ rc = jxr_read_image_container_memory(container, data, size);
+ if (rc < 0)
+ fz_throw(ctx, FZ_ERROR_GENERIC, "cannot read jxr image container: %s", jxr_error_string(rc));
+
+ info->xres = jxrc_width_resolution(container, 0);
+ info->yres = jxrc_height_resolution(container, 0);
+ info->width = jxrc_image_width(container, 0);
+ info->height = jxrc_image_height(container, 0);
+
+ info->format = jxrc_image_pixelformat(container, 0);
+
+ for (i = 0; i < nelem(pixelformats); i++)
+ if (pixelformats[i].format == info->format)
+ {
+ info->comps = pixelformats[i].comps;
+ break;
+ }
+ if (i == nelem(pixelformats))
+ fz_throw(ctx, FZ_ERROR_GENERIC, "unsupported pixel format: %u", info->format);
+
+ if (info->comps == 1)
+ info->cspace = fz_device_gray(ctx);
+ else if (info->comps == 3)
+ info->cspace = fz_device_rgb(ctx);
+ else if (info->comps >= 4)
+ info->cspace = fz_device_cmyk(ctx);
+
+ info->stride = info->width * (info->cspace->n + 1);
+
+ if (!only_metadata)
+ {
+ unsigned long image_offset;
+ unsigned char image_band;
+ unsigned long alpha_offset;
+ unsigned char alpha_band;
+
+ info->ctx = ctx;
+ info->samples = fz_malloc(ctx, info->stride * info->height);
+ memset(info->samples, 0xff, info->stride * info->height);
+
+ image_offset = jxrc_image_offset(container, 0);
+ image_band = jxrc_image_band_presence(container, 0);
+ alpha_offset = jxrc_alpha_offset(container, 0);
+ alpha_band = jxrc_alpha_band_presence(container, 0);
+
+ image = jxr_create_input();
+
+ jxr_set_PROFILE_IDC(image, 111);
+ jxr_set_LEVEL_IDC(image, 255);
+ jxr_set_pixel_format(image, info->format);
+ jxr_set_container_parameters(image, info->format,
+ info->width, info->height, alpha_offset,
+ image_band, alpha_band, 0);
+
+ jxr_set_user_data(image, info);
+ jxr_set_block_output(image, jxr_decode_block);
+
+ rc = jxr_read_image_bitstream_memory(image, data + image_offset, size - image_offset);
+ if (rc < 0)
+ fz_throw(ctx, FZ_ERROR_GENERIC, "cannot read jxr image: %s", jxr_error_string(rc));
+
+ if (info->format == JXRC_FMT_32bppPBGRA ||
+ info->format == JXRC_FMT_64bppPRGBA ||
+ info->format == JXRC_FMT_128bppPRGBAFloat)
+ info->has_premul = 1;
+
+ if (jxr_get_ALPHACHANNEL_FLAG(image))
+ info->has_alpha = 1;
+
+ if (alpha_offset > 0)
+ {
+ info->has_alpha = 1;
+
+ alpha = jxr_create_input();
+
+ jxr_set_PROFILE_IDC(alpha, 111);
+ jxr_set_LEVEL_IDC(alpha, 255);
+ jxr_set_pixel_format(alpha, info->format);
+ jxr_set_container_parameters(alpha, info->format,
+ info->width, info->height, alpha_offset,
+ image_band, alpha_band, 1);
+
+ jxr_set_user_data(alpha, info);
+ jxr_set_block_output(alpha, jxr_decode_block_alpha);
+
+ rc = jxr_read_image_bitstream_memory(alpha, data + alpha_offset, size - alpha_offset);
+ if (rc < 0)
+ fz_throw(ctx, FZ_ERROR_GENERIC, "cannot read jxr image: %s", jxr_error_string(rc));
+ }
+ }
+ }
+ fz_always(ctx)
+ {
+ if (alpha)
+ jxr_destroy(alpha);
+ if (image)
+ jxr_destroy(image);
+ jxr_destroy_container(container);
+ }
+ fz_catch(ctx)
+ {
+ fz_rethrow(ctx);
+ }
+}
+
+fz_pixmap *
+fz_load_jxr(fz_context *ctx, unsigned char *data, size_t size)
+{
+ struct info info = { 0 };
+ fz_pixmap *image;
+
+ jxr_read_image(ctx, data, size, &info, 0);
+
+ fz_try(ctx)
+ {
+ image = fz_new_pixmap(ctx, info.cspace, info.width, info.height, 1);
+ image->xres = info.xres;
+ image->yres = info.yres;
+
+ fz_unpack_tile(ctx, image, info.samples, info.cspace->n + 1, 8, info.stride, 0);
+
+ if (info.has_alpha && !info.has_premul)
+ {
+ if (info.comps >= 4)
+ {
+ fz_pixmap *rgb = fz_new_pixmap(ctx, fz_device_rgb(ctx), image->w, image->h, 1);
+ fz_convert_pixmap(ctx, rgb, image);
+ rgb->xres = image->xres;
+ rgb->yres = image->yres;
+ fz_drop_pixmap(ctx, image);
+ image = rgb;
+ }
+ fz_premultiply_pixmap(ctx, image);
+ }
+ }
+ fz_always(ctx)
+ {
+ if (info.samples)
+ fz_free(ctx, info.samples);
+ if (info.cspace)
+ fz_drop_colorspace(ctx, info.cspace);
+ }
+ fz_catch(ctx)
+ {
+ fz_rethrow(ctx);
+ }
+
+ return image;
+}
+
+void
+fz_load_jxr_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int *hp, int *xresp, int *yresp, fz_colorspace **cspacep)
+{
+ struct info info = { 0 };
+
+ jxr_read_image(ctx, data, size, &info, 1);
+
+ *xresp = info.xres;
+ *yresp = info.yres;
+ *wp = info.width;
+ *hp = info.height;
+ *cspacep = info.cspace;
+}
+#else /* HAVE_JPEGXR */
fz_pixmap *
fz_load_jxr(fz_context *ctx, unsigned char *data, size_t size)
@@ -13,3 +459,5 @@ fz_load_jxr_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int
{
fz_throw(ctx, FZ_ERROR_GENERIC, "JPEG-XR codec is not available");
}
+
+#endif /* HAVE_JPEGXR */
diff --git a/source/fitz/load-tiff.c b/source/fitz/load-tiff.c
index 821b64e1..8f4c2629 100644
--- a/source/fitz/load-tiff.c
+++ b/source/fitz/load-tiff.c
@@ -791,7 +791,6 @@ fz_decode_tiff_header(fz_context *ctx, struct tiff *tiff, unsigned char *buf, si
*/
/* get byte order marker */
- tiff->order = TII;
tiff->order = readshort(tiff);
if (tiff->order != TII && tiff->order != TMM)
fz_throw(ctx, FZ_ERROR_GENERIC, "not a TIFF file, wrong magic marker");