~ubuntu-branches/ubuntu/utopic/ghostscript/utopic-proposed

« back to all changes in this revision

Viewing changes to debian/patches/1002_pxl-make-dicctransform-default.patch

  • Committer: Package Import Robot
  • Author(s): Till Kamppeter
  • Date: 2014-03-31 18:24:33 UTC
  • Revision ID: package-import@ubuntu.com-20140331182433-h4hi1ud2b70gu2jj
Tags: 9.10~dfsg-0ubuntu10
* debian/patches/1001_pxlcolor-support-jpeg-in-output.patch,
  debian/patches/020140331-4b44b41-pxlcolor-support-jpeg-in-output.patch:
  Replaced preliminary patch by what got actually committed upstream
  (Upstream bug #691880).
* debian/patches/020140331-41ab485-pxl-transform-deep-images-with-icc-transform-to-emit-high-level-images.patch,
  debian/patches/020140331-8ae4ee2-fixes-pxl-segfault-with-trying-to-set-up-icc-transform-for-bitmasks.patch:
  Transform deep (24-bit) images with an ICC transform to emit high-level
  images (Upstream bug #691880).
* debian/patches/1002_pxl-make-dicctransform-default.patch: Make deep iamge
  ICC transform default (Upstream bug #695124).

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
--- a/devices/vector/gdevpx.c
 
2
+++ b/devices/vector/gdevpx.c
 
3
@@ -109,7 +109,6 @@
 
4
     floatp y_scale;
 
5
     bool pen_null;
 
6
     bool brush_null;
 
7
-    bool iccTransform;
 
8
 } gx_device_pclxl;
 
9
 
 
10
 gs_public_st_suffix_add0_final(st_device_pclxl, gx_device_pclxl,
 
11
@@ -1551,7 +1550,6 @@
 
12
     xdev->MediaPosition = eAutoSelect;
 
13
     xdev->MediaType_old[0] = '\0';
 
14
     xdev->MediaType[0] = '\0';
 
15
-    /* xdev->iccTransform = false; */ /* set true/false here to ignore command line */
 
16
     return 0;
 
17
 }
 
18
 
 
19
@@ -1962,7 +1960,7 @@
 
20
          ((!pclxl_can_handle_color_space(pcs) ||
 
21
            (bits_per_pixel != 1 && bits_per_pixel != 4 &&
 
22
             bits_per_pixel != 8 && bits_per_pixel !=24))
 
23
-          && !(pclxl_can_icctransform(pim) && xdev->iccTransform) )) ||
 
24
+          && !pclxl_can_icctransform(pim) )) ||
 
25
         format != gs_image_format_chunky || pim->Interpolate ||
 
26
         prect
 
27
         )
 
28
@@ -2397,9 +2395,6 @@
 
29
                               &(xdev->CompressMode))) < 0)
 
30
     return (code);
 
31
 
 
32
-  if ((code = param_write_bool(plist, "iccTransform", &(xdev->iccTransform))) < 0)
 
33
-    return (code);
 
34
-
 
35
   return (0);
 
36
 }
 
37
 
 
38
@@ -2505,7 +2500,6 @@
 
39
   }
 
40
   booloption(Tumble, "Tumble")
 
41
   intoption(CompressMode, "CompressMode", int)
 
42
-  booloption(iccTransform, "iccTransform")
 
43
 
 
44
  /*
 
45
   * Then process standard page device parameters...