summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Cherepanov <alex.cherepanov@artifex.com>2007-07-31 14:19:45 +0000
committerAlex Cherepanov <alex.cherepanov@artifex.com>2007-07-31 14:19:45 +0000
commite54ddcfb669fe4e3ef406fa0b473a9bc471675a1 (patch)
tree80dd6a9cbca3077d95e6fa67f400e0ea0efb2e14
parentf6ce89ed92af2d3853cd92d4c9cfb8c062be5286 (diff)
Use a correct name for the absolute colorimetric rendering intent. Change the
encoding of the rendering intents in the graphic state to use ICC numbers from Table 18 (section 6.1.11) instead of the PDF order to reduce re-coding and confusion. Bug 689377. DIFFERENCES: None git-svn-id: http://svn.ghostscript.com/ghostscript/trunk@8156 a1074d23-0009-0410-80fe-cf8c14f379e6
-rw-r--r--gs/lib/pdf_ops.ps4
-rw-r--r--gs/src/gsstate.c10
-rw-r--r--gs/src/gxistate.h2
-rw-r--r--gs/src/zcolor3.c4
4 files changed, 15 insertions, 5 deletions
diff --git a/gs/lib/pdf_ops.ps b/gs/lib/pdf_ops.ps
index f38ece2a0..e1e58d9b5 100644
--- a/gs/lib/pdf_ops.ps
+++ b/gs/lib/pdf_ops.ps
@@ -26,10 +26,10 @@ systemdict /pdfmark known not
{ userdict /pdfmark { cleartomark } bind put } if
/renderingintentdict mark
- /Absolute 0
+ /Perceptual 0
/RelativeColorimetric 1
/Saturation 2
- /Perceptual 3
+ /AbsoluteColorimetric 3
.dicttomark readonly def
userdict /GS_PDF_ProcSet 127 dict dup begin
diff --git a/gs/src/gsstate.c b/gs/src/gsstate.c
index 9b3052bc8..08583a6e7 100644
--- a/gs/src/gsstate.c
+++ b/gs/src/gsstate.c
@@ -699,7 +699,15 @@ gs_currentoverprintmode(const gs_state * pgs)
return pgs->overprint_mode;
}
-/* setrenderingintent */
+/* setrenderingintent
+ *
+ * Use ICC numbers from Table 18 (section 6.1.11) rather than the PDF order
+ * to reduce re-coding and confusion.
+ * Perceptual 0
+ * Relative Colorimetric 1
+ * Saturation 2
+ * AbsoluteColorimetric 3
+ */
int
gs_setrenderingintent(gs_state *pgs, int ri) {
if (ri < 0 || ri > 3)
diff --git a/gs/src/gxistate.h b/gs/src/gxistate.h
index e3814a6f7..976f451f5 100644
--- a/gs/src/gxistate.h
+++ b/gs/src/gxistate.h
@@ -239,7 +239,7 @@ typedef struct gs_devicen_color_map_s {
bool accurate_curves;\
bool have_pattern_streams;\
float smoothness;\
- int renderingintent;\
+ int renderingintent; /* See gsstate.c */\
CUSTOM_COLOR_PTR /* Pointer to custom color callback struct */\
const gx_color_map_procs *\
(*get_cmap_procs)(const gs_imager_state *, const gx_device *);\
diff --git a/gs/src/zcolor3.c b/gs/src/zcolor3.c
index 219825f56..01a58ac16 100644
--- a/gs/src/zcolor3.c
+++ b/gs/src/zcolor3.c
@@ -55,7 +55,9 @@ zcurrentrenderingintent(i_ctx_t *i_ctx_p)
return 0;
}
-/* <int> .setrenderingintent - */
+/* <int> .setrenderingintent -
+ * See the comment in gsstate.c about the argumet interepretation.
+ */
private int
zsetrenderingintent(i_ctx_t * i_ctx_p)
{