summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/msvclib.mak2
-rw-r--r--base/tiff.mak2
-rw-r--r--configure.ac6
-rw-r--r--gpdl/gpdl.mak28
-rw-r--r--gpdl/tifftop.c126
-rw-r--r--psi/msvc.mak2
6 files changed, 136 insertions, 30 deletions
diff --git a/base/msvclib.mak b/base/msvclib.mak
index 48243216a..99a85dea7 100644
--- a/base/msvclib.mak
+++ b/base/msvclib.mak
@@ -384,7 +384,7 @@ TIFFSRCDIR=tiff$(D)
TIFFCONFDIR=$(TIFFSRCDIR)
TIFFCONFIG_SUFFIX=.vc
TIFFPLATFORM=win32
-TIFFCFLAGS="-DJPEG_LIB_MK1_OR_12BIT=0"
+TIFF_CFLAGS=-DJPEG_SUPPORT -DOJPEG_SUPPORT -DJPEG_LIB_MK1_OR_12BIT=0
!endif
# Define which jbig2 library to use
diff --git a/base/tiff.mak b/base/tiff.mak
index 404e1809d..dec0e65ef 100644
--- a/base/tiff.mak
+++ b/base/tiff.mak
@@ -129,7 +129,7 @@ $(TIFFOBJ)tif_next.$(OBJ) : $(TIFFSRC)/libtiff/tif_next.c $(TIFFDEP)
$(TIFFCC) $(TIFFO_)tif_next.$(OBJ) $(C_) $(TIFFSRC)/libtiff/tif_next.c
$(TIFFOBJ)tif_ojpeg.$(OBJ) : $(TIFFSRC)/libtiff/tif_ojpeg.c $(jconfig_h) $(TIFFDEP)
- $(TIFFCC) $(TIFFO_)tif_ojpeg.$(OBJ) $(C_) $(TIFFSRC)/libtiff/tif_ojpeg.c
+ $(TIFFCC) $(I_)$(GLI_) $(TIFFO_)tif_ojpeg.$(OBJ) $(C_) $(TIFFSRC)/libtiff/tif_ojpeg.c
$(TIFFOBJ)tif_open.$(OBJ) : $(TIFFSRC)/libtiff/tif_open.c $(TIFFDEP)
$(TIFFCC) $(TIFFO_)tif_open.$(OBJ) $(C_) $(TIFFSRC)/libtiff/tif_open.c
diff --git a/configure.ac b/configure.ac
index b29b08ab2..89682ee6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1446,10 +1446,8 @@ if test x"$SHARE_LIBTIFF" = x"0" ; then
TIFFCFLAGS="-Wno-write-strings $CFLAGS_NMI $CFLAGS_NUD -DJPEG_LIB_MK1_OR_12BIT=0"
fi
# if we're building with our own libjpeg, or we have another libjpeg available, allow jpeg compression in TIFF
- if test x"$TIFF_JPEG_INCLUDE" != x"src" ; then
- TIFFCFLAGS="-DJPEG_SUPPORT -DJPEG_LIB_MK1_OR_12BIT=0 -I$TIFF_JPEG_INCLUDE $TIFFCFLAGS"
- elif test x"$SHARE_LIBJPEG" = x"1" ; then
- TIFFCFLAGS="-DJPEG_SUPPORT -DJPEG_LIB_MK1_OR_12BIT=0 $TIFFCFLAGS"
+ if test x"$SHARE_LIBJPEG" = x"1" ; then
+ TIFFCFLAGS="-DJPEG_SUPPORT -DOJPEG_SUPPORT -DJPEG_LIB_MK1_OR_12BIT=0 $TIFFCFLAGS"
fi
echo
diff --git a/gpdl/gpdl.mak b/gpdl/gpdl.mak
index 369541555..e29c53a7b 100644
--- a/gpdl/gpdl.mak
+++ b/gpdl/gpdl.mak
@@ -25,27 +25,27 @@ GPDLO_=$(O_)$(GPDLOBJ)
GLGEN=$(GLGENDIR)$(D)
GPDL_PSI_TOP_OBJ_FILE=psitop.$(OBJ)
-GPDL_PSI_TOP_OBJ=$(GPDLOBJ)/$(GPDL_PSI_TOP_OBJ_FILE)
+GPDL_PSI_TOP_OBJ=$(GPDLOBJ)$(GPDL_PSI_TOP_OBJ_FILE)
GPDL_URF_TOP_OBJ_FILE=urftop.$(OBJ)
GPDL_JPG_TOP_OBJ_FILE=jpgtop.$(OBJ)
-GPDL_JPG_TOP_OBJ=$(GPDLOBJ)/$(GPDL_JPG_TOP_OBJ_FILE)
+GPDL_JPG_TOP_OBJ=$(GPDLOBJ)$(GPDL_JPG_TOP_OBJ_FILE)
GPDL_PWG_TOP_OBJ_FILE=pwgtop.$(OBJ)
-GPDL_PWG_TOP_OBJ=$(GPDLOBJ)/$(GPDL_PWG_TOP_OBJ_FILE)
+GPDL_PWG_TOP_OBJ=$(GPDLOBJ)$(GPDL_PWG_TOP_OBJ_FILE)
GPDL_TIFF_TOP_OBJ_FILE=tifftop.$(OBJ)
-GPDL_TIFF_TOP_OBJ=$(GPDLOBJ)/$(GPDL_TIFF_TOP_OBJ_FILE)
+GPDL_TIFF_TOP_OBJ=$(GPDLOBJ)$(GPDL_TIFF_TOP_OBJ_FILE)
GPDL_JBIG2_TOP_OBJ_FILE=jbig2top.$(OBJ)
-GPDL_JBIG2_TOP_OBJ=$(GPDLOBJ)/$(GPDL_JBIG2_TOP_OBJ_FILE)
+GPDL_JBIG2_TOP_OBJ=$(GPDLOBJ)$(GPDL_JBIG2_TOP_OBJ_FILE)
GPDL_JP2K_TOP_OBJ_FILE=jp2ktop.$(OBJ)
-GPDL_JP2K_TOP_OBJ=$(GPDLOBJ)/$(GPDL_JP2K_TOP_OBJ_FILE)
+GPDL_JP2K_TOP_OBJ=$(GPDLOBJ)$(GPDL_JP2K_TOP_OBJ_FILE)
GPDL_PNG_TOP_OBJ_FILE=pngtop.$(OBJ)
-GPDL_PNG_TOP_OBJ=$(GPDLOBJ)/$(GPDL_PNG_TOP_OBJ_FILE)
+GPDL_PNG_TOP_OBJ=$(GPDLOBJ)$(GPDL_PNG_TOP_OBJ_FILE)
GPDL_PSI_TOP_OBJS=\
$(GPDL_PNG_TOP_OBJ)\
@@ -110,10 +110,18 @@ $(GPDL_PWG_TOP_OBJ): $(GPDLSRC)pwgtop.c $(AK)\
$(spwgx_h) $(pltop_h) $(gsicc_manage_h) $(gspaint_h) $(plmain_h)
$(GPDLCC) $(GPDLSRC)pwgtop.c $(GPDLO_)$(GPDL_PWG_TOP_OBJ_FILE)
-$(GPDL_TIFF_TOP_OBJ): $(GPDLSRC)tifftop.c $(AK)\
+$(GPDLOBJ)tifftop_0.$(OBJ): $(GPDLSRC)tifftop.c $(AK)\
$(gxdevice_h) $(gserrors_h) $(gsstate_h) $(strimpl_h) $(gscoord_h)\
- $(pltop_h) $(gsicc_manage_h) $(gspaint_h) $(plmain_h)
- $(GPDLCC) $(II)$(TI_)$(_I) $(GPDLSRC)tifftop.c $(GPDLO_)$(GPDL_TIFF_TOP_OBJ_FILE)
+ $(pltop_h) $(gsicc_manage_h) $(gspaint_h) $(plmain_h) $(jmemcust_h)
+ $(GPDLCC) $(D_)SHARE_LIBTIFF=0 $(II)$(TI_)$(_I) $(II)$(JI_)$(_I) $(GPDLSRC)tifftop.c $(GPDLO_)tifftop_0.$(OBJ)
+
+$(GPDLOBJ)tifftop_1.$(OBJ): $(GPDLSRC)tifftop.c $(AK)\
+ $(gxdevice_h) $(gserrors_h) $(gsstate_h) $(strimpl_h) $(gscoord_h)\
+ $(pltop_h) $(gsicc_manage_h) $(gspaint_h) $(plmain_h) $(jmemcust_h)
+ $(GPDLCC) $(D_)SHARE_LIBTIFF=1 $(II)$(TI_)$(_I) $(II)$(JI_)$(_I) $(GPDLSRC)tifftop.c $(GPDLO_)tifftop_1.$(OBJ)
+
+$(GPDL_TIFF_TOP_OBJ): $(GPDLOBJ)tifftop_$(SHARE_LIBTIFF).$(OBJ)
+ $(CP_) $(GPDLOBJ)tifftop_$(SHARE_LIBTIFF).$(OBJ) $(GPDL_TIFF_TOP_OBJ)
$(GPDL_JBIG2_TOP_OBJ): $(GPDLSRC)jbig2top.c $(AK)\
$(gxdevice_h) $(gserrors_h) $(gsstate_h) $(strimpl_h) $(gscoord_h)\
diff --git a/gpdl/tifftop.c b/gpdl/tifftop.c
index e4b59d0e8..746bf1d55 100644
--- a/gpdl/tifftop.c
+++ b/gpdl/tifftop.c
@@ -26,6 +26,8 @@
#include "gspaint.h"
#include "plmain.h"
#include "tiffio.h"
+#include "jmemcust.h"
+#include "gsmchunk.h"
/* Forward decls */
@@ -68,6 +70,7 @@ typedef struct tiff_interp_instance_s {
uint32_t tile_height;
uint32_t tile_width;
uint32_t tiled;
+ uint32_t compression;
uint32_t num_comps;
uint32_t byte_width;
@@ -83,7 +86,7 @@ typedef struct tiff_interp_instance_s {
TIFF *handle;
byte *samples;
-
+ jpeg_cust_mem_data jmem;
} tiff_interp_instance_t;
static int
@@ -414,6 +417,59 @@ static toff_t tifsSizeProc(thandle_t tiff_)
return tiff->buffer_full;
}
+#if defined(SHARE_LIBTIFF) && SHARE_LIBTIFF==0
+static void *gs_j_mem_alloc(j_common_ptr cinfo, size_t size)
+{
+ gs_memory_t *mem = (gs_memory_t *)(GET_CUST_MEM_DATA(cinfo)->priv);
+
+ return(gs_alloc_bytes(mem, size, "JPEG allocation"));
+}
+
+static void gs_j_mem_free(j_common_ptr cinfo, void *object, size_t size)
+{
+ gs_memory_t *mem = (gs_memory_t *)(GET_CUST_MEM_DATA(cinfo)->priv);
+
+ gs_free_object(mem, object, "JPEG free");
+}
+
+static long gs_j_mem_init (j_common_ptr cinfo)
+{
+ gs_memory_t *mem = (gs_memory_t *)(GET_CUST_MEM_DATA(cinfo)->priv);
+ gs_memory_t *cmem = NULL;
+
+ if (gs_memory_chunk_wrap(&(cmem), mem) < 0) {
+ return (-1);
+ }
+
+ (void)jpeg_cust_mem_set_private(GET_CUST_MEM_DATA(cinfo), cmem);
+
+ return 0;
+}
+
+static void gs_j_mem_term (j_common_ptr cinfo)
+{
+ gs_memory_t *cmem = (gs_memory_t *)(GET_CUST_MEM_DATA(cinfo)->priv);
+ gs_memory_t *mem = gs_memory_chunk_target(cmem);
+
+ gs_memory_chunk_release(cmem);
+
+ (void)jpeg_cust_mem_set_private(GET_CUST_MEM_DATA(cinfo), mem);
+}
+
+static void *
+tiff_jpeg_mem_callback(thandle_t tiff_)
+{
+ tiff_interp_instance_t *tiff = (tiff_interp_instance_t *)tiff_;
+
+ (void)jpeg_cust_mem_init(&tiff->jmem, (void *)tiff->memory,
+ gs_j_mem_init, gs_j_mem_term, NULL,
+ gs_j_mem_alloc, gs_j_mem_free,
+ gs_j_mem_alloc, gs_j_mem_free, NULL);
+
+ return &tiff->jmem;
+}
+#endif /* SHARE_LIBTIFF == 0 */
+
static int
do_impl_process(pl_interp_implementation_t * impl, stream_cursor_read * pr, int eof)
{
@@ -518,6 +574,15 @@ do_impl_process(pl_interp_implementation_t * impl, stream_cursor_read * pr, int
break;
}
+ TIFFGetField(tiff->handle, TIFFTAG_COMPRESSION, &tiff->compression);
+ if (tiff->compression == COMPRESSION_JPEG){
+ TIFFSetField(tiff->handle, TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RGB);
+ }
+#if defined(SHARE_LIBTIFF) && SHARE_LIBTIFF==0
+ TIFFSetJpegMemFunction(tiff->handle,
+ &tiff_jpeg_mem_callback);
+#endif
+
TIFFGetField(tiff->handle, TIFFTAG_IMAGEWIDTH, &tiff->width);
TIFFGetField(tiff->handle, TIFFTAG_IMAGELENGTH, &tiff->height);
TIFFGetField(tiff->handle, TIFFTAG_TILEWIDTH, &tiff->tile_width);
@@ -557,7 +622,9 @@ do_impl_process(pl_interp_implementation_t * impl, stream_cursor_read * pr, int
tiff->byte_width = ((tiff->bpc * tiff->tile_width + 7)>>3) * tiff->num_comps;
}
- if (tiff->tiled) {
+ if (tiff->compression == COMPRESSION_OJPEG) {
+ tiff->samples = gs_alloc_bytes(tiff->memory, sizeof(uint32_t) * tiff->width * tiff->height, "tiff_image");
+ } else if (tiff->tiled) {
tiff->samples = gs_alloc_bytes(tiff->memory, TIFFTileSize(tiff->handle), "tiff_tile");
} else {
tiff->samples = gs_alloc_bytes(tiff->memory, tiff->byte_width, "tiff_scan");
@@ -637,10 +704,8 @@ do_impl_process(pl_interp_implementation_t * impl, stream_cursor_read * pr, int
code = gs_translate(tiff->pgs, xoffset, -yoffset);
if (code >= 0)
code = gs_scale(tiff->pgs, scale, -scale);
- if (code < 0) {
- tiff->state = ii_state_flush;
- break;
- }
+ if (code < 0)
+ goto fail_decode;
memset(&tiff->image, 0, sizeof(tiff->image));
gs_image_t_init(&tiff->image, cs);
@@ -651,8 +716,31 @@ do_impl_process(pl_interp_implementation_t * impl, stream_cursor_read * pr, int
tiff->image.ImageMatrix.xx = tiff->xresolution / 72.0f;
tiff->image.ImageMatrix.yy = tiff->yresolution / 72.0f;
- if (tiff->tiled) {
- TIFFReadTile(tiff->handle, tiff->samples, tx, ty, 0, 0);
+ if (tiff->compression == COMPRESSION_OJPEG) {
+ int n = tiff->width * tiff->height;
+ byte *p;
+ uint32_t *q;
+ if (tiff->tiled)
+ goto fail_decode;
+ if (TIFFReadRGBAImage(tiff->handle, tiff->width, tiff->height,
+ (uint32_t *)tiff->samples, 0) == 0) {
+ code = gs_error_unknownerror;
+ goto fail_decode;
+ }
+ q = tiff->samples;
+ p = (byte *)q;
+ while (n--) {
+ uint32_t v = *q++;
+ p[0] = v;
+ p[1] = (v>>8);
+ p[2] = (v>>16);
+ p += 3;
+ }
+ } else if (tiff->tiled) {
+ if (TIFFReadTile(tiff->handle, tiff->samples, tx, ty, 0, 0) == 0) {
+ code = gs_error_unknownerror;
+ goto fail_decode;
+ }
} else if (planar != PLANARCONFIG_CONTIG) {
tiff->image.format = gs_image_format_component_planar;
}
@@ -668,11 +756,17 @@ do_impl_process(pl_interp_implementation_t * impl, stream_cursor_read * pr, int
}
for (y = 0; y < tiff->tile_height; y++) {
- if (tiff->tiled) {
+ if (tiff->compression == COMPRESSION_OJPEG) {
+ /* OJPEG appears to be upside down! */
+ row = tiff->samples + tiff->byte_width * (tiff->tile_height-1-y);
+ } else if (tiff->tiled) {
row = tiff->samples + tiff->byte_width * y;
} else if (planar == PLANARCONFIG_CONTIG) {
row = tiff->samples;
- TIFFReadScanline(tiff->handle, tiff->samples, ty+y, 0);
+ if (TIFFReadScanline(tiff->handle, tiff->samples, ty+y, 0) == 0) {
+ code = gs_error_unknownerror;
+ goto fail_decode;
+ }
} else {
int span = tiff->byte_width / tiff->num_comps;
row = tiff->samples;
@@ -680,7 +774,10 @@ do_impl_process(pl_interp_implementation_t * impl, stream_cursor_read * pr, int
plane_data[s].data = row;
plane_data[s].size = span;
row += span;
- TIFFReadScanline(tiff->handle, plane_data[s].data, ty+y, s);
+ if (TIFFReadScanline(tiff->handle, plane_data[s].data, ty+y, s) == 0) {
+ code = gs_error_unknownerror;
+ goto fail_decode;
+ }
}
}
@@ -690,8 +787,8 @@ do_impl_process(pl_interp_implementation_t * impl, stream_cursor_read * pr, int
code = gs_image_next(tiff->penum, row, tiff->byte_width, used);
}
if (code < 0) {
- tiff->state = ii_state_flush;
- break;
+ code = gs_error_unknownerror;
+ goto fail_decode;
}
}
code = gs_image_cleanup_and_free_enum(tiff->penum, tiff->pgs);
@@ -706,6 +803,9 @@ do_impl_process(pl_interp_implementation_t * impl, stream_cursor_read * pr, int
(void)pl_finish_page(tiff->memory->gs_lib_ctx->top_of_system,
tiff->pgs, 1, true);
break;
+fail_decode:
+ tiff->state = ii_state_flush;
+ break;
}
default:
case ii_state_flush:
diff --git a/psi/msvc.mak b/psi/msvc.mak
index 793d50dae..87ad1008c 100644
--- a/psi/msvc.mak
+++ b/psi/msvc.mak
@@ -659,7 +659,7 @@ TIFFSRCDIR=tiff$(D)
TIFFCONFDIR=$(TIFFSRCDIR)
TIFFCONFIG_SUFFIX=.vc
TIFFPLATFORM=win32
-TIFFCFLAGS="-DJPEG_SUPPORT -DJPEG_LIB_MK1_OR_12BIT=0 -I./jpeg"
+TIFF_CFLAGS=-DJPEG_SUPPORT -DOJPEG_SUPPORT -DJPEG_LIB_MK1_OR_12BIT=0
ENABLE_TIFF=$(D_)TIFF_INCLUDED$(_D)
!endif
View Lorry Controller Status