~ubuntu-branches/ubuntu/vivid/ghostscript/vivid-security

« back to all changes in this revision

Viewing changes to base/gscdevn.c

  • Committer: Package Import Robot
  • Author(s): Till Kamppeter
  • Date: 2013-08-09 20:01:36 UTC
  • mfrom: (1.1.37)
  • Revision ID: package-import@ubuntu.com-20130809200136-amb6zrr7hnjb5jq9
Tags: 9.08~rc1~dfsg-0ubuntu1
* New upstream release
   - Ghostscript 9.08rc1.
   - We are using the system's liblcms2 and libopenjpeg now.
* debian/patches/020130401-852e545-pxl-xl-driver-produced-drawing-commands-without-setting-color-space.patch:
  Removed patch backported from upstream.
* debian/patches/ojdk-8007925+8007926.patch,
  debian/patches/ojdk-8007927.patch,
  debian/patches/ojdk-8007929.patch,
  debian/patches/ojdk-8009654.patch: Removed patches on build in liblcms2, we
  use the system's liblcms2 now.
* debian/patches/2001_docdir_fix_for_debian.patch: Manually updated to new
  upstream source code.
* debian/patches/2003_support_multiarch.patch: Refreshed with quilt.
* debian/control: Added build dependencies on liblcms2-dev and
  libopenjpeg-dev.
* debian/rules: Check for removed lcms2/ and openjpeg/ subdirectories in
  the repackaging check again, also set build options for shared liblcms2
  and libopenjpeg libraries.
* debian/rules: Makefile.in and configure.ac are in the root directory of
  the source now and do not need to get linked from base/. Also there is no
  gstoraster and gstopxl CUPS filter in the package any more and no
  "install-cups" make target any more.
* debian/control, debian/rules, debian/ghostscript-cups.install,
  debian/ghostscript-cups.ppd-updater: Removed the ghostscript-cups binary
  package. The files are now provided by cups-filters.
* debian/symbols.common: Updated for new upstream source. Applied patch
  which dpkg-gensymbols generated for debian/libgs9.symbols to this file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
40
40
#include "gsicc_manage.h"
41
41
#include "gsicc.h"
42
42
#include "gsicc_cache.h"
 
43
#include "gxdevice.h"
43
44
 
44
45
/* ---------------- Color space ---------------- */
45
46
 
655
656
        code = gs_cspace_build_ICC(&nclr_pcs, NULL, pgs->memory);
656
657
        nclr_pcs->cmm_icc_profile_data = pcs->cmm_icc_profile_data;
657
658
        rc_increment(pcs->cmm_icc_profile_data);
658
 
        rc_increment_cs(nclr_pcs); // Suspicious - RJW
 
659
        rc_increment_cs(nclr_pcs); /* Suspicious - RJW */
659
660
        rc_decrement_cs(pcs->base_space, "gx_install_DeviceN");
660
661
        pcs->base_space = nclr_pcs;
661
662
    }
688
689
    if (pcmap->use_alt_cspace) {
689
690
        const gs_color_space_type* base_type = pcs->base_space->type;
690
691
 
691
 
        if (dev_profile->sim_overprint)
 
692
        if (dev_profile->sim_overprint &&
 
693
            dev->color_info.polarity == GX_CINFO_POLARITY_SUBTRACTIVE &&
 
694
            !gx_device_must_halftone(dev))
692
695
            return gx_simulated_set_overprint(pcs->base_space, pgs);
693
696
        else {
694
697
            /* If the base space is DeviceCMYK, handle overprint as DeviceCMYK */
695
698
            if ( base_type->index == gs_color_space_index_DeviceCMYK )
696
 
                    return base_type->set_overprint( pcs->base_space, pgs );
 
699
                return base_type->set_overprint( pcs->base_space, pgs );
697
700
            else
698
 
                    return gx_spot_colors_set_overprint( pcs->base_space, pgs);
 
701
                return gx_spot_colors_set_overprint( pcs->base_space, pgs);
699
702
        }
700
703
    }
701
704
    else {
707
710
            params.retain_spot_comps = false;
708
711
            params.drawn_comps = 0;
709
712
            params.k_value = 0;
 
713
            /* We should not have to blend if we don't need the alternate tint transform */
710
714
            params.blendspot = false;
711
715
            for (i = 0; i < ncomps; i++) {
712
716
                int     mcomp = pcmap->color_map[i];
769
773
        return code;
770
774
    return gx_serialize_device_n_map(pcs, p->map, s);
771
775
    /* p->use_alt_cspace isn't a property of the space. */
772
 
}
 
 
b'\\ No newline at end of file'
 
776
}