<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e13f9fe4fdd27fcc61311c4d4a7009ce9a3dd56b">https://github.com/macports/macports-ports/commit/e13f9fe4fdd27fcc61311c4d4a7009ce9a3dd56b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e13f9fe4fdd ghostscript: update to v9.53.3
</span>e13f9fe4fdd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e13f9fe4fdd27fcc61311c4d4a7009ce9a3dd56b
</span>Author: Dongdong Tian <seisman.info@gmail.com>
AuthorDate: Sat Nov 14 17:32:30 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> ghostscript: update to v9.53.3
</span>---
print/ghostscript-fonts-hiragino/Portfile | 2 +-
print/ghostscript/Portfile | 15 ++--
.../files/ghostpdl.git-06c920713e11.patch | 92 ----------------------
print/ghostscript/files/patch-6756b355c238.diff | 88 ---------------------
4 files changed, 6 insertions(+), 191 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/ghostscript-fonts-hiragino/Portfile b/print/ghostscript-fonts-hiragino/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3683029aa73..5f15546f1d8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/ghostscript-fonts-hiragino/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/ghostscript-fonts-hiragino/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name ghostscript-fonts-hiragino
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 9.52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 9.53.3
</span> categories print japanese chinese
maintainers nomaintainer
description Hiragino font for ghostscript ${version}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/ghostscript/Portfile b/print/ghostscript/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5a6ae415bd2..16be94a75a5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/ghostscript/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/ghostscript/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup muniversal 1.0
name ghostscript
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 9.52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 9.53.3
</span> categories print
license AGPL-3 BSD
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,11 +33,6 @@ distfiles ${distname}.tar.gz:source \
</span> patchfiles patch-base_unix-dll.mak.diff \
patch-base_unixinst.mak.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# backport upstream fix to fix ghostpdl build; see:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/60540#comment:2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://bugs.ghostscript.com/show_bug.cgi?id=702474
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-6756b355c238.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Provide FT_CALLBACK_DEF macro removed from
# <freetype/config/ftconfig.h> in freetype 2.10.3
# https://trac.macports.org/ticket/61306
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,10 +41,10 @@ patchfiles-append patch-base_fapi_ft.c.diff
</span> # Missing stdlib.h for abs()
patchfiles-append patch-jpegxr_r_strip.c.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums ghostpdl-9.52.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 1e719f907c8dc6dd0000bf2c547eee54fd583b9f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8f6e48325c106ae033bbae3e55e6c0b9ee5c6b57e54f7cd24fb80a716a93b06a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 58554799 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums ghostpdl-9.53.3.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 3f4a51e75d6378dd754b40081a9de76d904dc1ae \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 96d04e4e464bddb062c1774ea895c4f1c1c94e6c4b62f5d32218ebd44dd65ba1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 61264209 \
</span> ghostscript-fonts-other-6.0.tar.gz \
rmd160 ab60dbf71e7d91283a106c3df381cadfe173082f \
sha256 4fa051e341167008d37fe34c19d241060cd17b13909932cd7ca7fe759243c2de \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/ghostscript/files/ghostpdl.git-06c920713e11.patch b/print/ghostscript/files/ghostpdl.git-06c920713e11.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2a313a77e6b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/ghostscript/files/ghostpdl.git-06c920713e11.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,92 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 06c920713e11bce9bd541bbf9bf294b2ba16aee8 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Chris Liddell <chris.liddell@artifex.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 10 Apr 2019 14:23:39 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Bug 700952: re-introduce over/underflow workaround
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Commit 355434f4b1bbe8c4f98cafad5a6868aa2f0eaae1 reverted a workaround that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compensated for over/underflow in Freetype's TTF hinting (related to freedom
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-and projection vector calculations). That problem no longer exists in recent
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Freetype releases, and the workaround actually caused other issues to occur
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-with hinting.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-What wasn't obvious was that the workaround also protected over/underflow
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-issues relating to the unitsPerEm value.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-So this re-instates the workaround, but bases the decision on how the final
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-scale is distributing between the Freetype "size" and the Freetype matrix on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-the unitsPerEm value (this is relevant for all font types as, for non-TTF,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-font types, Freetype derives the unitsPerEm from the FontMatrix (for PS type
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fonts).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Also fixes Bug 700875
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- base/fapi_ft.c | 33 +++++++++++++++++++++++++++------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 27 insertions(+), 6 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/base/fapi_ft.c b/base/fapi_ft.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 07b4167..c9fe9ff 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- base/fapi_ft.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ base/fapi_ft.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -974,13 +974,19 @@ make_rotation(FT_Matrix * a_transform, const FT_Vector * a_vector)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- transform_decompose(FT_Matrix * a_transform, FT_UInt * xresp, FT_UInt * yresp,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FT_Fixed * a_x_scale, FT_Fixed * a_y_scale)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FT_Fixed * a_x_scale, FT_Fixed * a_y_scale, int units_per_EM)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double scalex, scaley, fact = 1.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double factx = 1.0, facty = 1.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FT_Matrix ftscale_mat;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FT_UInt xres;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FT_UInt yres;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* We have to account for units_per_EM as we fiddle with the scaling
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * in order to avoid underflow (mostly in the TTF hinting code), but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * we also want to clamp to a lower value (512, admittedly arrived at
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * via experimentation) in order to preserve the fidelity of the outlines.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double upe = units_per_EM > 512 ? (float)units_per_EM : 512.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scalex = hypot((double)a_transform->xx, (double)a_transform->xy);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scaley = hypot((double)a_transform->yx, (double)a_transform->yy);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1067,10 +1073,25 @@ transform_decompose(FT_Matrix * a_transform, FT_UInt * xresp, FT_UInt * yresp,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scalex *= fact;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ftscale_mat.xx = (FT_Fixed) (65536.0 / scalex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ftscale_mat.xy = (FT_Fixed) 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ftscale_mat.yx = (FT_Fixed) 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ftscale_mat.yy = (FT_Fixed) (65536.0 / scaley);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* see above */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fact = 1.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (scaley * yres > (double)upe * 72.0 && (xres > 0 && yres > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && (scalex > 0.0 && scaley > 0.0)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (scaley < yres) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ xres >>= 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ yres >>= 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fact *= 2.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ scalex /= 1.25;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ scaley /= 1.25;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ftscale_mat.xx = (FT_Fixed) ((65536.0 / scalex) * fact);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ftscale_mat.xy = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ftscale_mat.yx = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ftscale_mat.yy = (FT_Fixed) ((65536.0 / scaley) * fact);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FT_Matrix_Multiply(a_transform, &ftscale_mat);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memcpy(a_transform, &ftscale_mat, sizeof(FT_Matrix));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1315,7 +1336,7 @@ gs_fapi_ft_get_scaled_font(gs_fapi_server * a_server, gs_fapi_font * a_font,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * transform.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- transform_decompose(&face->ft_transform, &face->horz_res,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- &face->vert_res, &face->width, &face->height);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ &face->vert_res, &face->width, &face->height, face->ft_face->units_per_EM);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ft_error = FT_Set_Char_Size(face->ft_face, face->width, face->height,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- face->horz_res, face->vert_res);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.9.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/ghostscript/files/patch-6756b355c238.diff b/print/ghostscript/files/patch-6756b355c238.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 26e6f207378..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/ghostscript/files/patch-6756b355c238.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,88 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Chris Liddell <chris.liddell@artifex.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 25 Mar 2020 14:00:55 +0000 (+0000)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: Fix shared libtiff and libjpeg build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-X-Git-Tag: ghostpdl-9.52-test-base-3~34
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-X-Git-Url: http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff_plain;h=6756b355c238
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix shared libtiff and libjpeg build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-When building with shared libs, we should not try to include our custom libjpeg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-memory management context into the TIFF reader implementation context.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gpdl/gpdl.mak b/gpdl/gpdl.mak
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e29c53a7b..b5a47aa22 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gpdl/gpdl.mak
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gpdl/gpdl.mak
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -110,15 +110,17 @@ $(GPDL_PWG_TOP_OBJ): $(GPDLSRC)pwgtop.c $(AK)\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(spwgx_h) $(pltop_h) $(gsicc_manage_h) $(gspaint_h) $(plmain_h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(GPDLCC) $(GPDLSRC)pwgtop.c $(GPDLO_)$(GPDL_PWG_TOP_OBJ_FILE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# TIFF reading can only work with both libtiff and libjpeg using share libs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# *or* both using local - we can't mix.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(GPDLOBJ)tifftop_0.$(OBJ): $(GPDLSRC)tifftop.c $(AK)\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(gxdevice_h) $(gserrors_h) $(gsstate_h) $(strimpl_h) $(gscoord_h)\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(pltop_h) $(gsicc_manage_h) $(gspaint_h) $(plmain_h) $(jmemcust_h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(GPDLCC) $(D_)SHARE_LIBTIFF=0 $(II)$(TI_)$(_I) $(II)$(JI_)$(_I) $(GPDLSRC)tifftop.c $(GPDLO_)tifftop_0.$(OBJ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(GPDLCC) $(D_)SHARE_LIBTIFF=0$(_D) $(D_)SHARE_JPEG=0$(_D) $(II)$(TI_)$(_I) $(II)$(JI_)$(_I) $(GPDLSRC)tifftop.c $(GPDLO_)tifftop_0.$(OBJ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(GPDLOBJ)tifftop_1.$(OBJ): $(GPDLSRC)tifftop.c $(AK)\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(gxdevice_h) $(gserrors_h) $(gsstate_h) $(strimpl_h) $(gscoord_h)\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(pltop_h) $(gsicc_manage_h) $(gspaint_h) $(plmain_h) $(jmemcust_h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(GPDLCC) $(D_)SHARE_LIBTIFF=1 $(II)$(TI_)$(_I) $(II)$(JI_)$(_I) $(GPDLSRC)tifftop.c $(GPDLO_)tifftop_1.$(OBJ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pltop_h) $(gsicc_manage_h) $(gspaint_h) $(plmain_h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(GPDLCC) $(D_)SHARE_LIBTIFF=1$(_D) $(D_)SHARE_JPEG=1$(_D) $(II)$(TI_)$(_I) $(II)$(JI_)$(_I) $(GPDLSRC)tifftop.c $(GPDLO_)tifftop_1.$(OBJ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(GPDL_TIFF_TOP_OBJ): $(GPDLOBJ)tifftop_$(SHARE_LIBTIFF).$(OBJ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CP_) $(GPDLOBJ)tifftop_$(SHARE_LIBTIFF).$(OBJ) $(GPDL_TIFF_TOP_OBJ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gpdl/tifftop.c b/gpdl/tifftop.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 16939dbb5..6abf42916 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gpdl/tifftop.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gpdl/tifftop.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,7 +26,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "gspaint.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "plmain.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "tiffio.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(SHARE_JPEG) && SHARE_JPEG==0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "jmemcust.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "gsmchunk.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Forward decls */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -90,7 +92,9 @@ typedef struct tiff_interp_instance_s {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- byte *samples;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- byte *proc_samples;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(SHARE_JPEG) && SHARE_JPEG==0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- jpeg_cust_mem_data jmem;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } tiff_interp_instance_t;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -421,7 +425,7 @@ static toff_t tifsSizeProc(thandle_t tiff_)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return tiff->buffer_full;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(SHARE_LIBTIFF) && SHARE_LIBTIFF==0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(SHARE_JPEG) && SHARE_JPEG==0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void *gs_j_mem_alloc(j_common_ptr cinfo, size_t size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gs_memory_t *mem = (gs_memory_t *)(GET_CUST_MEM_DATA(cinfo)->priv);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -472,7 +476,7 @@ tiff_jpeg_mem_callback(thandle_t tiff_)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return &tiff->jmem;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* SHARE_LIBTIFF == 0 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* SHARE_JPEG == 0 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- guess_pal_depth(int n, uint16_t *rmap, uint16_t *gmap, uint16_t *bmap)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -619,7 +623,7 @@ do_impl_process(pl_interp_implementation_t * impl, stream_cursor_read * pr, int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tiff->photometric == PHOTOMETRIC_LOGLUV) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TIFFSetField(tiff->handle, TIFFTAG_SGILOGDATAFMT, SGILOGDATAFMT_8BIT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(SHARE_LIBTIFF) && SHARE_LIBTIFF==0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(SHARE_JPEG) && SHARE_JPEG==0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TIFFSetJpegMemFunction(tiff->handle,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &tiff_jpeg_mem_callback);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span></pre><pre style='margin:0'>
</pre>