diff options
Diffstat (limited to 'gs/base/gscsepr.c')
| -rw-r--r-- | gs/base/gscsepr.c | 155 |
1 files changed, 77 insertions, 78 deletions
diff --git a/gs/base/gscsepr.c b/gs/base/gscsepr.c index 5b9b229ff..ba6c70423 100644 --- a/gs/base/gscsepr.c +++ b/gs/base/gscsepr.c @@ -1,6 +1,6 @@ /* Copyright (C) 2001-2006 Artifex Software, Inc. All Rights Reserved. - + This software is provided AS-IS with no warranty, either express or implied. @@ -35,8 +35,8 @@ /* ---------------- Color space ---------------- */ gs_private_st_composite(st_color_space_Separation, gs_color_space, - "gs_color_space_Separation", - cs_Separation_enum_ptrs, cs_Separation_reloc_ptrs); + "gs_color_space_Separation", + cs_Separation_enum_ptrs, cs_Separation_reloc_ptrs); /* Define the Separation color space type. */ static cs_proc_init_color(gx_init_Separation); @@ -63,7 +63,7 @@ const gs_color_space_type gs_color_space_type_Separation = { /* GC procedures */ -static +static ENUM_PTRS_BEGIN(cs_Separation_enum_ptrs) return 0; ENUM_PTR(0, gs_color_space, params.separation.map); ENUM_PTRS_END @@ -76,15 +76,15 @@ RELOC_PTRS_END /* Get the concrete space for a Separation space. */ static const gs_color_space * gx_concrete_space_Separation(const gs_color_space * pcs, - const gs_imager_state * pis) + const gs_imager_state * pis) { bool is_lab = false; #ifdef DEBUG - /* + /* * Verify that the color space and imager state info match. */ if (pcs->id != pis->color_component_map.cspace_id) - dprintf("gx_concretze_space_Separation: color space id mismatch"); + dprintf("gx_concretze_space_Separation: color space id mismatch"); #endif /* @@ -94,11 +94,11 @@ gx_concrete_space_Separation(const gs_color_space * pcs, /* Need to handle PS CIE space */ if (gs_color_space_is_PSCIE(pcs->base_space)) { if (pcs->base_space->icc_equivalent == NULL) { - gs_colorspace_set_icc_equivalent(pcs->base_space, + gs_colorspace_set_icc_equivalent(pcs->base_space, &is_lab, pis->memory); } return (pcs->base_space->icc_equivalent); - } + } return cs_concrete_space(pcs->base_space, pis); } /* @@ -120,17 +120,17 @@ gx_install_Separation(gs_color_space * pcs, gs_state * pgs) if (code < 0) return code; gs_currentcolorspace_inline(pgs)->params.separation.use_alt_cspace = - using_alt_color_space(pgs); + using_alt_color_space(pgs); if (gs_currentcolorspace_inline(pgs)->params.separation.use_alt_cspace) code = (pcs->base_space->type->install_cspace) - (pcs->base_space, pgs); + (pcs->base_space, pgs); /* * Give the device an opportunity to capture equivalent colors for any * spot colors which might be present in the color space. */ if (code >= 0) code = dev_proc(pgs->device, update_spot_equivalent_colors) - (pgs->device, pgs); + (pgs->device, pgs); return code; } @@ -154,7 +154,7 @@ gx_set_overprint_Separation(const gs_color_space * pcs, gs_state * pgs) int mcomp = pcmap->color_map[0]; if (mcomp >= 0) - gs_overprint_set_drawn_comp( params.drawn_comps, mcomp); + gs_overprint_set_drawn_comp( params.drawn_comps, mcomp); } } @@ -168,7 +168,7 @@ static void gx_final_Separation(const gs_color_space * pcs) { rc_adjust_const(pcs->params.separation.map, -1, - "gx_adjust_Separation"); + "gx_adjust_Separation"); } /* ------ Constructors/accessors ------ */ @@ -187,18 +187,18 @@ gs_cspace_new_Separation( int code; if (palt_cspace == 0 || !palt_cspace->type->can_be_alt_space) - return_error(gs_error_rangecheck); + return_error(gs_error_rangecheck); pcs = gs_cspace_alloc(pmem, &gs_color_space_type_Separation); if (pcs == NULL) - return_error(gs_error_VMerror); + return_error(gs_error_VMerror); pcs->params.separation.map = NULL; code = alloc_device_n_map(&pcs->params.separation.map, pmem, - "gs_cspace_build_Separation"); + "gs_cspace_build_Separation"); if (code < 0) { - gs_free_object(pmem, pcs, "gs_cspace_build_Separation"); - return_error(code); + gs_free_object(pmem, pcs, "gs_cspace_build_Separation"); + return_error(code); } pcs->base_space = palt_cspace; rc_increment_cs(palt_cspace); @@ -212,18 +212,18 @@ gs_cspace_new_Separation( */ int gs_cspace_set_sepr_proc(gs_color_space * pcspace, - int (*proc)(const float *, + int (*proc)(const float *, float *, const gs_imager_state *, void * - ), - void *proc_data - ) + ), + void *proc_data + ) { gs_device_n_map *pimap; if (gs_color_space_get_index(pcspace) != gs_color_space_index_Separation) - return_error(gs_error_rangecheck); + return_error(gs_error_rangecheck); pimap = pcspace->params.separation.map; pimap->tint_transform = proc; pimap->tint_transform_data = proc_data; @@ -242,10 +242,10 @@ gs_cspace_set_sepr_function(const gs_color_space *pcspace, gs_function_t *pfn) gs_device_n_map *pimap; if (gs_color_space_get_index(pcspace) != gs_color_space_index_Separation || - pfn->params.m != 1 || pfn->params.n != - gs_color_space_num_components(pcspace->base_space) - ) - return_error(gs_error_rangecheck); + pfn->params.m != 1 || pfn->params.n != + gs_color_space_num_components(pcspace->base_space) + ) + return_error(gs_error_rangecheck); pimap = pcspace->params.separation.map; pimap->tint_transform = map_devn_using_function; pimap->tint_transform_data = pfn; @@ -261,9 +261,9 @@ gs_function_t * gs_cspace_get_sepr_function(const gs_color_space *pcspace) { if (gs_color_space_get_index(pcspace) == gs_color_space_index_Separation && - pcspace->params.separation.map->tint_transform == - map_devn_using_function) - return pcspace->params.separation.map->tint_transform_data; + pcspace->params.separation.map->tint_transform == + map_devn_using_function) + return pcspace->params.separation.map->tint_transform_data; return 0; } @@ -280,13 +280,13 @@ gx_init_Separation(gs_client_color * pcc, const gs_color_space * pcs) static int gx_remap_Separation(const gs_client_color * pcc, const gs_color_space * pcs, - gx_device_color * pdc, const gs_imager_state * pis, gx_device * dev, - gs_color_select_t select) + gx_device_color * pdc, const gs_imager_state * pis, gx_device * dev, + gs_color_select_t select) { int code = 0; if (pcs->params.separation.sep_type != SEP_NONE) - code = gx_default_remap_color(pcc, pcs, pdc, pis, dev, select); + code = gx_default_remap_color(pcc, pcs, pdc, pis, dev, select); else { color_set_null(pdc); } @@ -298,18 +298,18 @@ gx_remap_Separation(const gs_client_color * pcc, const gs_color_space * pcs, static int gx_concretize_Separation(const gs_client_color *pc, const gs_color_space *pcs, - frac *pconc, const gs_imager_state *pis, gx_device *dev) + frac *pconc, const gs_imager_state *pis, gx_device *dev) { int code; gs_client_color cc; gs_color_space *pacs = pcs->base_space; bool is_lab; int k; - + if (pcs->params.separation.sep_type == SEP_OTHER && - pcs->params.separation.use_alt_cspace) { + pcs->params.separation.use_alt_cspace) { gs_device_n_map *map = pcs->params.separation.map; - /* First see if we have a named color object that we can use to try + /* First see if we have a named color object that we can use to try to map from the spot color into device values. */ if (pis->icc_manager->device_named != NULL) { /* There is a table present. If we have the colorant name @@ -326,9 +326,9 @@ gx_concretize_Separation(const gs_client_color *pc, const gs_color_space *pcs, rendering_params.rendering_intent = pis->renderingintent; pcs->params.separation.get_colorname_string(pis->memory, name, - &pname, &name_size); - code = gsicc_transform_named_color(pc->paint.values[0], pname, - name_size, device_values, pis, dev, NULL, + &pname, &name_size); + code = gsicc_transform_named_color(pc->paint.values[0], pname, + name_size, device_values, pis, dev, NULL, &rendering_params, false); if (code == 0) { for (k = 0; k < dev->device_icc_profile->num_comps; k++){ @@ -337,19 +337,19 @@ gx_concretize_Separation(const gs_client_color *pc, const gs_color_space *pcs, return(0); } } - /* Check the 1-element cache first. */ - if (map->cache_valid && map->tint[0] == pc->paint.values[0]) { - int i, num_out = gs_color_space_num_components(pacs); - - for (i = 0; i < num_out; ++i) - pconc[i] = map->conc[i]; - return 0; - } + /* Check the 1-element cache first. */ + if (map->cache_valid && map->tint[0] == pc->paint.values[0]) { + int i, num_out = gs_color_space_num_components(pacs); + + for (i = 0; i < num_out; ++i) + pconc[i] = map->conc[i]; + return 0; + } code = (*pcs->params.separation.map->tint_transform) - (pc->paint.values, &cc.paint.values[0], - pis, pcs->params.separation.map->tint_transform_data); + (pc->paint.values, &cc.paint.values[0], + pis, pcs->params.separation.map->tint_transform_data); if (code < 0) - return code; + return code; /* First check if this was PS based. */ if (gs_color_space_is_PSCIE(pacs)) { /* If we have not yet create the profile do that now */ @@ -364,33 +364,33 @@ gx_concretize_Separation(const gs_client_color *pc, const gs_color_space *pcs, cc.paint.values[0] /= 100.0; cc.paint.values[1] = (cc.paint.values[1]+128)/255.0; cc.paint.values[2] = (cc.paint.values[2]+128)/255.0; - } - return cs_concretize_color(&cc, pacs, pconc, pis, dev); + } + return cs_concretize_color(&cc, pacs, pconc, pis, dev); } else { - pconc[0] = gx_unit_frac(pc->paint.values[0]); + pconc[0] = gx_unit_frac(pc->paint.values[0]); } return 0; } static int gx_remap_concrete_Separation(const frac * pconc, const gs_color_space * pcs, - gx_device_color * pdc, const gs_imager_state * pis, gx_device * dev, - gs_color_select_t select) + gx_device_color * pdc, const gs_imager_state * pis, gx_device * dev, + gs_color_select_t select) { #ifdef DEBUG - /* + /* * Verify that the color space and imager state info match. */ if (pcs->id != pis->color_component_map.cspace_id) - dprintf("gx_remap_concrete_Separation: color space id mismatch"); + dprintf("gx_remap_concrete_Separation: color space id mismatch"); #endif if (pis->color_component_map.use_alt_cspace) { const gs_color_space *pacs = pcs->base_space; - return (*pacs->type->remap_concrete_color) - (pconc, pacs, pdc, pis, dev, select); + return (*pacs->type->remap_concrete_color) + (pconc, pacs, pdc, pis, dev, select); } else { gx_remap_concrete_separation(pconc[0], pdc, pis, dev, select); @@ -411,7 +411,7 @@ check_Separation_component_name(const gs_color_space * pcs, gs_state * pgs) byte * pname; uint name_size; gs_devicen_color_map * pcolor_component_map - = &pgs->color_component_map; + = &pgs->color_component_map; gx_device * dev = pgs->device; pcolor_component_map->num_components = 1; @@ -423,8 +423,8 @@ check_Separation_component_name(const gs_color_space * pcs, gs_state * pgs) * use the alternate color space. */ if (pcs->params.separation.sep_type != SEP_OTHER) { - pcolor_component_map->use_alt_cspace = false; - return 0; + pcolor_component_map->use_alt_cspace = false; + return 0; } /* * Always use the alternate color space if the current device is @@ -432,8 +432,8 @@ check_Separation_component_name(const gs_color_space * pcs, gs_state * pgs) * with a subtractive color model. */ if (dev->color_info.polarity == GX_CINFO_POLARITY_ADDITIVE) { - pcolor_component_map->use_alt_cspace = true; - return 0; + pcolor_component_map->use_alt_cspace = true; + return 0; } /* * Get the character string and length for the component name. @@ -446,19 +446,18 @@ check_Separation_component_name(const gs_color_space * pcs, gs_state * pgs) * SeparationOrder list. */ colorant_number = (*dev_proc(dev, get_color_comp_index)) - (dev, (const char *)pname, name_size, SEPARATION_NAME); + (dev, (const char *)pname, name_size, SEPARATION_NAME); if (colorant_number >= 0) { /* If valid colorant name */ - pcolor_component_map->color_map[0] = - (colorant_number == GX_DEVICE_COLOR_MAX_COMPONENTS) ? -1 - : colorant_number; - pcolor_component_map->use_alt_cspace = false; + pcolor_component_map->color_map[0] = + (colorant_number == GX_DEVICE_COLOR_MAX_COMPONENTS) ? -1 + : colorant_number; + pcolor_component_map->use_alt_cspace = false; } else - pcolor_component_map->use_alt_cspace = true; + pcolor_component_map->use_alt_cspace = true; return 0; } - /* ---------------- Notes on real Separation colors ---------------- */ typedef ulong gs_separation; /* BOGUS */ @@ -494,7 +493,7 @@ typedef ulong gs_separation; /* BOGUS */ /* ---------------- Serialization. -------------------------------- */ -static int +static int gx_serialize_Separation(const gs_color_space * pcs, stream * s) { const gs_separation_params * p = &pcs->params.separation; @@ -502,16 +501,16 @@ gx_serialize_Separation(const gs_color_space * pcs, stream * s) int code = gx_serialize_cspace_type(pcs, s); if (code < 0) - return code; + return code; code = sputs(s, (const byte *)&p->sep_name, sizeof(p->sep_name), &n); if (code < 0) - return code; + return code; code = cs_serialize(pcs->base_space, s); if (code < 0) - return code; + return code; code = gx_serialize_device_n_map(pcs, p->map, s); if (code < 0) - return code; + return code; return sputs(s, (const byte *)&p->sep_type, sizeof(p->sep_type), &n); /* p->use_alt_cspace isn't a property of the space. */ } |