summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Johnston <ray.johnston@artifex.com>2011-07-13 12:51:18 -0700
committerRay Johnston <ray.johnston@artifex.com>2011-07-14 01:17:32 -0700
commitb5dce1e006d2c90f34c54aa731015d18b443b3ed (patch)
tree28a6f9643ec86b097e7548564702bbdfdb41090d
parentaeb8d66f59d64aca68577fe0b6de1e03b8a2da80 (diff)
downloadghostpdl-b5dce1e006d2c90f34c54aa731015d18b443b3ed.tar.gz
Fix for missing ICCProfilesDir during some device init. Move profiledir to gs_lib_ctx.
The business of trying to keep the profile directory in the device and keeping it in sync with the value used in the icc_manager led to problems when some devices were initialized. This change moves the profiledir (and its len) into the gs_lib_ctx_t (pseudo- global) which is accessible by the icc_manager and devices via the gs_memory_t pointer. Remove the no longer needed functions to set and sync the profile in the device and replace gsicc_set_icc_directory with gs_lib_ctx_set_icc_directory. Thanks to Michael Vrhel for adding to this patch to make it build on linux and build the other parsers.
-rw-r--r--psi/psitop.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/psi/psitop.c b/psi/psitop.c
index ddda457c6..8bc45da08 100644
--- a/psi/psitop.c
+++ b/psi/psitop.c
@@ -297,9 +297,6 @@ ps_impl_set_device(
ps_interp_instance_t *psi = (ps_interp_instance_t *)instance;
gs_state *pgs = psi->minst->i_ctx_p->pgs;
- if (code < 0)
- return code;
-
/* Initialize device ICC profile */
code = gsicc_init_device_profile_struct(device, NULL, 0);
if (code < 0)