Date: Sunday, January 23, 2011 @ 04:32:39 Author: andyrtr Revision: 107291
upgpkg: ghostscript 9.00-4 add another patch from upstream to solve part of FS#21388 Added: ghostscript/trunk/gs_bug691759and691760.diff Modified: ghostscript/trunk/PKGBUILD ----------------------------+ PKGBUILD | 10 +- gs_bug691759and691760.diff | 215 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 222 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-01-23 08:56:17 UTC (rev 107290) +++ PKGBUILD 2011-01-23 09:32:39 UTC (rev 107291) @@ -3,7 +3,7 @@ pkgname=ghostscript pkgver=9.00 -pkgrel=3 +pkgrel=4 pkgdesc="An interpreter for the PostScript language" arch=('i686' 'x86_64') license=('GPL3' 'custom') @@ -16,13 +16,15 @@ ghostscript-fPIC.patch ghostscript-system-jasper.patch svn_rev11948.diff - ghostscript-gdevcups-691733.patch) + ghostscript-gdevcups-691733.patch + gs_bug691759and691760.diff) options=('!libtool' '!makeflags') md5sums=('1ca5f245677f78f573e6490bdb40702f' '766d44c47c693f96941b658e360c1277' '03e27cd02471ab3b642c344fa06b623e' '78f2b9c2d6a5a60891b2d8b593a15b00' - 'e459d4cf897bdb54fefbba9d57bd2fa2') + 'e459d4cf897bdb54fefbba9d57bd2fa2' + '21841b0ea5bd67cf4b68ba64c5d5755b') build() { cd ${srcdir}/ghostscript-${pkgver} @@ -41,6 +43,8 @@ # upstream fix for http://bugs.ghostscript.com/show_bug.cgi?id=691733 / part of https://bugs.archlinux.org/task/21388 # patch taken from Fedora RawHide master patch -Np1 -i ${srcdir}/ghostscript-gdevcups-691733.patch + # patch for http://bugs.ghostscript.com/show_bug.cgi?id=691760 and http://bugs.ghostscript.com/show_bug.cgi?id=691759 / part of https://bugs.archlinux.org/task/21388 + patch -Np2 -i ${srcdir}/gs_bug691759and691760.diff ./autogen.sh ./configure --prefix=/usr \ Added: gs_bug691759and691760.diff =================================================================== --- gs_bug691759and691760.diff (rev 0) +++ gs_bug691759and691760.diff 2011-01-23 09:32:39 UTC (rev 107291) @@ -0,0 +1,215 @@ +Modified: trunk/gs/base/gdevnfwd.c +=================================================================== +--- trunk/gs/base/gdevnfwd.c 2011-01-06 23:48:14 UTC (rev 12004) ++++ trunk/gs/base/gdevnfwd.c 2011-01-07 04:49:42 UTC (rev 12005) +@@ -1117,3 +1117,29 @@ + { + return 0; + } ++ ++bool ++fwd_uses_fwd_cmap_procs(gx_device * dev) ++{ ++ const gx_cm_color_map_procs *pprocs; ++ ++ pprocs = dev_proc(dev, get_color_mapping_procs)(dev); ++ if (pprocs == &FwdDevice_cm_map_procs) { ++ return true; ++ } ++ return false; ++} ++ ++const gx_cm_color_map_procs* ++fwd_get_target_cmap_procs(gx_device * dev) ++{ ++ const gx_cm_color_map_procs *pprocs; ++ gx_device_forward * const fdev = (gx_device_forward *)dev; ++ gx_device * const tdev = fdev->target; ++ ++ pprocs = dev_proc(tdev, get_color_mapping_procs(tdev)); ++ while (pprocs == &FwdDevice_cm_map_procs) { ++ pprocs = fwd_get_target_cmap_procs(tdev); ++ } ++ return pprocs; ++} +\ No newline at end of file + +Modified: trunk/gs/base/gdevp14.c +=================================================================== +--- trunk/gs/base/gdevp14.c 2011-01-06 23:48:14 UTC (rev 12004) ++++ trunk/gs/base/gdevp14.c 2011-01-07 04:49:42 UTC (rev 12005) +@@ -900,7 +900,11 @@ + nos->parent_color_info_procs->num_components, 1, + false, false, true, tos->planestride, + tos->rowstride, num_rows, num_cols); +- /* Transform the data */ ++ /* Transform the data. Since the pdf14 device should be ++ using RGB, CMYK or Gray buffers, this transform ++ does not need to worry about the cmap procs of ++ the target device. Those are handled when we do ++ the pdf14 put image operation */ + gscms_transform_color_buffer(icc_link, &input_buff_desc, + &output_buff_desc, tos->data, + new_data_buf); + +Modified: trunk/gs/base/gxcmap.c +=================================================================== +--- trunk/gs/base/gxcmap.c 2011-01-06 23:48:14 UTC (rev 12004) ++++ trunk/gs/base/gxcmap.c 2011-01-07 04:49:42 UTC (rev 12005) +@@ -31,6 +31,7 @@ + #include "gsicc_manage.h" + #include "gdevdevn.h" + #include "gsicc_cache.h" ++#include "gscms.h" + + /* Structure descriptor */ + public_st_device_color(); +@@ -1744,3 +1745,37 @@ + + } + } ++ ++bool ++gx_device_uses_std_cmap_procs(gx_device * dev) ++{ ++ const gx_cm_color_map_procs *pprocs; ++ ++ if (dev->device_icc_profile != NULL) { ++ pprocs = dev_proc(dev, get_color_mapping_procs)(dev); ++ /* Check if they are forwarding procs */ ++ if (fwd_uses_fwd_cmap_procs(dev)) { ++ pprocs = fwd_get_target_cmap_procs(dev); ++ } ++ switch(dev->device_icc_profile->data_cs) { ++ case gsGRAY: ++ if (pprocs == &DeviceGray_procs) { ++ return true; ++ } ++ break; ++ case gsRGB: ++ if (pprocs == &DeviceRGB_procs) { ++ return true; ++ } ++ break; ++ case gsCMYK: ++ if (pprocs == &DeviceCMYK_procs) { ++ return true; ++ } ++ break; ++ default: ++ break; ++ } ++ } ++ return false; ++} + +Modified: trunk/gs/base/gxcmap.h +=================================================================== +--- trunk/gs/base/gxcmap.h 2011-01-06 23:48:14 UTC (rev 12004) ++++ trunk/gs/base/gxcmap.h 2011-01-07 04:49:42 UTC (rev 12005) +@@ -284,5 +284,11 @@ + * [0,1] + */ + frac gx_unit_frac(float fvalue); ++/* Determine if the device is using the standard color mapping procs. In ++ such a case, we can make use of the faster icc color conversions for ++ images */ ++bool gx_device_uses_std_cmap_procs(gx_device * dev); ++bool fwd_uses_fwd_cmap_procs(gx_device * dev); ++const gx_cm_color_map_procs* fwd_get_target_cmap_procs(gx_device * dev); + + #endif /* gxcmap_INCLUDED */ + +Modified: trunk/gs/base/gxi12bit.c +=================================================================== +--- trunk/gs/base/gxi12bit.c 2011-01-06 23:48:14 UTC (rev 12004) ++++ trunk/gs/base/gxi12bit.c 2011-01-07 04:49:42 UTC (rev 12005) +@@ -113,6 +113,8 @@ + irender_proc_t + gs_image_class_2_fracs(gx_image_enum * penum) + { ++ bool std_cmap_procs; ++ + if (penum->bps > 8) { + if (penum->use_mask_color) { + /* Convert color mask values to fracs. */ +@@ -122,9 +124,14 @@ + penum->mask_color.values[i] = + bits2frac(penum->mask_color.values[i], 12); + } ++ /* If the device has some unique color mapping procs due to its color space, ++ then we will need to use those and go through pixel by pixel instead ++ of blasting through buffers. This is true for example with many of ++ the color spaces for CUPs */ ++ std_cmap_procs = gx_device_uses_std_cmap_procs(penum->dev); + if ( (gs_color_space_get_index(penum->pcs) == gs_color_space_index_DeviceN && + penum->pcs->cmm_icc_profile_data == NULL) || penum->use_mask_color || +- penum->bps != 16 || ++ penum->bps != 16 || !std_cmap_procs || + gs_color_space_get_index(penum->pcs) == gs_color_space_index_DevicePixel) { + /* DevicePixel color space used in mask from 3x type. Basically + a simple color space that just is scaled to the device bit + +Modified: trunk/gs/base/gxicolor.c +=================================================================== +--- trunk/gs/base/gxicolor.c 2011-01-06 23:48:14 UTC (rev 12004) ++++ trunk/gs/base/gxicolor.c 2011-01-07 04:49:42 UTC (rev 12005) +@@ -97,6 +97,8 @@ + irender_proc_t + gs_image_class_4_color(gx_image_enum * penum) + { ++ bool std_cmap_procs; ++ + if (penum->use_mask_color) { + /* + * Scale the mask colors to match the scaling of each sample to +@@ -128,8 +130,14 @@ + penum->mask_color.mask = 0; + penum->mask_color.test = ~0; + } ++ /* If the device has some unique color mapping procs due to its color space, ++ then we will need to use those and go through pixel by pixel instead ++ of blasting through buffers. This is true for example with many of ++ the color spaces for CUPs */ ++ std_cmap_procs = gx_device_uses_std_cmap_procs(penum->dev); + if ( (gs_color_space_get_index(penum->pcs) == gs_color_space_index_DeviceN && +- penum->pcs->cmm_icc_profile_data == NULL) || penum->use_mask_color ) { ++ penum->pcs->cmm_icc_profile_data == NULL) || penum->use_mask_color || ++ !std_cmap_procs) { + return &image_render_color_DeviceN; + } else { + /* Set up the link now */ + +Modified: trunk/gs/base/gxiscale.c +=================================================================== +--- trunk/gs/base/gxiscale.c 2011-01-06 23:48:14 UTC (rev 12004) ++++ trunk/gs/base/gxiscale.c 2011-01-07 04:49:42 UTC (rev 12005) +@@ -104,6 +104,13 @@ + != penum->dev->color_info.num_components) { + use_icc = false; + } ++ /* If the device has some unique color mapping procs due to its color space, ++ then we will need to use those and go through pixel by pixel instead ++ of blasting through buffers. This is true for example with many of ++ the color spaces for CUPs */ ++ if(!gx_device_uses_std_cmap_procs(penum->dev)) { ++ use_icc = false; ++ } + /* + * USE_CONSERVATIVE_INTERPOLATION_RULES is normally NOT defined since + * the MITCHELL digital filter seems OK as long as we are going out to + +Modified: trunk/gs/base/lib.mak +=================================================================== +--- trunk/gs/base/lib.mak 2011-01-06 23:48:14 UTC (rev 12004) ++++ trunk/gs/base/lib.mak 2011-01-07 04:49:42 UTC (rev 12005) +@@ -602,7 +602,7 @@ + $(gxalpha_h) $(gxcspace_h) $(gxfarith_h) $(gxfrac_h)\ + $(gxdcconv_h) $(gxdevice_h) $(gxcmap_h) $(gsnamecl_h) $(gxlum_h)\ + $(gzstate_h) $(gxdither_h) $(gxcdevn_h) $(string__h)\ +- $(gsicc_manage_h) $(gdevdevn_h) $(gsicc_cache_h) ++ $(gsicc_manage_h) $(gdevdevn_h) $(gsicc_cache_h) $(gscms_h) + $(GLCC) $(GLO_)gxcmap.$(OBJ) $(C_) $(GLSRC)gxcmap.c + + $(GLOBJ)gxcpath.$(OBJ) : $(GLSRC)gxcpath.c $(GXERR)\ +