93 files changed, 379 insertions, 379 deletions
diff --git a/base/bobbin.c b/base/bobbin.c
index 63720f3e1..0d84fa54d 100644
--- a/base/bobbin.c
+++ b/base/bobbin.c
@@ -298,7 +298,7 @@ static int Bobbin_thread(void *thread)
    int i;
    for (i = 0; i < bobbins.num_threads; i++)
-        if (BOBBIN_THREAD_EQUAL(bobbins.thread[i].thread, thread) && 
+        if (BOBBIN_THREAD_EQUAL(bobbins.thread[i].thread, thread) &&
            (bobbins.thread[i].flags & BOBBIN_THREAD_FINISHED) == 0)
            break;
    if (i == bobbins.num_threads)
diff --git a/base/ets.c b/base/ets.c
index 2b6a073f5..c70151e45 100644
--- a/base/ets.c
+++ b/base/ets.c
@@ -844,7 +844,7 @@ ets_plane_new(void *malloc_arg, const ETS_Params *params, ETS_Ctx *etc, int plan
    {
        result->line[i].a = 1;
        result->line[i].b = 1;
-        /* Initialize error with a non zero random value to ensure dots don't 
+        /* Initialize error with a non zero random value to ensure dots don't
           land on dots when we have same planes with same gray level and
           the plane interaction option is turned off.  Ideally the level
           of this error should be based upon the values of the first line
@@ -877,7 +877,7 @@ ets_destroy(void *malloc_arg, ETS_Ctx *ctx)
 {
    int i;
    int n_planes;
-    
    if (ctx == NULL)
        return;
diff --git a/base/ets.h b/base/ets.h
index a57bef527..ff764f7e8 100644
--- a/base/ets.h
+++ b/base/ets.h
@@ -57,7 +57,7 @@ extern "C" {
    #define ETS_SRC_MAX 65535
 #endif
-/* Photoshop (and possibly other image formats define white in a CMYK image with a 
+/* Photoshop (and possibly other image formats define white in a CMYK image with a
   value of 255 (65535).  This is opposite of the PAM files that Robin has created.
   The ETS code expects white to be at 0.   Adjustments to the values in gray level
   will be baked into the LUT if needed */
diff --git a/base/fapi_ft.c b/base/fapi_ft.c
index 46f865efa..65fa6dcf4 100644
--- a/base/fapi_ft.c
+++ b/base/fapi_ft.c
@@ -699,10 +699,10 @@ load_glyph(gs_fapi_server * a_server, gs_fapi_font * a_fapi_font,
    /* If FT gives us an error, try to fall back to the notdef - if that doesn't work, we'll throw an error over to Ghostscript */
    if (ft_error) {
        gs_string notdef_str;
-        
        notdef_str.data = (byte *)".notdef";
        notdef_str.size = 7;
-        
        a_fapi_font->char_data = (void *)(&notdef_str);
        a_fapi_font->char_data_len = 0;
@@ -1365,7 +1365,7 @@ gs_fapi_ft_get_scaled_font(gs_fapi_server * a_server, gs_fapi_font * a_font,
         */
        FT_Set_Transform(face->ft_face, &face->ft_transform, NULL);
-        
        if (!a_font->is_type1) {
            for (i = 0; i < GS_FAPI_NUM_TTF_CMAP_REQ && !cmap; i++) {
                if (a_font->ttf_cmap_req[i].platform_id > 0) {
@@ -1817,7 +1817,7 @@ gs_fapi_ft_set_mm_weight_vector(gs_fapi_server *server, gs_fapi_font *ff, float
            setit = true;
        }
    }
-    
    if (setit == true) {
        ft_error = FT_Set_MM_WeightVector(face->ft_face, length, nwv);
        if (ft_error != 0) return_error(gs_error_invalidaccess);
diff --git a/base/fapibstm.c b/base/fapibstm.c
index 0eb120c2e..3a21b5ec0 100644
--- a/base/fapibstm.c
+++ b/base/fapibstm.c
@@ -326,7 +326,7 @@ gs_fapi_bstm_set_mm_weight_vector(gs_fapi_server *server, gs_fapi_font *ff, floa
    (void)ff;
    (void)wvector;
    (void)length;
-    
    return gs_error_invalidaccess;
 }
diff --git a/base/fapiufst.c b/base/fapiufst.c
index 4089e905d..b2050ef75 100644
--- a/base/fapiufst.c
+++ b/base/fapiufst.c
@@ -1805,7 +1805,7 @@ get_char(gs_fapi_server *server, gs_fapi_font *ff, gs_fapi_char_ref *c,
         */
        code = CGIFFwidth2(FSA &glyph_width_code, 1, sizeof(glyph_width), glyph_width);
    }
-    
    if (code >= 0) {
        code = CGIFchar_handle(FSA cc, &result, (SW16) 0);
    }
@@ -1816,7 +1816,7 @@ get_char(gs_fapi_server *server, gs_fapi_font *ff, gs_fapi_char_ref *c,
    if (code == ERR_TT_UNDEFINED_INSTRUCTION
 #if UFST_VERSION_MAJOR >= 6
        || (code >= ERR_TT_NULL_FUNCDEF && code <= ERR_TT_STACK_OUT_OF_RANGE)
-#endif   
+#endif
        ) {
        int savehint = FC_DONTHINTTT(fc);
@@ -1861,7 +1861,7 @@ get_char(gs_fapi_server *server, gs_fapi_font *ff, gs_fapi_char_ref *c,
        code2 = CGIFchar_handle(FSA c1, &result, (SW16) 0);
        if (code2 && code2 != ERR_fixed_space && code2 != ERR_bm_buff
            && code2 != ERR_bm_too_big) {
-            
            notdef_str.data = (byte *)space;
            notdef_str.size = strlen(space);
            ff->char_data = (void *)&notdef_str;
@@ -1911,7 +1911,7 @@ get_char(gs_fapi_server *server, gs_fapi_font *ff, gs_fapi_char_ref *c,
        design_bbox[1] = pbm->top_indent;
        design_bbox[2] = pbm->black_width;
        design_bbox[3] = pbm->black_depth;
-        
        if (ff->is_vertical) {
            /* FIXME: this probably isn't need - we can probably just use glyph_width */
            if (pIFS->glyphMetricsDU.aw.x == 0 && pIFS->glyphMetricsDU.aw.y == 0) {
@@ -1958,13 +1958,13 @@ get_char(gs_fapi_server *server, gs_fapi_font *ff, gs_fapi_char_ref *c,
        design_bbox[1] = pol->bottom;
        design_bbox[2] = pol->right;
        design_bbox[3] = pol->top;
-        
        r->char_data = (IFOUTLINE *) result;
    }
    else {
        design_escapement[0] = glyph_width[0];
        design_escapement[1] = glyph_width[1];
-        
        design_bbox[0] = design_bbox[1] = design_bbox[2] = design_bbox[3] = 0;
    }
 #if 1                           /* UFST 5.0 */
@@ -2224,7 +2224,7 @@ gs_fapi_ufst_set_mm_weight_vector(gs_fapi_server *server, gs_fapi_font *ff, floa
    (void)ff;
    (void)wvector;
    (void)length;
-    
    return gs_error_invalidaccess;
 }
diff --git a/base/gdevbbox.c b/base/gdevbbox.c
index 20f80d3a0..33a421dbc 100644
--- a/base/gdevbbox.c
+++ b/base/gdevbbox.c
@@ -497,7 +497,7 @@ bbox_strip_tile_rectangle(gx_device * dev, const gx_strip_bitmap * tiles,
 static int
 bbox_strip_tile_rect_devn(gx_device * dev, const gx_strip_bitmap * tiles,
-   int x, int y, int w, int h, const gx_drawing_color *pdcolor0, 
+   int x, int y, int w, int h, const gx_drawing_color *pdcolor0,
   const gx_drawing_color *pdcolor1, int px, int py)
 {
    gx_device_bbox *const bdev = (gx_device_bbox *) dev;
diff --git a/base/gdevdbit.c b/base/gdevdbit.c
index fb9ff8003..d17239514 100644
--- a/base/gdevdbit.c
+++ b/base/gdevdbit.c
@@ -169,16 +169,16 @@ gx_no_copy_alpha(gx_device * dev, const byte * data, int data_x,
 /* Currently we really should only be here if the target device is planar
   AND it supports devn colors AND is 8 or 16 bit.  For example tiffsep
-   and psdcmyk may make use of this if AA is enabled.  It is basically 
+   and psdcmyk may make use of this if AA is enabled.  It is basically
-   designed for devices that need more than 64 bits for color support 
+   designed for devices that need more than 64 bits for color support
-   So that I can follow things and  make it readable for future generations, 
+   So that I can follow things and  make it readable for future generations,
   I am not using the macro nightmare that default_copy_alpha uses. */
 int
 gx_default_copy_alpha_hl_color(gx_device * dev, const byte * data, int data_x,
           int raster, gx_bitmap_id id, int x, int y, int width, int height,
                      const gx_drawing_color *pdcolor, int depth)
-{ 
+{
    const byte *row_alpha;
    gs_memory_t *mem = dev->memory;
    int bpp = dev->color_info.depth;
@@ -223,7 +223,7 @@ gx_default_copy_alpha_hl_color(gx_device * dev, const byte * data, int data_x,
                       | GB_ALIGN_STANDARD
                       | GB_OFFSET_0
                       | GB_RASTER_STANDARD
-                       | GB_SELECT_PLANES;    
+                       | GB_SELECT_PLANES;
    gb_rect.p.x = x;
    gb_rect.q.x = x + width;
    for (ry = y; ry < y + height; row_alpha += raster, ++ry) {
@@ -234,13 +234,13 @@ gx_default_copy_alpha_hl_color(gx_device * dev, const byte * data, int data_x,
        for (k = 0; k < ncomps; k++) {
            /* First set the params to zero for all planes except the one we want */
            /* I am not sure why get_bits_rectangle for the planar device can
-               not hand back the data in a proper planar form.  To get the 
+               not hand back the data in a proper planar form.  To get the
               individual planes seems that I need to jump through some hoops
               here */
-            for (j = 0; j < ncomps; j++) 
+            for (j = 0; j < ncomps; j++)
                gb_params.data[j] = 0;
            gb_params.data[k] = gb_buff + k * out_raster;
-            code = dev_proc(dev, get_bits_rectangle) (dev, &gb_rect, 
+            code = dev_proc(dev, get_bits_rectangle) (dev, &gb_rect,
                                                      &gb_params, 0);
            src_planes[k] = gb_params.data[k];
            if (code < 0) {
@@ -248,7 +248,7 @@ gx_default_copy_alpha_hl_color(gx_device * dev, const byte * data, int data_x,
                return code;
            }
        }
-        /* At this point we have to carry around some additional variables 
+        /* At this point we have to carry around some additional variables
           so that we can handle any buffer flushes due to alpha == 0 values.
           See below why this is needed */
        x_curr = x;
@@ -276,14 +276,14 @@ gx_default_copy_alpha_hl_color(gx_device * dev, const byte * data, int data_x,
            if (alpha == 0) {
                /* With alpha 0 we want to avoid writing out this value.
-                 * While it is true that writting it out leaves the color 
+                 * While it is true that writting it out leaves the color
-                 * unchanged,  any device that's watching what pixels are 
+                 * unchanged,  any device that's watching what pixels are
-                 * written (such as the pattern tile devices) may have problems. 
+                 * written (such as the pattern tile devices) may have problems.
-                 * As in gx_default_copy_alpha the right thing to do is to write 
+                 * As in gx_default_copy_alpha the right thing to do is to write
-                 * out what we have so far and then continue to collect when we 
+                 * out what we have so far and then continue to collect when we
                 * get back to non zero alpha.  */
-                code = dev_proc(dev, copy_planes)(dev, &(gb_buff[gb_buff_start]), 
+                code = dev_proc(dev, copy_planes)(dev, &(gb_buff[gb_buff_start]),
-                                                  0, out_raster, gs_no_bitmap_id, 
+                                                  0, out_raster, gs_no_bitmap_id,
                                                  x_curr, ry, w_curr-1, 1, 1);
                if (code < 0) {
                    gs_free_object(mem, gb_buff, "copy_alpha_hl_color");
@@ -303,7 +303,7 @@ gx_default_copy_alpha_hl_color(gx_device * dev, const byte * data, int data_x,
                    /* First get the old color */
                    for (k = 0; k < ncomps; k++) {
                        /* We only have 8 and 16 bit depth to worry about.
-                           However, this stuff should really be done with 
+                           However, this stuff should really be done with
                           the device encode/decode procedure. */
                        byte *ptr = ((src_planes[k]) + (sx - data_x) * word_width);
                        curr_cv[k] = 0;
@@ -316,13 +316,13 @@ gx_default_copy_alpha_hl_color(gx_device * dev, const byte * data, int data_x,
                                curr_cv[k] += *ptr;
                                curr_cv[k] += curr_cv[k] << 8;
                        }
-                        /* Now compute the new color which is a blend of 
+                        /* Now compute the new color which is a blend of
                           the old and the new */
                        blend_cv[k] =  ((curr_cv[k]<<8) +
                                        (((long) src_cv[k] - (long) curr_cv[k]) * alpha))>>8;
                        composite = &(blend_cv[0]);
                    }
-                } 
+                }
                /* Update our plane data buffers.  Just reuse the current one */
                for (k = 0; k < ncomps; k++) {
                    byte *ptr = ((src_planes[k]) + (sx - data_x) * word_width);
@@ -335,10 +335,10 @@ gx_default_copy_alpha_hl_color(gx_device * dev, const byte * data, int data_x,
                }
            } /* else on alpha != 0 */
        } /* loop on x */
-        /* Flush what ever we have left.  We may only have a partial due to 
+        /* Flush what ever we have left.  We may only have a partial due to
           the presence of alpha = 0 values */
-        code = dev_proc(dev, copy_planes)(dev, &(gb_buff[gb_buff_start]), 
+        code = dev_proc(dev, copy_planes)(dev, &(gb_buff[gb_buff_start]),
-                                          0, out_raster, gs_no_bitmap_id, 
+                                          0, out_raster, gs_no_bitmap_id,
                                          x_curr, ry, w_curr, 1, 1);
    } /* loop on y */
    gs_free_object(mem, gb_buff, "copy_alpha_hl_color");
@@ -596,15 +596,15 @@ gx_default_fill_mask(gx_device * orig_dev,
 }
 /* Default implementation of strip_tile_rect_devn.  With the current design
-   only devices that support devn color will be making use of this 
+   only devices that support devn color will be making use of this
   procedure and those are planar devices.  So we have an implemenation
   for planar devices and not a default implemenetation at this time. */
 int
 gx_default_strip_tile_rect_devn(gx_device * dev, const gx_strip_bitmap * tiles,
-   int x, int y, int w, int h, const gx_drawing_color * pdcolor0, 
+   int x, int y, int w, int h, const gx_drawing_color * pdcolor0,
   const gx_drawing_color * pdcolor1, int px, int py)
 {
-    return_error(gs_error_unregistered); 
+    return_error(gs_error_unregistered);
 }
 /* Default implementation of strip_tile_rectangle */
diff --git a/base/gdevepo.c b/base/gdevepo.c
index e34542732..95f676d51 100644
--- a/base/gdevepo.c
+++ b/base/gdevepo.c
@@ -230,16 +230,16 @@ epo_check_and_install(gx_device *dev)
    int code = 0;
    bool is_installed;
    bool can_optimize = false;
-    
    /* Debugging mode to totally disable this */
    if (gs_debug_c(gs_debug_flag_epo_disable)) {
        return code;
    }
-    
    DPRINTF1(dev->memory, "current device is %s\n", dev->dname);
    is_installed = is_device_installed(dev, EPO_DEVICENAME);
-    
    if (is_installed) {
        DPRINTF1(dev->memory, "device %s already installed\n", EPO_DEVICENAME);
        /* This is looking for the case where the device
@@ -254,7 +254,7 @@ epo_check_and_install(gx_device *dev)
            /* Not doing any pending fillpages because we are about to do
             * a fillpage anyway
             */
-            gx_device_unsubclass(dev);        
+            gx_device_unsubclass(dev);
            return code;
        }
    } else {
@@ -278,7 +278,7 @@ epo_check_and_install(gx_device *dev)
        DPRINTF1(dev->memory, "ERROR installing device %s\n", EPO_DEVICENAME);
        return code;
    }
-        
    DPRINTF1(dev->memory, "SUCCESS installed device %s\n", dev->dname);
    return code;
 }
@@ -288,7 +288,7 @@ epo_handle_erase_page(gx_device *dev)
 {
    erasepage_subclass_data *data = (erasepage_subclass_data *)dev->subclass_data;
    int code = 0;
-    
    if (gs_debug_c(gs_debug_flag_epo_install_only)) {
        gx_device_unsubclass(dev);
        DPRINTF1(dev->memory, "Uninstall erasepage, device=%s\n", dev->dname);
@@ -314,7 +314,7 @@ epo_handle_erase_page(gx_device *dev)
 int epo_fillpage(gx_device *dev, gs_gstate * pgs, gx_device_color *pdevc)
 {
    erasepage_subclass_data *data = (erasepage_subclass_data *)dev->subclass_data;
-    
    if (gs_debug_c(gs_debug_flag_epo_install_only)) {
        return default_subclass_fillpage(dev, pgs, pdevc);
    }
@@ -322,13 +322,13 @@ int epo_fillpage(gx_device *dev, gs_gstate * pgs, gx_device_color *pdevc)
    /* If color is not pure, don't defer this, uninstall and do it now */
    if (!color_is_pure(pdevc)) {
        DPRINTF(dev->memory, "epo_fillpage(), color is not pure, uninstalling\n");
-        gx_device_unsubclass(dev);        
+        gx_device_unsubclass(dev);
        return dev_proc(dev, fillpage)(dev, pgs, pdevc);
    }
-    
    /* Save the color being requested, and swallow the fillpage */
    data->last_color = pdevc->colors.pure;
-    
    DPRINTF(dev->memory, "Swallowing fillpage\n");
    return 0;
 }
diff --git a/base/gdevp14.h b/base/gdevp14.h
index 635ab1113..c4bf77b1e 100644
--- a/base/gdevp14.h
+++ b/base/gdevp14.h
@@ -100,7 +100,7 @@ struct pdf14_mask_s {
 /* A structure to hold information about the group color related
 * procs and other information. These may change depending upon
 * if the blending space is different than the base space.
- * The structure is a list that is updated upo every transparency 
+ * The structure is a list that is updated upo every transparency
 * group push and pop */
 typedef struct pdf14_group_color_s pdf14_group_color_t;
diff --git a/base/gp_psync.c b/base/gp_psync.c
index 6d2c583e4..a15d5bcca 100644
--- a/base/gp_psync.c
+++ b/base/gp_psync.c
@@ -215,7 +215,7 @@ gp_monitor_open(gp_monitor * mona)
    if (scode < 0) {
        goto done;
    }
-#else     
+#else
    ((gp_pthread_recursive_t *)mona)->self_id = 0;      /* Not valid unless mutex is locked */
    ((gp_pthread_recursive_t *)mona)->lcount = 0;
 #endif
diff --git a/base/gsccolor.h b/base/gsccolor.h
index 1bdef3118..3689be42d 100644
--- a/base/gsccolor.h
+++ b/base/gsccolor.h
@@ -36,7 +36,7 @@ typedef struct gs_pattern_instance_s gs_pattern_instance_t;
 #  define GS_CLIENT_COLOR_MAX_COMPONENTS (64)
 #endif
-#ifndef MAX_COMPONENTS_IN_DEVN          
+#ifndef MAX_COMPONENTS_IN_DEVN
 #  define MAX_COMPONENTS_IN_DEVN (64)
 #endif
diff --git a/base/gscicach.c b/base/gscicach.c
index b524feb13..0ea68c187 100644
--- a/base/gscicach.c
+++ b/base/gscicach.c
@@ -31,7 +31,7 @@ typedef struct gs_color_index_cache_elem_s gs_color_index_cache_elem_t;
 struct gs_color_index_cache_elem_s {
    union _color {
      gx_color_index cindex;
-      ushort devn[GS_CLIENT_COLOR_MAX_COMPONENTS];  
+      ushort devn[GS_CLIENT_COLOR_MAX_COMPONENTS];
    } color;
    gx_device_color_type color_type;
    uint chain;
@@ -189,7 +189,7 @@ include_into_touch_list(gs_color_index_cache_t *self, uint i)
 }
 static int
-get_color_index_cache_elem(gs_color_index_cache_t *self, 
+get_color_index_cache_elem(gs_color_index_cache_t *self,
                           const float *paint_values, uint *pi)
 {
    int client_num_components = self->client_num_components;
@@ -199,7 +199,7 @@ get_color_index_cache_elem(gs_color_index_cache_t *self,
    if (i != MYNULL) {
        uint tries = 16; /* Arbitrary. */
-        if (!memcmp(paint_values, self->paint_values + i * client_num_components, 
+        if (!memcmp(paint_values, self->paint_values + i * client_num_components,
                    sizeof(*paint_values) * client_num_components)) {
            if (self->recent_touch != i) {
                exclude_from_touch_list(self, i);
@@ -209,7 +209,7 @@ get_color_index_cache_elem(gs_color_index_cache_t *self,
            return 1;
        }
        for (j = self->buf[i].next; tries -- && j != i; j = self->buf[j].next) {
-            if (!memcmp(paint_values, self->paint_values + j * client_num_components, 
+            if (!memcmp(paint_values, self->paint_values + j * client_num_components,
                        sizeof(*paint_values) * client_num_components)) {
                exclude_from_chain(self, j);
                include_into_chain(self, j, c);
@@ -251,15 +251,15 @@ compute_frac_values(gs_color_index_cache_t *self, uint i)
        for (j = 0; j < device_num_components; j++) {
                int shift = cinfo->comp_shift[j];
                int bits = cinfo->comp_bits[j];
-                self->frac_values[i * device_num_components + j] = 
+                self->frac_values[i * device_num_components + j] =
-                    ((c >> shift) & ((1 << bits) - 1)) << 
+                    ((c >> shift) & ((1 << bits) - 1)) <<
                    (sizeof(frac31) * 8 - 1 - bits);
        }
        self->buf[i].frac_values_done = true;
    } else {
        /* Must be devn */
        for (j = 0; j < device_num_components; j++) {
-            self->frac_values[i * device_num_components + j] = 
+            self->frac_values[i * device_num_components + j] =
                cv2frac31(self->buf[i].color.devn[j]);
        }
        self->buf[i].frac_values_done = true;
@@ -267,7 +267,7 @@ compute_frac_values(gs_color_index_cache_t *self, uint i)
 }
 int
-gs_cached_color_index(gs_color_index_cache_t *self, const float *paint_values, 
+gs_cached_color_index(gs_color_index_cache_t *self, const float *paint_values,
                      gx_device_color *pdevc, frac31 *frac_values)
 {
    /* Must return 2 if the color is not pure.
@@ -283,7 +283,7 @@ gs_cached_color_index(gs_color_index_cache_t *self, const float *paint_values,
            if (self->buf[i].color_type == &gx_dc_type_data_pure) {
                pdevc->colors.pure = self->buf[i].color.cindex;
                pdevc->type = &gx_dc_type_data_pure;
-                memcpy(pdevc->ccolor.paint.values, paint_values, 
+                memcpy(pdevc->ccolor.paint.values, paint_values,
                       sizeof(*paint_values) * client_num_components);
            } else {
                /* devn case */
@@ -291,7 +291,7 @@ gs_cached_color_index(gs_color_index_cache_t *self, const float *paint_values,
                    pdevc->colors.devn.values[j] = self->buf[i].color.devn[j];
                }
                pdevc->type = &gx_dc_type_data_devn;
-                memcpy(pdevc->ccolor.paint.values, paint_values, 
+                memcpy(pdevc->ccolor.paint.values, paint_values,
                       sizeof(*paint_values) * client_num_components);
            }
            pdevc->ccolor_valid = true;
@@ -304,11 +304,11 @@ gs_cached_color_index(gs_color_index_cache_t *self, const float *paint_values,
        if (pdevc == NULL)
            pdevc = &devc_local;
-        memcpy(self->paint_values + i * client_num_components, paint_values, 
+        memcpy(self->paint_values + i * client_num_components, paint_values,
               sizeof(*paint_values) * client_num_components);
-        memcpy(fcc.paint.values, paint_values, 
+        memcpy(fcc.paint.values, paint_values,
               sizeof(*paint_values) * client_num_components);
-        code = pcs->type->remap_color(&fcc, pcs, pdevc, self->pgs, 
+        code = pcs->type->remap_color(&fcc, pcs, pdevc, self->pgs,
                                      self->trans_dev, gs_color_select_texture);
        if (code < 0)
            return code;
@@ -328,7 +328,7 @@ gs_cached_color_index(gs_color_index_cache_t *self, const float *paint_values,
            self->buf[i].frac_values_done = false;
    }
    if (frac_values != NULL)
-        memcpy(frac_values, self->frac_values + i * device_num_components, 
+        memcpy(frac_values, self->frac_values + i * device_num_components,
               sizeof(*frac_values) * device_num_components);
    return 0;
 }
diff --git a/base/gscolor2.c b/base/gscolor2.c
index 08bdfc270..7c5439c6a 100644
--- a/base/gscolor2.c
+++ b/base/gscolor2.c
@@ -218,7 +218,7 @@ const gs_color_space_type gs_color_space_type_Indexed = {
 };
 /* To keep things vectorized and avoid an if test during the remap proc we
-   have another set of procedures to use for indexed color spaces when 
+   have another set of procedures to use for indexed color spaces when
   someone has specified a named color profile and the base space of the
   index color space is DeviceN or Separation */
 const gs_color_space_type gs_color_space_type_Indexed_Named = {
diff --git a/base/gscspace.h b/base/gscspace.h
index 0c07ccef4..a4aab7ca9 100644
--- a/base/gscspace.h
+++ b/base/gscspace.h
@@ -341,7 +341,7 @@ struct gs_color_space_s {
 gs_color_space *gs_cspace_new_DeviceGray(gs_memory_t *mem);
 gs_color_space *gs_cspace_new_DeviceRGB(gs_memory_t *mem);
 gs_color_space *gs_cspace_new_DeviceCMYK(gs_memory_t *mem);
-gs_color_space *gs_cspace_new_ICC(gs_memory_t *pmem, gs_gstate * pgs, 
+gs_color_space *gs_cspace_new_ICC(gs_memory_t *pmem, gs_gstate * pgs,
                                  int components);
 gs_color_space *gs_cspace_new_scrgb(gs_memory_t *pmem, gs_gstate * pgs);
diff --git a/base/gsdps1.c b/base/gsdps1.c
index 84980d4be..e3525b136 100644
--- a/base/gsdps1.c
+++ b/base/gsdps1.c
@@ -196,7 +196,7 @@ gs_rectfill(gs_gstate * pgs, const gs_rect * pr, uint count)
    const gs_gstate *pgs2 = (const gs_gstate *)pgs;
    bool hl_color_available = gx_hld_is_hl_color_available(pgs2, pdc);
    bool hl_color = (hl_color_available &&
-                dev_proc(pdev, dev_spec_op)(pdev, gxdso_supports_hlcolor, 
+                dev_proc(pdev, dev_spec_op)(pdev, gxdso_supports_hlcolor,
                                  NULL, 0));
    bool center_of_pixel = (pgs->fill_adjust.x == 0 && pgs->fill_adjust.y == 0);
diff --git a/base/gsequivc.c b/base/gsequivc.c
index fabcd331c..c268fb6d2 100644
--- a/base/gsequivc.c
+++ b/base/gsequivc.c
@@ -441,7 +441,7 @@ cmap_separation_capture_cmyk_color(frac all, gx_device_color * pdc,
    dmprintf(pgs->memory, "cmap_separation_capture_cmyk_color - this routine should not be executed\n");
 }
-/* The call to this is actually going to occur if we happen to be using a 
+/* The call to this is actually going to occur if we happen to be using a
   named color profile and doing a replacement.  Since the destination profile
   will have been CMYK based during the swap out to find the equivalent color, we can
   go ahead and just grab the cmyk portion */
@@ -518,10 +518,10 @@ capture_spot_equivalent_cmyk_colors(gx_device * pdev, const gs_gstate * pgs,
       for the CMYK + OG values. */
    if (curr_output_profile->data_cs == gsNCHANNEL) {
-        temp_profile.device_profile[GS_DEFAULT_DEVICE_PROFILE] = 
+        temp_profile.device_profile[GS_DEFAULT_DEVICE_PROFILE] =
            temp_state.icc_manager->default_cmyk;
    } else {
-        temp_profile.device_profile[GS_DEFAULT_DEVICE_PROFILE] = 
+        temp_profile.device_profile[GS_DEFAULT_DEVICE_PROFILE] =
            curr_output_profile;
    }
    set_dev_proc(&temp_device, get_profile, gx_default_get_profile);
diff --git a/base/gsequivc.h b/base/gsequivc.h
index 7fddce581..a36bb97cd 100644
--- a/base/gsequivc.h
+++ b/base/gsequivc.h
@@ -45,7 +45,7 @@ typedef struct cmyk_color_s {
 } cmyk_color;
 /* if you make any additions/changes to the equivalent_cmyk_color_params or the
-   cmyk_color structrs you need to make the appropriate additions/changes 
+   cmyk_color structrs you need to make the appropriate additions/changes
   to the compare_equivalent_cmyk_color_params() function in gdevdevn.c */
 /*
diff --git a/base/gsicc_cache.h b/base/gsicc_cache.h
index c9b9d0ab3..29ac034cc 100644
--- a/base/gsicc_cache.h
+++ b/base/gsicc_cache.h
@@ -37,7 +37,7 @@ void gsicc_init_buffer(gsicc_bufferdesc_t *buffer_desc, unsigned char num_chan,
                  unsigned char bytes_per_chan, bool has_alpha, bool alpha_first,
                  bool is_planar, int plane_stride, int row_stride, int num_rows,
                  int pixels_per_row);
-bool gsicc_alloc_link_entry(gsicc_link_cache_t *icc_link_cache, 
+bool gsicc_alloc_link_entry(gsicc_link_cache_t *icc_link_cache,
                            gsicc_link_t **ret_link, gsicc_hashlink_t hash,
                            bool include_softproof, bool include_devlink);
 gsicc_link_t* gsicc_get_link(const gs_gstate * pgs, gx_device *dev,
@@ -55,7 +55,7 @@ void gsicc_link_free(gsicc_link_t *icc_link, const gs_memory_t *memory);
 void gsicc_get_icc_buff_hash(unsigned char *buffer, int64_t *hash, unsigned int buff_size);
 int64_t gsicc_get_hash(cmm_profile_t *profile);
 int gsicc_transform_named_color(const float tint_values[],
-                            gsicc_namedcolor_t color_names[], 
+                            gsicc_namedcolor_t color_names[],
                            uint num_names,
                            gx_color_value device_values[],
                            const gs_gstate *pgs, gx_device *dev,
diff --git a/base/gsicc_create.h b/base/gsicc_create.h
index ca84eb3aa..b952a1c41 100644
--- a/base/gsicc_create.h
+++ b/base/gsicc_create.h
@@ -42,6 +42,6 @@ cmm_profile_t* gsicc_create_from_cal(float *white, float *black, float *gamma,
                                     float *matrix, gs_memory_t *memory,
                                     int num_colors);
 byte* gsicc_getv2buffer(cmm_profile_t *srcprofile, int *size);
-byte* gsicc_create_getv2buffer(const gs_gstate *pgs, 
+byte* gsicc_create_getv2buffer(const gs_gstate *pgs,
                                cmm_profile_t *srcprofile, int *size);
 #endif
diff --git a/base/gsiodisk.c b/base/gsiodisk.c
index 5a127e1b6..2dcbe269e 100644
--- a/base/gsiodisk.c
+++ b/base/gsiodisk.c
@@ -239,7 +239,7 @@ iodev_diskn_fopen(gx_io_device * iodev, const char *fname, const char *access,
    }
    code = iodev_os_gp_fopen(iodev_default(pstate->memory), realname, access, pfile, rfname, rnamelen);
-    
 done:
    if (realname != NULL)
        gs_free_object(pstate->memory, realname, "iodev_diskn_fopen(realname)");
@@ -359,7 +359,7 @@ diskn_enumerate_files(gs_memory_t * mem, gx_io_device * iodev, const char *pat,
                      uint patlen)
 {
    diskn_state * pstate = (diskn_state *)iodev->state;
-    
    return (file_enum *)map_file_enum_init(mem, (char *)pstate->root, pat, patlen);
 }
@@ -630,7 +630,7 @@ MapFileRename(gs_memory_t *mem, const char * rootpath, const char * newfilename,
    oldfullname = (char *)gs_alloc_bytes(mem, ototlen, "MapFileRename(oldfullname)");
    newfullname = (char *)gs_alloc_bytes(mem, ntotlen, "MapFileRename(newfullname)");
-    if (oldfullname && newfullname) {    
+    if (oldfullname && newfullname) {
        gs_sprintf(oldfullname, "%s%s", rootpath, oldfilename);
        gs_sprintf(newfullname, "%s%s", rootpath, newfilename);
        rename(oldfullname, newfullname);
diff --git a/base/gsmatrix.h b/base/gsmatrix.h
index ba365da1b..0a175aa51 100644
--- a/base/gsmatrix.h
+++ b/base/gsmatrix.h
@@ -26,7 +26,7 @@
 /* transformation matrices. */
 /* if you make any additions/changes to the gs_matrix_s structure or the
-   _matrix_body macro you need to make the appropriate additions/changes 
+   _matrix_body macro you need to make the appropriate additions/changes
   to the gs_matrix_compare() function in gsmatrix.c */
 /* Structure for a transformation matrix. */
 #define _matrix_body\
diff --git a/base/gspath.c b/base/gspath.c
index 02d4c54b7..773bfae8b 100644
--- a/base/gspath.c
+++ b/base/gspath.c
@@ -324,7 +324,7 @@ static int common_clip(gs_gstate *, int);
 /* Figure out the bbox for a path and a clip path with adjustment if we are
   also doing a stroke.  This is used by the xps interpeter to deteremine
-   how big of a transparency group or softmask should be pushed.  Often in 
+   how big of a transparency group or softmask should be pushed.  Often in
   xps we fill a path with a particular softmask and some other graphic object.
   The transparency group will be the intersection of the path and clipping
   path */
diff --git a/base/gssprintf.c b/base/gssprintf.c
index aab4051f0..2b24580e4 100644
--- a/base/gssprintf.c
+++ b/base/gssprintf.c
@@ -116,13 +116,13 @@ static const char null_string[] = "(null)";
 #define NDIG 80
 /* buf must have at least NDIG bytes */
-static char *apr_cvt(double arg, int ndigits, int *decpt, int *sign, 
+static char *apr_cvt(double arg, int ndigits, int *decpt, int *sign,
                     int eflag, char *buf)
 {
    register int r2;
    double fi, fj;
    register char *p, *p1;
-    
    if (ndigits >= NDIG - 1)
        ndigits = NDIG - 2;
    r2 = 0;
@@ -387,7 +387,7 @@ static char *conv_10(register apr_int32_t num, register int is_unsigned,
        *is_negative = (num < 0);
        /*
-         * On a 2's complement machine, negating the most negative integer 
+         * On a 2's complement machine, negating the most negative integer
         * results in a number that cannot be represented as a signed integer.
         * Here is what we do to obtain the number's magnitude:
         *      a. add 1 to the number
@@ -402,7 +402,7 @@ static char *conv_10(register apr_int32_t num, register int is_unsigned,
    }
    /*
-     * We use a do-while loop so that we write at least 1 digit 
+     * We use a do-while loop so that we write at least 1 digit
     */
    do {
        register apr_uint32_t new_magnitude = magnitude / 10;
@@ -439,7 +439,7 @@ static char *conv_10_quad(apr_int64_t num, register int is_unsigned,
        *is_negative = (num < 0);
        /*
-         * On a 2's complement machine, negating the most negative integer 
+         * On a 2's complement machine, negating the most negative integer
         * results in a number that cannot be represented as a signed integer.
         * Here is what we do to obtain the number's magnitude:
         *      a. add 1 to the number
@@ -454,7 +454,7 @@ static char *conv_10_quad(apr_int64_t num, register int is_unsigned,
    }
    /*
-     * We use a do-while loop so that we write at least 1 digit 
+     * We use a do-while loop so that we write at least 1 digit
     */
    do {
        apr_uint64_t new_magnitude = magnitude / 10;
@@ -885,7 +885,7 @@ static int apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *),
                (sizeof(APR_INT64_T_FMT) == 3 &&
                 fmt[0] == APR_INT64_T_FMT[0]) ||
                (sizeof(APR_INT64_T_FMT) > 4 &&
-                 strncmp(fmt, APR_INT64_T_FMT, 
+                 strncmp(fmt, APR_INT64_T_FMT,
                         sizeof(APR_INT64_T_FMT) - 2) == 0)) {
                /* Need to account for trailing 'd' and null in sizeof() */
                var_type = IS_QUAD;
@@ -1413,7 +1413,7 @@ static int apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *),
            }
            /*
-             * Print the string s. 
+             * Print the string s.
             */
            if (print_something == YES) {
                for (i = s_len; i != 0; i--) {
diff --git a/base/gstext.c b/base/gstext.c
index bb258d39f..bcf21ec59 100644
--- a/base/gstext.c
+++ b/base/gstext.c
@@ -340,7 +340,7 @@ gs_text_begin(gs_gstate * pgs, const gs_text_params_t * text,
        cmm_dev_profile_t* dev_profile;
        dev_proc(dev, get_profile)(dev, &dev_profile);
-        if (dev_profile->sim_overprint && 
+        if (dev_profile->sim_overprint &&
            (dev_profile->device_profile[GS_DEFAULT_DEVICE_PROFILE]->data_cs == gsCMYK ||
             dev_profile->device_profile[GS_DEFAULT_DEVICE_PROFILE]->data_cs == gsNCHANNEL)) {
            if (pgs->text_rendering_mode == 0) {
diff --git a/base/gstype42.c b/base/gstype42.c
index 558892013..fff36d349 100644
--- a/base/gstype42.c
+++ b/base/gstype42.c
@@ -348,7 +348,7 @@ gs_type42_font_init(gs_font_type42 * pfont, int subfontID)
                gs_free_object(pfont->memory, pfont->data.len_glyphs, "gs_len_glyphs_release");
                return code;
            }
-            
            /* The 'loca' may not be in order, so we construct a glyph length array */
            /* Since 'loca' is usually sorted, first try the simple linear scan to  */
            /* avoid the need to perform the more expensive process. */
@@ -386,7 +386,7 @@ gs_type42_font_init(gs_font_type42 * pfont, int subfontID)
                gs_type42_font_init_sort_t *psortary =
                    (gs_type42_font_init_sort_t *)gs_alloc_byte_array(pfont->memory,
                        loca_size, sizeof(gs_type42_font_init_sort_t), "gs_type42_font_init(sort loca)");
-            
                if (psortary == 0)
                    return_error(gs_error_VMerror);
                /* loca_size > 0 due to condition above, so we always have the 0th element. */
@@ -406,7 +406,7 @@ gs_type42_font_init(gs_font_type42 * pfont, int subfontID)
                    return_error(gs_error_invalidfont);
                for (i = num_valid_loca_elm; i--;) {
                    long old_length;
-            
                    psort = psortary + i;
                    old_length = psort->glyph_length;
                    if (old_length < 0 || old_length > 2000 /*  arbitrary */) {
diff --git a/base/gxccman.c b/base/gxccman.c
index b2d84305a..0cc1a9d5b 100644
--- a/base/gxccman.c
+++ b/base/gxccman.c
@@ -79,7 +79,7 @@ gx_char_cache_alloc(gs_memory_t * struct_mem, gs_memory_t * bits_mem,
       cache character memory before filling the table.  The searching
       code uses an empty table entry as a sentinel. */
    chsize = max(chsize, ROUND_UP(bmax, sizeof_cached_char) / sizeof_cached_char + 1);
-    
    /* Round up chsize to a power of 2. */
    while (chsize & (chsize + 1))
        chsize |= chsize >> 1;
diff --git a/base/gxcht.c b/base/gxcht.c
index e4b47ce44..ea93ed13d 100644
--- a/base/gxcht.c
+++ b/base/gxcht.c
@@ -841,12 +841,12 @@ static const gx_const_strip_bitmap ht_no_bitmap = {
 /* Set the color value(s) and halftone mask for one plane. */
 static inline void set_plane_color(int i, color_values_pair_t *pvp, const gx_device_color * pdc,
-    const gx_const_strip_bitmap * sbits[MAX_DCC], gx_ht_cache * caches[MAX_DCC], 
+    const gx_const_strip_bitmap * sbits[MAX_DCC], gx_ht_cache * caches[MAX_DCC],
    gx_color_value max_color, bool invert)
 {
    uint q = pdc->colors.colored.c_base[i];
    uint r = pdc->colors.colored.c_level[i];
-        
    pvp->values[0][i] = fractional_color(q, max_color);
    if (r == 0)
        pvp->values[1][i] = pvp->values[0][i], sbits[i] = &ht_no_bitmap;
@@ -855,7 +855,7 @@ static inline void set_plane_color(int i, color_values_pair_t *pvp, const gx_dev
        sbits[i] = (const gx_const_strip_bitmap *) &gx_render_ht(caches[i], r)->tiles;
    } else {
        const gx_device_halftone *pdht = pdc->colors.colored.c_ht;
-        int nlevels = 
+        int nlevels =
            (pdht->components ? pdht->components[i].corder.num_levels : pdht->order.num_levels);
        pvp->values[1][i] = pvp->values[0][i];
        pvp->values[0][i] = fractional_color(q + 1, max_color);
diff --git a/base/gxcldev.h b/base/gxcldev.h
index 00dca1c81..621dca445 100644
--- a/base/gxcldev.h
+++ b/base/gxcldev.h
@@ -271,7 +271,7 @@ struct gx_clist_state_s {
    short clip_enabled;         /* 0 = don't clip, 1 = do clip, */
                                /* -1 is used internally */
    bool color_is_alpha;        /* for copy_color_alpha */
-    bool color_is_devn;     /* more overload of copy_color_alpha for devn support */ 
+    bool color_is_devn;     /* more overload of copy_color_alpha for devn support */
    uint known;                 /* flags for whether this band */
                                /* knows various misc. parameters */
    /* We assign 'known' flags here from the high end; */
@@ -451,7 +451,7 @@ typedef struct {
 extern const clist_select_color_t
      clist_select_color0, clist_select_color1, clist_select_tile_color0,
-      clist_select_tile_color1, clist_select_devn_color0, 
+      clist_select_tile_color1, clist_select_devn_color0,
      clist_select_devn_color1;
 /* See comments in gxclutil.c */
@@ -565,8 +565,8 @@ const byte *cmd_read_matrix(gs_matrix * pmat, const byte * cbp);
 int cmd_write_rect_cmd(gx_device_clist_writer * cldev, gx_clist_state * pcls,
                       int op, int x, int y, int width, int height);
 /* Put out a fill with a devn color */
-int cmd_write_rect_hl_cmd(gx_device_clist_writer * cldev, 
+int cmd_write_rect_hl_cmd(gx_device_clist_writer * cldev,
-                             gx_clist_state * pcls, int op, int x, int y, 
+                             gx_clist_state * pcls, int op, int x, int y,
                             int width, int height, bool extended_command);
 /* Put out a fill or tile rectangle command for fillpage. */
 int cmd_write_page_rect_cmd(gx_device_clist_writer * cldev, int op);
diff --git a/base/gxclimag.c b/base/gxclimag.c
index 9747c8991..5b6ea513d 100644
--- a/base/gxclimag.c
+++ b/base/gxclimag.c
@@ -797,7 +797,7 @@ clist_begin_typed_image(gx_device * dev, const gs_gstate * pgs,
        if (!indexed) {
            pie->monitor_color = true;
            /* Set up the unpacking proc for monitoring */
-            get_unpack_proc((gx_image_enum_common_t*) pie, &(pie->decode), 
+            get_unpack_proc((gx_image_enum_common_t*) pie, &(pie->decode),
                             pim->format, pim->Decode);
            get_map(&(pie->decode), pim->format, pim->Decode);
            if (pie->decode.unpack == NULL) {
@@ -2004,7 +2004,7 @@ cmd_image_plane_data_mon(gx_device_clist_writer * cldev, gx_clist_state * pcls,
               to see if we have any non-neutral colors */
            int pdata_x;
            byte *data_ptr =  (byte *)(planes[0].data + i * planes[0].raster + offsets[0] + offset);
-            byte *buffer = (byte *)(*pie_c->decode.unpack)(pie_c->buffer, &pdata_x, 
+            byte *buffer = (byte *)(*pie_c->decode.unpack)(pie_c->buffer, &pdata_x,
                                     data_ptr, 0, dsize, pie_c->decode.map,
                pie_c->decode.spread, pie_c->decode.spp);
diff --git a/base/gxclip.c b/base/gxclip.c
index f566e09fe..40479976b 100644
--- a/base/gxclip.c
+++ b/base/gxclip.c
@@ -590,7 +590,7 @@ clip_fill_rectangle(gx_device * dev, int x, int y, int w, int h,
 }
 int
-clip_call_fill_rectangle_hl_color(clip_callback_data_t * pccd, int xc, int yc, 
+clip_call_fill_rectangle_hl_color(clip_callback_data_t * pccd, int xc, int yc,
                                  int xec, int yec)
 {
    gs_fixed_rect rect;
@@ -1245,7 +1245,7 @@ clip_copy_alpha(gx_device * dev,
 }
 int
-clip_call_copy_alpha_hl_color(clip_callback_data_t * pccd, int xc, int yc, 
+clip_call_copy_alpha_hl_color(clip_callback_data_t * pccd, int xc, int yc,
                              int xec, int yec)
 {
    return (*dev_proc(pccd->tdev, copy_alpha_hl_color))
@@ -1308,8 +1308,8 @@ clip_call_strip_tile_rect_devn(clip_callback_data_t * pccd, int xc, int yc, int
 static int
 clip_strip_tile_rect_devn(gx_device * dev, const gx_strip_bitmap * tiles,
                                int x, int y, int w, int h,
-                                const gx_drawing_color *pdcolor0, 
+                                const gx_drawing_color *pdcolor0,
-                                const gx_drawing_color *pdcolor1, int phase_x, 
+                                const gx_drawing_color *pdcolor1, int phase_x,
                                int phase_y)
 {
    gx_device_clip *rdev = (gx_device_clip *) dev;
diff --git a/base/gxclip2.c b/base/gxclip2.c
index 1b4d15585..810669317 100644
--- a/base/gxclip2.c
+++ b/base/gxclip2.c
@@ -155,7 +155,7 @@ tile_clip_set_phase(gx_device_tile_clip * cdev, int px, int py)
 /* Fill a rectangle with high level devn color by tiling with the mask. */
 static int
 tile_clip_fill_rectangle_hl_color(gx_device *dev, const gs_fixed_rect *rect,
-                const gs_gstate *pgs, const gx_drawing_color *pdcolor, 
+                const gs_gstate *pgs, const gx_drawing_color *pdcolor,
                const gx_clip_path *pcpath)
 {
    gx_device_tile_clip *cdev = (gx_device_tile_clip *) dev;
@@ -177,7 +177,7 @@ tile_clip_fill_rectangle_hl_color(gx_device *dev, const gs_fixed_rect *rect,
    w = fixed2int(rect->q.x) - x;
    h = fixed2int(rect->q.y) - y;
    return (*dev_proc(tdev, strip_tile_rect_devn))(tdev, &cdev->tiles,
-                                                    x, y, w, h, &dcolor0, &dcolor1, 
+                                                    x, y, w, h, &dcolor0, &dcolor1,
                                                    cdev->phase.x, cdev->phase.y);
 }
@@ -379,7 +379,7 @@ tile_clip_copy_alpha(gx_device * dev,
 static int
 tile_clip_copy_alpha_hl_color(gx_device * dev,
                const byte * data, int sourcex, int raster, gx_bitmap_id id,
-                int x, int y, int w, int h, const gx_drawing_color *pdcolor, 
+                int x, int y, int w, int h, const gx_drawing_color *pdcolor,
                int depth)
 {
    gx_device_tile_clip *cdev = (gx_device_tile_clip *) dev;
diff --git a/base/gxclipm.c b/base/gxclipm.c
index ec02ba9a8..5723126a3 100644
--- a/base/gxclipm.c
+++ b/base/gxclipm.c
@@ -152,7 +152,7 @@ mask_clip_fill_rectangle_hl_color(gx_device *dev,
    /* It would be nice to have a higher level way to do this operation
       like a copy_mono_hl_color */
    return (pdcolor->type->fill_masked)
-            (pdcolor, cdev->tiles.data + my0 * cdev->tiles.raster, mx0, 
+            (pdcolor, cdev->tiles.data + my0 * cdev->tiles.raster, mx0,
             cdev->tiles.raster, cdev->tiles.id, mx0 - cdev->phase.x,
             my0 - cdev->phase.y, mx1 - mx0, my1 - my0,
             tdev, lop_default, false);
@@ -404,7 +404,7 @@ mask_clip_copy_alpha(gx_device * dev,
 static int
 mask_clip_copy_alpha_hl_color(gx_device * dev,
                const byte * data, int sourcex, int raster, gx_bitmap_id id,
-                int x, int y, int w, int h, const gx_drawing_color *pdcolor, 
+                int x, int y, int w, int h, const gx_drawing_color *pdcolor,
                int depth)
 {
    gx_device_mask_clip *cdev = (gx_device_mask_clip *) dev;
@@ -437,7 +437,7 @@ mask_clip_strip_tile_rectangle(gx_device * dev, const gx_strip_bitmap * tiles,
 static int
 mask_clip_strip_tile_rect_devn(gx_device * dev, const gx_strip_bitmap * tiles,
                               int x, int y, int w, int h,
-                               const gx_drawing_color *pdcolor0, 
+                               const gx_drawing_color *pdcolor0,
                               const gx_drawing_color *pdcolor1,
                               int phase_x, int phase_y)
 {
diff --git a/base/gxdcolor.c b/base/gxdcolor.c
index b4178871d..b5c17dd9f 100644
--- a/base/gxdcolor.c
+++ b/base/gxdcolor.c
@@ -853,7 +853,7 @@ gx_dc_pure_fill_masked(const gx_device_color * pdevc, const byte * data,
        if (!rop3_uses_S(lop))
            lop |= rop3_S;
-            
        return (*dev_proc(dev, strip_copy_rop))
            (dev, data, data_x, raster, id, scolors,
             NULL, tcolors, x, y, w, h, 0, 0,
diff --git a/base/gxfapi.c b/base/gxfapi.c
index e6bc445d9..ae464de5b 100644
--- a/base/gxfapi.c
+++ b/base/gxfapi.c
@@ -285,7 +285,7 @@ recreate_multiple_master(gs_font_base *pbfont)
            changed = (memcmp(I->face.WeightVector.values, pfont1->data.WeightVector.values,
                             pfont1->data.WeightVector.count * sizeof(pfont1->data.WeightVector.values[0])) != 0);
        }
-        
        if (changed) {
            r = (I->set_mm_weight_vector(I, &I->ff, pfont1->data.WeightVector.values, pfont1->data.WeightVector.count) == gs_error_invalidaccess);
            I->face.WeightVector.count = pfont1->data.WeightVector.count;
@@ -849,7 +849,7 @@ fapi_image_uncached_glyph(gs_font *pfont, gs_gstate *pgs, gs_show_enum *penum,
        code = gs_gstate_color_load(pgs);
        if (code < 0)
            return code;
-        
        code = gx_image_fill_masked(dev, r, 0, dstr, gx_no_bitmap_id,
                                    (int)dx, (int)dy,
                                    rast->width, rast->height,
@@ -872,7 +872,7 @@ fapi_image_uncached_glyph(gs_font *pfont, gs_gstate *pgs, gs_show_enum *penum,
        byte *bold_lines = NULL;
        byte *line = NULL;
        int ascent = 0;
-        
        pie = gs_image_enum_alloc(mem, "image_char(image_enum)");
        if (!pie) {
            return_error(gs_error_VMerror);
@@ -943,7 +943,7 @@ fapi_image_uncached_glyph(gs_font *pfont, gs_gstate *pgs, gs_show_enum *penum,
                                bits_merge(merged_line(y - kmask), merged_line(y - (kmask >> 1)), dest_bytes);
                            }
-                        }   
+                        }
                       /*
                        * As of this point in the loop, we maintain the following
@@ -1695,7 +1695,7 @@ gs_fapi_do_char(gs_font *pfont, gs_gstate *pgs, gs_text_enum_t *penum, char *fon
            I->ff.fapi_set_cache(penum, pbfont, &enc_char_name_string, index,
                                 sbw + 2, &char_bbox, sbwp, &imagenow);
    }
-    
    /* If we can render the glyph now, do so.
     * we may not be able to in the PS world if there's a CDevProc in the font
     * in which case gs_fapi_finish_render() will be called from the PS
@@ -1746,12 +1746,12 @@ gs_fapi_passfont(gs_font *pfont, int subfont, char *font_file_path,
    int code = 0;
    gs_fapi_server *I, **list;
    bool free_params = false;
-    gs_memory_t *mem = pfont->memory; 
+    gs_memory_t *mem = pfont->memory;
    const char *decodingID = NULL;
    bool do_restart = false;
-    
    list = gs_fapi_get_server_list(mem);
-    
    if (!list) /* Should never happen */
      return_error(gs_error_unregistered);
diff --git a/base/gxfapi.h b/base/gxfapi.h
index a1a747b6c..75fdc0c4f 100644
--- a/base/gxfapi.h
+++ b/base/gxfapi.h
@@ -334,9 +334,9 @@ struct gs_fapi_server_s
    /* Used to use the stored 'OrigFont' entry but */
    /* this did not change f a font was defined    */
    /* using an existing base font */
-         
-         
-         
    gs_fapi_retcode(*ensure_open) (gs_fapi_server *server, const char *param, int param_size);
    gs_fapi_retcode(*get_scaled_font) (gs_fapi_server *server, gs_fapi_font *ff, const gs_fapi_font_scale *scale, const char *xlatmap, gs_fapi_descendant_code dc);
    gs_fapi_retcode(*get_decodingID) (gs_fapi_server *server, gs_fapi_font *ff, const char **decodingID);
@@ -352,7 +352,7 @@ struct gs_fapi_server_s
    gs_fapi_retcode(*get_char_outline_metrics) (gs_fapi_server *server, gs_fapi_font *ff, gs_fapi_char_ref *c, gs_fapi_metrics *metrics);
    gs_fapi_retcode(*get_char_outline) (gs_fapi_server *server, gs_fapi_path *p);
    gs_fapi_retcode(*release_char_data) (gs_fapi_server *server);
-         
    gs_fapi_retcode(*release_typeface) (gs_fapi_server *server, void *server_font_data);
    gs_fapi_retcode(*check_cmap_for_GID) (gs_fapi_server *server, uint *index);
    gs_fapi_retcode(*get_font_info) (gs_fapi_server *server, gs_fapi_font *ff, gs_fapi_font_info item, int index, void *data, int *datalen);
@@ -442,7 +442,7 @@ gs_fapi_do_char(gs_font *pfont, gs_gstate *pgs, gs_text_enum_t *penum, char *fon
 * to hold the requested information - data == NULL, or data_len too
 * small will see data_len set to the required amount, and an error
 * returned.
- */ 
+ */
 int
 gs_fapi_get_font_info(gs_font *pfont, gs_fapi_font_info item, int index,
                      void *data, int *data_len);
diff --git a/base/gximdecode.c b/base/gximdecode.c
index b41de6a0d..f2096afda 100644
--- a/base/gximdecode.c
+++ b/base/gximdecode.c
@@ -22,7 +22,7 @@ monitoring in clist and for creating TIFF files for xpswrite device */
 /* We need to have the unpacking proc so that we can monitor the data for color
   or decode during xpswrite */
 void
-get_unpack_proc(gx_image_enum_common_t *pie, image_decode_t *imd, 
+get_unpack_proc(gx_image_enum_common_t *pie, image_decode_t *imd,
                gs_image_format_t format, const float *decode) {
    static sample_unpack_proc_t procs[2][6] = {
diff --git a/base/gxpath.h b/base/gxpath.h
index 01a04240c..fcceed424 100644
--- a/base/gxpath.h
+++ b/base/gxpath.h
@@ -44,10 +44,10 @@ typedef enum {
    sn_dash_tail = 8,           /* segment is followed by dash break     */
 } segment_notes;
-/* 
+/*
- * Used by interpreters for optimizing bbox size for transparency groups.  
+ * Used by interpreters for optimizing bbox size for transparency groups.
- * Depending upon the option we will return a bbox that may just included the 
+ * Depending upon the option we will return a bbox that may just included the
- * clip path or may include the intersection of the current path and the clip 
+ * clip path or may include the intersection of the current path and the clip
 * path and may include an adjustement for the stroke width.
 */
 typedef enum {
@@ -311,7 +311,7 @@ int gx_default_clip_box(const gs_gstate *, gs_fixed_rect *);
 int gx_effective_clip_path(gs_gstate *, gx_clip_path **);
 int gx_curr_fixed_bbox(gs_gstate * pgs, gs_fixed_rect *bbox, gs_bbox_comp_t comp_type);
 int gx_curr_bbox(gs_gstate * pgs, gs_rect *bbox, gs_bbox_comp_t comp_type);
- 
 /* Opaque type for a clip list. */
 typedef struct gx_clip_list_s gx_clip_list;
diff --git a/base/gxshade1.c b/base/gxshade1.c
index 4b86d138d..212c7c11f 100644
--- a/base/gxshade1.c
+++ b/base/gxshade1.c
@@ -343,7 +343,7 @@ gs_shading_A_fill_rectangle(const gs_shading_t * psh0, const gs_rect * rect,
 * For the purposes of explanation, we shall label the octants as below:
 *
 *     \2|1/       and Quadrants as:       |
- *     3\|/0                            Q1 | Q0 
+ *     3\|/0                            Q1 | Q0
 *    ---+---                          ----+----
 *     4/|\7                            Q2 | Q3
 *     /5|6\                               |
@@ -351,7 +351,7 @@ gs_shading_A_fill_rectangle(const gs_shading_t * psh0, const gs_rect * rect,
 * We find (dx,dy), the difference between the centres of the circles.
 * We look to see which octant this falls in. Firstly, this tells us which
 * quadrant of the circle we need to draw first (Octant n, starts with
- * Quadrant floor(n/2)). Secondly, it tells us which direction to form the 
+ * Quadrant floor(n/2)). Secondly, it tells us which direction to form the
 * tensor patch in; we always want to draw from the side 'closest' to
 * dx/dy to the side further away. This ensures that we don't overwrite
 * pixels in the incorrect order as the patch decomposes.
diff --git a/base/gxtext.h b/base/gxtext.h
index afe0bc894..ba18fca8e 100644
--- a/base/gxtext.h
+++ b/base/gxtext.h
@@ -168,7 +168,7 @@ rc_free_proc(rc_free_text_enum);
    show_width_status width_status; \
    /*gs_log2_scale_point log2_scale;*/ \
    int (*continue_proc) (gs_show_enum *)       /* continuation procedure */
-    
 /* The typedef is in gstext.h. */
 struct gs_text_enum_s {
    gs_text_enum_common;
diff --git a/base/icc34.h b/base/icc34.h
index a58b0b9dc..be36c272f 100644
--- a/base/icc34.h
+++ b/base/icc34.h
@@ -2,55 +2,55 @@
 #ifndef ICC_H
 #define ICC_H
-/***************************************************************** 
+/*****************************************************************
 Copyright (c) 1994-1996 SunSoft, Inc.
                    Rights Reserved
-Permission is hereby granted, free of charge, to any person 
+Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without restrict- 
+files (the "Software"), to deal in the Software without restrict-
-ion, including without limitation the rights to use, copy, modify, 
+ion, including without limitation the rights to use, copy, modify,
-merge, publish distribute, sublicense, and/or sell copies of the 
+merge, publish distribute, sublicense, and/or sell copies of the
-Software, and to permit persons to whom the Software is furnished 
+Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions: 
+to do so, subject to the following conditions:
- 
-The above copyright notice and this permission notice shall be 
+The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software. 
+included in all copies or substantial portions of the Software.
- 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-
-INFRINGEMENT.  IN NO EVENT SHALL SUNSOFT, INC. OR ITS PARENT 
+INFRINGEMENT.  IN NO EVENT SHALL SUNSOFT, INC. OR ITS PARENT
-COMPANY BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+COMPANY BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE. 
+OTHER DEALINGS IN THE SOFTWARE.
- 
-Except as contained in this notice, the name of SunSoft, Inc. 
+Except as contained in this notice, the name of SunSoft, Inc.
-shall not be used in advertising or otherwise to promote the 
+shall not be used in advertising or otherwise to promote the
-sale, use or other dealings in this Software without written 
+sale, use or other dealings in this Software without written
-authorization from SunSoft Inc. 
+authorization from SunSoft Inc.
 ******************************************************************/
 /*
 * This version of the header file corresponds to the profile
 * specification version 3.4.
 *
- * All header file entries are pre-fixed with "ic" to help 
+ * All header file entries are pre-fixed with "ic" to help
 * avoid name space collisions. Signatures are pre-fixed with
 * icSig.
 *
 * The structures defined in this header file were created to
 * represent a description of an ICC profile on disk. Rather
- * than use pointers a technique is used where a single byte array 
+ * than use pointers a technique is used where a single byte array
 * was placed at the end of each structure. This allows us in "C"
 * to extend the structure by allocating more data than is needed
 * to account for variable length structures.
 *
 * This also ensures that data following is allocated
 * contiguously and makes it easier to write and read data from
- * the file. 
+ * the file.
 *
 * For example to allocate space for a 256 count length UCR
 * and BG array, and fill the allocated data.  Note strlen + 1
@@ -62,20 +62,20 @@ authorization from SunSoft Inc.
        char            ucr_string[100], *ucr_char;
        strcpy(ucr_string, "Example ucrBG curves");
-        ucr_nbytes = sizeof(icUInt32Number) + 
+        ucr_nbytes = sizeof(icUInt32Number) +
                 (UCR_CURVE_SIZE * sizeof(icUInt16Number));
-        bg_nbytes = sizeof(icUInt32Number) + 
+        bg_nbytes = sizeof(icUInt32Number) +
                 (BG_CURVE_SIZE * sizeof(icUInt16Number));
        string_bytes = strlen(ucr_string) + 1;
        ucrBgWrite = (icUcrBg *)malloc(
                                (ucr_nbytes + bg_nbytes + string_bytes));
- 
        ucrCurve = (icUcrBgCurve *)ucrBgWrite->data;
        ucrCurve->count = UCR_CURVE_SIZE;
        for (i=0; i<ucrCurve->count; i++)
                ucrCurve->curve[i] = (icUInt16Number)i;
- 
        bgCurve = (icUcrBgCurve *)((char *)ucrCurve + ucr_nbytes);
        bgCurve->count = BG_CURVE_SIZE;
        for (i=0; i<bgCurve->count; i++)
@@ -106,7 +106,7 @@ authorization from SunSoft Inc.
 #define icLinesPerInch                  0x00000002L     /* Bit pos 1 */
 #define icLinesPerCm                    0x00000000L     /* Bit pos 1 */
-/* 
+/*
 * Device attributes, currently defined values correspond
 * to the low 4 bytes of the 8 byte attribute quantity, see
 * the header for their location.
@@ -126,10 +126,10 @@ authorization from SunSoft Inc.
 #define icUseWithEmbeddedDataOnly       0x00000002L     /* Bit pos 1 */
 /* Ascii or Binary data */
-#define icAsciiData                     0x00000000L 
+#define icAsciiData                     0x00000000L
 #define icBinaryData                    0x00000001L
-/* 
+/*
 * Define used to indicate that this is a variable length array
 */
 #define icAny                           1
@@ -147,8 +147,8 @@ authorization from SunSoft Inc.
 #ifdef PACKAGE_NAME
 /*
  June 9, 2003, Adapted for use with configure by Bob Friesenhahn
-  Added the stupid check for autoconf by Marti Maria. 
+  Added the stupid check for autoconf by Marti Maria.
-  PACKAGE_NAME is defined if autoconf is being used 
+  PACKAGE_NAME is defined if autoconf is being used
 */
 typedef @UINT8_T@       icUInt8Number;
@@ -163,7 +163,7 @@ typedef @INT32_T@	icInt64Number[2];
 #elif defined (__digital__) && defined (__unix__)
-/* 
+/*
 *Apr-17-2002: Modified by Marti Maria in order to provide wider portability.
 */
@@ -267,16 +267,16 @@ typedef icUInt32Number   icU16Fixed16Number;
 /*------------------------------------------------------------------------*/
 /* public tags and sizes */
 typedef enum {
-    icSigAToB0Tag                       = 0x41324230L,  /* 'A2B0' */ 
+    icSigAToB0Tag                       = 0x41324230L,  /* 'A2B0' */
    icSigAToB1Tag                       = 0x41324231L,  /* 'A2B1' */
-    icSigAToB2Tag                       = 0x41324232L,  /* 'A2B2' */ 
+    icSigAToB2Tag                       = 0x41324232L,  /* 'A2B2' */
    icSigBlueColorantTag                = 0x6258595AL,  /* 'bXYZ' */
    icSigBlueTRCTag                     = 0x62545243L,  /* 'bTRC' */
    icSigBToA0Tag                       = 0x42324130L,  /* 'B2A0' */
    icSigBToA1Tag                       = 0x42324131L,  /* 'B2A1' */
    icSigBToA2Tag                       = 0x42324132L,  /* 'B2A2' */
    icSigCalibrationDateTimeTag         = 0x63616C74L,  /* 'calt' */
-    icSigCharTargetTag                  = 0x74617267L,  /* 'targ' */ 
+    icSigCharTargetTag                  = 0x74617267L,  /* 'targ' */
    icSigCopyrightTag                   = 0x63707274L,  /* 'cprt' */
    icSigCrdInfoTag                     = 0x63726469L,  /* 'crdi' */
    icSigDeviceMfgDescTag               = 0x646D6E64L,  /* 'dmnd' */
@@ -289,7 +289,7 @@ typedef enum {
    icSigMeasurementTag                 = 0x6D656173L,  /* 'meas' */
    icSigMediaBlackPointTag             = 0x626B7074L,  /* 'bkpt' */
    icSigMediaWhitePointTag             = 0x77747074L,  /* 'wtpt' */
-    icSigNamedColorTag                  = 0x6E636f6CL,  /* 'ncol' 
+    icSigNamedColorTag                  = 0x6E636f6CL,  /* 'ncol'
                                                         * OBSOLETE, use ncl2 */
    icSigNamedColor2Tag                 = 0x6E636C32L,  /* 'ncl2' */
    icSigPreview0Tag                    = 0x70726530L,  /* 'pre0' */
@@ -311,7 +311,7 @@ typedef enum {
    icSigUcrBgTag                       = 0x62666420L,  /* 'bfd ' */
    icSigViewingCondDescTag             = 0x76756564L,  /* 'vued' */
    icSigViewingConditionsTag           = 0x76696577L,  /* 'view' */
-    icMaxEnumTag                        = 0xFFFFFFFFL 
+    icMaxEnumTag                        = 0xFFFFFFFFL
 } icTagSignature;
 /* technology signature descriptions */
@@ -319,7 +319,7 @@ typedef enum {
    icSigDigitalCamera                  = 0x6463616DL,  /* 'dcam' */
    icSigFilmScanner                    = 0x6673636EL,  /* 'fscn' */
    icSigReflectiveScanner              = 0x7273636EL,  /* 'rscn' */
-    icSigInkJetPrinter                  = 0x696A6574L,  /* 'ijet' */ 
+    icSigInkJetPrinter                  = 0x696A6574L,  /* 'ijet' */
    icSigThermalWaxPrinter              = 0x74776178L,  /* 'twax' */
    icSigElectrophotographicPrinter     = 0x6570686FL,  /* 'epho' */
    icSigElectrostaticPrinter           = 0x65737461L,  /* 'esta' */
@@ -338,7 +338,7 @@ typedef enum {
    icSigOffsetLithography              = 0x6F666673L,  /* 'offs' */
    icSigSilkscreen                     = 0x73696C6BL,  /* 'silk' */
    icSigFlexography                    = 0x666C6578L,  /* 'flex' */
-    icMaxEnumTechnology                 = 0xFFFFFFFFL   
+    icMaxEnumTechnology                 = 0xFFFFFFFFL
 } icTechnologySignature;
 /* type signatures */
@@ -349,7 +349,7 @@ typedef enum {
    icSigLut16Type                      = 0x6d667432L,  /* 'mft2' */
    icSigLut8Type                       = 0x6d667431L,  /* 'mft1' */
    icSigMeasurementType                = 0x6D656173L,  /* 'meas' */
-    icSigNamedColorType                 = 0x6E636f6CL,  /* 'ncol' 
+    icSigNamedColorType                 = 0x6E636f6CL,  /* 'ncol'
                                                         * OBSOLETE, use ncl2 */
    icSigProfileSequenceDescType        = 0x70736571L,  /* 'pseq' */
    icSigS15Fixed16ArrayType            = 0x73663332L,  /* 'sf32' */
@@ -368,14 +368,14 @@ typedef enum {
    icSigXYZArrayType                   = 0x58595A20L,  /* 'XYZ ' */
    icSigNamedColor2Type                = 0x6E636C32L,  /* 'ncl2' */
    icSigCrdInfoType                    = 0x63726469L,  /* 'crdi' */
-    icMaxEnumType                       = 0xFFFFFFFFL   
+    icMaxEnumType                       = 0xFFFFFFFFL
 } icTagTypeSignature;
-/* 
+/*
 * Color Space Signatures
 * Note that only icSigXYZData and icSigLabData are valid
 * Profile Connection Spaces (PCSs)
- */ 
+ */
 typedef enum {
    icSigXYZData                        = 0x58595A20L,  /* 'XYZ ' */
    icSigLabData                        = 0x4C616220L,  /* 'Lab ' */
@@ -402,7 +402,7 @@ typedef enum {
    icSig13colorData                    = 0x44434C52L,  /* 'DCLR' */
    icSig14colorData                    = 0x45434C52L,  /* 'ECLR' */
    icSig15colorData                    = 0x46434C52L,  /* 'FCLR' */
-    icMaxEnumData                       = 0xFFFFFFFFL   
+    icMaxEnumData                       = 0xFFFFFFFFL
 } icColorSpaceSignature;
 /* profileClass enumerations */
@@ -414,7 +414,7 @@ typedef enum {
    icSigAbstractClass                  = 0x61627374L,  /* 'abst' */
    icSigColorSpaceClass                = 0x73706163L,  /* 'spac' */
    icSigNamedColorClass                = 0x6e6d636cL,  /* 'nmcl' */
-    icMaxEnumClass                      = 0xFFFFFFFFL  
+    icMaxEnumClass                      = 0xFFFFFFFFL
 } icProfileClassSignature;
 /* Platform Signatures */
@@ -424,7 +424,7 @@ typedef enum {
    icSigSolaris                        = 0x53554E57L,  /* 'SUNW' */
    icSigSGI                            = 0x53474920L,  /* 'SGI ' */
    icSigTaligent                       = 0x54474E54L,  /* 'TGNT' */
-    icMaxEnumPlatform                   = 0xFFFFFFFFL  
+    icMaxEnumPlatform                   = 0xFFFFFFFFL
 } icPlatformSignature;
 /*------------------------------------------------------------------------*/
@@ -436,7 +436,7 @@ typedef enum {
 typedef enum {
    icFlare0                            = 0x00000000L,  /* 0% flare */
    icFlare100                          = 0x00000001L,  /* 100% flare */
-    icMaxFlare                          = 0xFFFFFFFFL   
+    icMaxFlare                          = 0xFFFFFFFFL
 } icMeasurementFlare;
 /* Measurement Geometry, used in the measurmentType tag */
@@ -444,7 +444,7 @@ typedef enum {
    icGeometryUnknown                   = 0x00000000L,  /* Unknown */
    icGeometry045or450                  = 0x00000001L,  /* 0/45, 45/0 */
    icGeometry0dord0                    = 0x00000002L,  /* 0/d or d/0 */
-    icMaxGeometry                       = 0xFFFFFFFFL   
+    icMaxGeometry                       = 0xFFFFFFFFL
 } icMeasurementGeometry;
 /* Rendering Intents, used in the profile header */
@@ -453,7 +453,7 @@ typedef enum {
    icRelativeColorimetric              = 1,
    icSaturation                        = 2,
    icAbsoluteColorimetric              = 3,
-    icMaxEnumIntent                     = 0xFFFFFFFFL   
+    icMaxEnumIntent                     = 0xFFFFFFFFL
 } icRenderingIntent;
 /* Different Spot Shapes currently defined, used for screeningType */
@@ -466,7 +466,7 @@ typedef enum {
    icSpotShapeLine                     = 5,
    icSpotShapeSquare                   = 6,
    icSpotShapeCross                    = 7,
-    icMaxEnumSpot                       = 0xFFFFFFFFL   
+    icMaxEnumSpot                       = 0xFFFFFFFFL
 } icSpotShape;
 /* Standard Observer, used in the measurmentType tag */
@@ -474,7 +474,7 @@ typedef enum {
    icStdObsUnknown                     = 0x00000000L,  /* Unknown */
    icStdObs1931TwoDegrees              = 0x00000001L,  /* 2 deg */
    icStdObs1964TenDegrees              = 0x00000002L,  /* 10 deg */
-    icMaxStdObs                         = 0xFFFFFFFFL   
+    icMaxStdObs                         = 0xFFFFFFFFL
 } icStandardObserver;
 /* Pre-defined illuminants, used in measurement and viewing conditions type */
@@ -486,15 +486,15 @@ typedef enum {
    icIlluminantF2                      = 0x00000004L,
    icIlluminantD55                     = 0x00000005L,
    icIlluminantA                       = 0x00000006L,
-    icIlluminantEquiPowerE              = 0x00000007L,  
+    icIlluminantEquiPowerE              = 0x00000007L,
-    icIlluminantF8                      = 0x00000008L,  
+    icIlluminantF8                      = 0x00000008L,
-    icMaxEnumIluminant                  = 0xFFFFFFFFL   
+    icMaxEnumIluminant                  = 0xFFFFFFFFL
 } icIlluminant;
 /*------------------------------------------------------------------------*/
 /*
- * Arrays of numbers 
+ * Arrays of numbers
 */
 /* Int8 Array */
@@ -536,7 +536,7 @@ typedef struct {
 typedef struct {
    icInt64Number       data[icAny];    /* Variable array of values */
 } icInt64Array;
-    
 /* u16Fixed16 Array */
 typedef struct {
    icU16Fixed16Number  data[icAny];    /* Variable array of values */
@@ -592,13 +592,13 @@ typedef struct {
    icUInt8Number       clutPoints;     /* Number of grid points */
    icInt8Number        pad;            /* Padding for byte alignment */
    icS15Fixed16Number  e00;            /* e00 in the 3 * 3 */
-    icS15Fixed16Number  e01;            /* e01 in the 3 * 3 */    
+    icS15Fixed16Number  e01;            /* e01 in the 3 * 3 */
    icS15Fixed16Number  e02;            /* e02 in the 3 * 3 */
    icS15Fixed16Number  e10;            /* e10 in the 3 * 3 */
-    icS15Fixed16Number  e11;            /* e11 in the 3 * 3 */    
+    icS15Fixed16Number  e11;            /* e11 in the 3 * 3 */
-    icS15Fixed16Number  e12;            /* e12 in the 3 * 3 */ 
+    icS15Fixed16Number  e12;            /* e12 in the 3 * 3 */
    icS15Fixed16Number  e20;            /* e20 in the 3 * 3 */
-    icS15Fixed16Number  e21;            /* e21 in the 3 * 3 */    
+    icS15Fixed16Number  e21;            /* e21 in the 3 * 3 */
    icS15Fixed16Number  e22;            /* e22 in the 3 * 3 */
    icUInt16Number      inputEnt;       /* Num of in-table entries */
    icUInt16Number      outputEnt;      /* Num of out-table entries */
@@ -607,7 +607,7 @@ typedef struct {
 *  Data that follows is of this form
 *
 *  icUInt16Number      inputTable[inputChan][icAny];   * The in-table
- *  icUInt16Number      clutTable[icAny];               * The clut 
+ *  icUInt16Number      clutTable[icAny];               * The clut
 *  icUInt16Number      outputTable[outputChan][icAny]; * The out-table
 */
 } icLut16;
@@ -619,20 +619,20 @@ typedef struct {
    icUInt8Number       clutPoints;     /* Num of grid points */
    icInt8Number        pad;
    icS15Fixed16Number  e00;            /* e00 in the 3 * 3 */
-    icS15Fixed16Number  e01;            /* e01 in the 3 * 3 */    
+    icS15Fixed16Number  e01;            /* e01 in the 3 * 3 */
    icS15Fixed16Number  e02;            /* e02 in the 3 * 3 */
    icS15Fixed16Number  e10;            /* e10 in the 3 * 3 */
-    icS15Fixed16Number  e11;            /* e11 in the 3 * 3 */    
+    icS15Fixed16Number  e11;            /* e11 in the 3 * 3 */
-    icS15Fixed16Number  e12;            /* e12 in the 3 * 3 */ 
+    icS15Fixed16Number  e12;            /* e12 in the 3 * 3 */
    icS15Fixed16Number  e20;            /* e20 in the 3 * 3 */
-    icS15Fixed16Number  e21;            /* e21 in the 3 * 3 */    
+    icS15Fixed16Number  e21;            /* e21 in the 3 * 3 */
    icS15Fixed16Number  e22;            /* e22 in the 3 * 3 */
    icUInt8Number       data[icAny];    /* Data follows see spec */
 /*
 *  Data that follows is of this form
 *
 *  icUInt8Number       inputTable[inputChan][256];     * The in-table
- *  icUInt8Number       clutTable[icAny];               * The clut 
+ *  icUInt8Number       clutTable[icAny];               * The clut
 *  icUInt8Number       outputTable[outputChan][256];   * The out-table
 */
 } icLut8;
@@ -649,7 +649,7 @@ typedef struct {
 /* Named color */
 /*
- * icNamedColor2 takes the place of icNamedColor 
+ * icNamedColor2 takes the place of icNamedColor
 */
 typedef struct {
    icUInt32Number      vendorFlag;     /* Bottom 16 bits for IC use */
@@ -670,16 +670,16 @@ typedef struct {
 *                      :
 *                      :
 * Repeat for name and PCS and device color coordinates up to (count-1)
- * 
+ *
- * NOTES:  
+ * NOTES:
 * PCS and device space can be determined from the header.
 *
- * PCS coordinates are icUInt16 numbers and are described in Annex A of 
+ * PCS coordinates are icUInt16 numbers and are described in Annex A of
- * the ICC spec. Only 16 bit L*a*b* and XYZ are allowed. The number of 
+ * the ICC spec. Only 16 bit L*a*b* and XYZ are allowed. The number of
 * coordinates is consistent with the headers PCS.
 *
 * Device coordinates are icUInt16 numbers where 0x0000 represents
- * the minimum value and 0xFFFF represents the maximum value. 
+ * the minimum value and 0xFFFF represents the maximum value.
 * If the nDeviceCoords value is 0 this field is not given.
 */
 } icNamedColor2;
@@ -693,7 +693,7 @@ typedef struct {
    icInt8Number                data[icAny];    /* Desc text follows */
 /*
 *  Data that follows is of this form, this is an icInt8Number
- *  to avoid problems with a compiler generating  bad code as 
+ *  to avoid problems with a compiler generating  bad code as
 *  these arrays are variable in length.
 *
 * icTextDescription            deviceMfgDesc;  * Manufacturer text
@@ -753,7 +753,7 @@ typedef struct {
    icInt8Number        data[icAny];            /* The Ucr BG data */
 /*
 *  Data that follows is of this form, this is a icInt8Number
- *  to avoid problems with a compiler generating  bad code as 
+ *  to avoid problems with a compiler generating  bad code as
 *  these arrays are variable in length.
 *
 * icUcrBgCurve         ucr;            * Ucr curve
@@ -900,7 +900,7 @@ typedef struct {
    icTagBase           base;           /* Signature, "ui64" */
    icUInt64Array       data;           /* Variable array of values */
 } icUInt64ArrayType;
-    
 /* uInt8Type */
 typedef struct {
    icTagBase           base;           /* Signature, "ui08" */
@@ -927,11 +927,11 @@ typedef struct {
    icCrdInfo           info;           /* 5 sets of counts & strings */
 }icCrdInfoType;
     /*   icCrdInfo       productName;     PS product count/string */
-     /*   icCrdInfo       CRDName0;        CRD name for intent 0 */ 
+     /*   icCrdInfo       CRDName0;        CRD name for intent 0 */
-     /*   icCrdInfo       CRDName1;        CRD name for intent 1 */ 
+     /*   icCrdInfo       CRDName1;        CRD name for intent 1 */
-     /*   icCrdInfo       CRDName2;        CRD name for intent 2 */ 
+     /*   icCrdInfo       CRDName2;        CRD name for intent 2 */
     /*   icCrdInfo       CRDName3;        CRD name for intent 3 */
-    
 /*------------------------------------------------------------------------*/
 /*
@@ -941,8 +941,8 @@ typedef struct {
 /* A tag */
 typedef struct {
    icTagSignature      sig;            /* The tag signature */
-    icUInt32Number      offset;         /* Start of tag relative to 
+    icUInt32Number      offset;         /* Start of tag relative to
-                                         * start of header, Spec 
+                                         * start of header, Spec
                                         * Clause 5 */
    icUInt32Number      size;           /* Size in bytes */
 } icTag;
@@ -974,8 +974,8 @@ typedef struct {
    icInt8Number                reserved[44];   /* Reserved */
 } icHeader;
-/* 
+/*
- * A profile, 
+ * A profile,
 * we can't use icTagList here because its not at the end of the structure
 */
 typedef struct {
@@ -985,10 +985,10 @@ typedef struct {
 /*
 * Data that follows is of the form
 *
- * icTag        tagTable[icAny];        * The tag table 
+ * icTag        tagTable[icAny];        * The tag table
- * icInt8Number tagData[icAny];         * The tag data 
+ * icInt8Number tagData[icAny];         * The tag data
 */
-} icProfile;           
+} icProfile;
 /*------------------------------------------------------------------------*/
 /* Obsolete entries */
@@ -1001,12 +1001,12 @@ typedef struct {
 /*
 *  Data that follows is of this form
 *
- * icInt8Number         prefix[icAny];  * Prefix 
+ * icInt8Number         prefix[icAny];  * Prefix
- * icInt8Number         suffix[icAny];  * Suffix 
+ * icInt8Number         suffix[icAny];  * Suffix
- * icInt8Number         root1[icAny];   * Root name 
+ * icInt8Number         root1[icAny];   * Root name
- * icInt8Number         coords1[icAny]; * Color coordinates 
+ * icInt8Number         coords1[icAny]; * Color coordinates
- * icInt8Number         root2[icAny];   * Root name 
+ * icInt8Number         root2[icAny];   * Root name
- * icInt8Number         coords2[icAny]; * Color coordinates 
+ * icInt8Number         coords2[icAny]; * Color coordinates
 *                      :
 *                      :
 * Repeat for root name and color coordinates up to (count-1)
diff --git a/base/pack_ps.c b/base/pack_ps.c
index 2ab4117c6..044e934cd 100644
--- a/base/pack_ps.c
+++ b/base/pack_ps.c
@@ -439,7 +439,7 @@ main(int argc, char *argv[])
 #endif
    /* Display processing statistics. */
-    printf("  Processed %d lines of PostScript data.\n", total_code_lines); 
+    printf("  Processed %d lines of PostScript data.\n", total_code_lines);
    printf("  %d bytes of PostScript data packed down to %d bytes.\n", total_input_length, total_output_length);
 #if STRIP_PDFR_DEBUG_CALLS
    printf("  %d PDFR_DEBUG calls removed from the code.\n", pdfr_debug_start_count);
diff --git a/base/scfd.c b/base/scfd.c
index 97fa96b69..f2698a7a3 100644
--- a/base/scfd.c
+++ b/base/scfd.c
@@ -211,7 +211,7 @@ static inline int invert_data(stream_CFD_state *ss, stream_cursor_read *pr, int
    if (q >= ss->lbuf + ss->raster + CFD_BUFFER_SLOP) {
        return(-1);
    }
-    
    if ( (*rlen) > qbit )
    {
        if (q + ((*rlen - qbit) >> 3) > ss->lbuf + ss->raster + CFD_BUFFER_SLOP) {
diff --git a/base/sdctd.c b/base/sdctd.c
index ec54a9e28..338f84369 100644
--- a/base/sdctd.c
+++ b/base/sdctd.c
@@ -251,7 +251,7 @@ s_DCTD_process(stream_state * st, stream_cursor_read * pr,
                    /*case JPEG_HEADER_OK: */
            }
-            /* 
+            /*
             * Default the color transform if not set and check for
             * the Adobe marker and use Adobe's transform if the
             * marker is set.
@@ -262,10 +262,10 @@ s_DCTD_process(stream_state * st, stream_cursor_read * pr,
                else
                    ss->ColorTransform = 0;
            }
-            
            if (jddp->dinfo.saw_Adobe_marker)
                ss->ColorTransform = jddp->dinfo.Adobe_transform;
-            
            switch (jddp->dinfo.num_components) {
            case 3:
                jddp->dinfo.jpeg_color_space =
diff --git a/base/sdcte.c b/base/sdcte.c
index ecbaf6558..bd6708643 100644
--- a/base/sdcte.c
+++ b/base/sdcte.c
@@ -25,7 +25,7 @@
 #include "sdct.h"
 #include "sjpeg.h"
-#define ICC_OVERHEAD  16                
+#define ICC_OVERHEAD  16
 #define MAX_MARKER_DATA_SIZE  (65535 - ICC_OVERHEAD)
 public_st_jpeg_compress_data();
@@ -135,9 +135,9 @@ s_DCTE_process(stream_state * st, stream_cursor_read * pr,
            dest->free_in_buffer = pw->limit - pw->ptr;
            ss->phase = 3;
            /* falls through */
-        case  3:     
+        case  3:
            /* If we have it, then write out the ICC profile */
-            /* Due to size limitations allowed in APP0 markers, the profile 
+            /* Due to size limitations allowed in APP0 markers, the profile
               may have to be written in mutiple markers */
                if (ss->icc_profile != NULL) {
                        static const char marker[2] = {0xFF, 0xE2};  /* JPEG_APP0 + 2 */
@@ -156,7 +156,7 @@ s_DCTE_process(stream_state * st, stream_cursor_read * pr,
                    if (size > MAX_MARKER_DATA_SIZE)
                      size = MAX_MARKER_DATA_SIZE;
-                    /* In this case we are just getting started with the 
+                    /* In this case we are just getting started with the
                       header of the marker.  Write that portion out */
                            if (ss->icc_position == -1) {
                                    byte length_byte[2];
diff --git a/base/sidscale.c b/base/sidscale.c
index 9415d8543..dd488da69 100644
--- a/base/sidscale.c
+++ b/base/sidscale.c
@@ -240,9 +240,9 @@ s_ISpecialDownScale_init(stream_state * st)
    ss->sizeofPixelIn = ss->params.BitsPerComponentIn / 8;
    ss->sizeofPixelOut = ss->params.BitsPerComponentOut / 8;
-    ss->src_size = 
+    ss->src_size =
        ss->params.WidthIn * ss->sizeofPixelIn * ss->params.spp_interp;
-    ss->dst_size = 
+    ss->dst_size =
        ss->params.WidthOut * ss->sizeofPixelOut * ss->params.spp_interp;
    /* Initialize destination DDAs. */
@@ -254,14 +254,14 @@ s_ISpecialDownScale_init(stream_state * st)
    dda_init(ss->dda_y, 0, ss->params.HeightOut, ss->params.HeightIn);
    /* create intermediate image to hold horizontal zoom */
-    ss->tmp = 
+    ss->tmp =
        gs_alloc_byte_array(mem, (size_t)ss->params.WidthOut * ss->params.spp_interp,
                            ss->sizeofPixelIn, "image_scale tmp");
    /* Allocate buffers for 1 row of source and destination. */
-    ss->dst = 
+    ss->dst =
        gs_alloc_byte_array(mem, (size_t)ss->params.WidthOut * ss->params.spp_interp,
                            ss->sizeofPixelOut, "image_scale dst");
-    ss->src = 
+    ss->src =
        gs_alloc_byte_array(mem, (size_t)ss->params.WidthIn * ss->params.spp_interp,
                            ss->sizeofPixelIn, "image_scale src");
    if (ss->tmp == 0 || ss->dst == 0 || ss->src == 0) {
diff --git a/base/simscale_foo.c b/base/simscale_foo.c
index bae9d5c7c..aaef5cdb1 100644
--- a/base/simscale_foo.c
+++ b/base/simscale_foo.c
@@ -123,7 +123,7 @@ unsigned int imscale_foo(unsigned int v5x5) {
    unsigned int r3 = ( v5x5 >> 20 ) & 0x1f;
    unsigned int r4 = ( v5x5 >> 25 ) & 0x1f;
 #endif
-    
    switch(v3x3) {
    case 0:
    case 1:
diff --git a/base/siscale.c b/base/siscale.c
index cc575d20a..3c22e3671 100644
--- a/base/siscale.c
+++ b/base/siscale.c
@@ -930,7 +930,7 @@ do_init(stream_state        *st,
    ss->sizeofPixelOut = ss->params.BitsPerComponentOut / 8;
    ss->src_y = 0;
-    ss->src_size = 
+    ss->src_size =
        ss->params.WidthIn * ss->sizeofPixelIn * ss->params.spp_interp;
    ss->src_offset = 0;
    ss->dst_y = 0;
@@ -965,10 +965,10 @@ do_init(stream_state        *st,
                                                    ss->max_support*2,
                                                    sizeof(CONTRIB), "image_scale contrib_dst[*]");
    /* Allocate buffers for 1 row of source and destination. */
-    ss->dst = 
+    ss->dst =
        gs_alloc_byte_array(mem, (size_t)limited_WidthOut * ss->params.spp_interp,
                            ss->sizeofPixelOut, "image_scale dst");
-    ss->src = 
+    ss->src =
        gs_alloc_byte_array(mem, (size_t)ss->params.WidthIn * ss->params.spp_interp,
                            ss->sizeofPixelIn, "image_scale src");
    if (ss->tmp == 0 || ss->contrib == 0 || ss->items == 0 ||
diff --git a/base/sjpegc.c b/base/sjpegc.c
index bea397a3a..97df90cdf 100644
--- a/base/sjpegc.c
+++ b/base/sjpegc.c
@@ -173,7 +173,7 @@ static long gs_j_mem_init (j_common_ptr cinfo)
    if (gs_memory_chunk_wrap(&(cmem), mem) < 0) {
        return (-1);
    }
-    
    (void)jpeg_cust_mem_set_private(GET_CUST_MEM_DATA(cinfo), cmem);
    return 0;
@@ -229,7 +229,7 @@ gs_jpeg_mem_term(j_common_ptr cinfo)
    if (cinfo->client_data) {
        jpeg_cust_mem_data *custmptr = (jpeg_cust_mem_data *)cinfo->client_data;
        gs_memory_t *mem = (gs_memory_t *)(GET_CUST_MEM_DATA(cinfo)->priv);
-        
        gs_free_object(mem, custmptr, "gs_jpeg_mem_term");
        cinfo->client_data = NULL;
    }
diff --git a/base/sjpegd.c b/base/sjpegd.c
index 16b71df65..cb6ac75f3 100644
--- a/base/sjpegd.c
+++ b/base/sjpegd.c
@@ -39,7 +39,7 @@ gs_jpeg_create_decompress(stream_DCT_state * st)
        return_error(gs_jpeg_log_error(st));
    jpeg_stream_data_common_init(st->data.decompress);
-    
    if (gs_jpeg_mem_init (st->memory, (j_common_ptr)&st->data.decompress->dinfo) < 0)
        return_error(gs_error_VMerror);
diff --git a/base/sjpx_openjpeg.c b/base/sjpx_openjpeg.c
index f0db34e11..efb4a5fa6 100644
--- a/base/sjpx_openjpeg.c
+++ b/base/sjpx_openjpeg.c
@@ -560,12 +560,12 @@ static int process_one_trunk(stream_jpxd_state * const state, stream_cursor_writ
                            for (b=0; b<bytepp1; b++)
                                *row++ = (((*(state->pdata[compno]) << shift_bit) >> (8*(bytepp1-b-1))))
                                                        + (b==0 ? state->sign_comps[compno] : 0); /* split and shift input int to output bytes */
-                            state->pdata[compno]++; 
+                            state->pdata[compno]++;
                        }
                    }
                }
                else
-                {   
+                {
                    /* shift_bit = 0, bpp < 8 */
                    int bt=0;
                    int bit_pos = 0;
@@ -678,7 +678,7 @@ s_opjd_process(stream_state * ss, stream_cursor_read * pr,
    int locked = 0;
    int code;
-    if (in_size > 0) 
+    if (in_size > 0)
    {
        /* buffer available data */
        code = opj_lock(ss->memory);
@@ -703,7 +703,7 @@ s_opjd_process(stream_state * ss, stream_cursor_read * pr,
        }
    }
-    if (last == 1) 
+    if (last == 1)
    {
        if (state->image == NULL)
        {
@@ -774,11 +774,11 @@ s_opjd_release(stream_state *ss)
    /* free image data structure */
    if (state->image)
        opj_image_destroy(state->image);
-    
    /* free stream */
    if (state->stream)
        opj_stream_destroy(state->stream);
-                
    /* free decoder handle */
    if (state->codec)
        opj_destroy_codec(state->codec);
diff --git a/base/sjpx_openjpeg.h b/base/sjpx_openjpeg.h
index be129983d..d6ac36107 100644
--- a/base/sjpx_openjpeg.h
+++ b/base/sjpx_openjpeg.h
@@ -72,4 +72,4 @@ typedef struct stream_jpxd_state_s
 extern const stream_template s_jpxd_template;
-#endif 
+#endif
diff --git a/contrib/gdevdj9.c b/contrib/gdevdj9.c
index 1800b3cb8..efbeaef58 100644
--- a/contrib/gdevdj9.c
+++ b/contrib/gdevdj9.c
@@ -634,7 +634,7 @@ static int
 cdj970_get_params(gx_device * pdev, gs_param_list * plist)
 {
    int code;
-    
    (void) (
        (code = gdev_prn_get_params(pdev, plist)) < 0 ||
        (code = param_write_int(plist, "Quality", &cdj970->quality)) < 0 ||
diff --git a/contrib/lips4/gdevl4r.c b/contrib/lips4/gdevl4r.c
index f5015b1dc..d8bcec7ef 100644
--- a/contrib/lips4/gdevl4r.c
+++ b/contrib/lips4/gdevl4r.c
@@ -647,7 +647,7 @@ lips4type_print_page_copies(gx_device_printer * pdev, gp_file * prn_stream, int
      {
        if (!(lprn->CompBuf = gs_malloc(pdev->memory->non_gc_memory, bpl * 3 / 2 + 1, maxY, "(CompBuf)")))
          return_error(gs_error_VMerror);
-        
        /* This buffer is used by lips_rle_encode(), which can require double
        input size plus 2 bytes. */
        if (!(lprn->CompBuf2 = gs_malloc(pdev->memory->non_gc_memory, bpl * 2 + 2, maxY, "(CompBuf2)")))
diff --git a/devices/gdevcmykog.c b/devices/gdevcmykog.c
index 4330258ed..76206808d 100644
--- a/devices/gdevcmykog.c
+++ b/devices/gdevcmykog.c
@@ -171,9 +171,9 @@ cmykog_open(gx_device * pdev)
  dev->icc_struct->supports_devn = true;
  /* This device is a DeviceN color based device but unlike psdcmyk and
-     tiffsep it can't change its color characteristics.  It remains as 
+     tiffsep it can't change its color characteristics.  It remains as
-     a 6 color cmykog device.  Postsript files can change the maxseparations 
+     a 6 color cmykog device.  Postsript files can change the maxseparations
-     (example Bug 696600 29-07E.PS)  The gdevdevn code will, if it 
+     (example Bug 696600 29-07E.PS)  The gdevdevn code will, if it
     detects a change occured, close the device and reopen (see
     devn_printer_put_params) possibly resetting the color info.  tiffsep
     and psdcmyk, when reopened, will  reset their color characteristics based upon
diff --git a/devices/gdevepsc.c b/devices/gdevepsc.c
index 830d76683..ed9d8a696 100644
--- a/devices/gdevepsc.c
+++ b/devices/gdevepsc.c
@@ -182,7 +182,7 @@ epsc_print_page(gx_device_printer * pdev, gp_file * prn_stream)
    char start_graphics;
    int first_pass;
    int last_pass;
-    int dots_per_space; 
+    int dots_per_space;
    int bytes_per_space;
    int skip = 0, lnum = 0, code = 0, pass;
@@ -201,7 +201,7 @@ epsc_print_page(gx_device_printer * pdev, gp_file * prn_stream)
    if (x_dpi > max_dpi) {
        return_error(gs_error_rangecheck);
    }
-    
    start_graphics = (char)
        ((y_24pin ? graphics_modes_24 : graphics_modes_9)[x_dpi / 60]);
    first_pass = (start_graphics & DD ? 1 : 0);
diff --git a/devices/gdevepsn.c b/devices/gdevepsn.c
index 7b77b9988..88b930bfd 100644
--- a/devices/gdevepsn.c
+++ b/devices/gdevepsn.c
@@ -171,7 +171,7 @@ eps_print_page(gx_device_printer *pdev, gp_file *prn_stream, int y_9pin_high,
        int tab_min_pixels = x_dpi * MIN_TAB_10THS / 10;
        int skip = 0, lnum = 0, pass, ypass;
        int code = 0;
-        
        char start_graphics;
        int first_pass;
        int last_pass;
@@ -195,12 +195,12 @@ eps_print_page(gx_device_printer *pdev, gp_file *prn_stream, int y_9pin_high,
            /* This avoids divide by zero later on, bug 701843. */
            return_error(gs_error_rangecheck);
        }
-        
        buf1 = (byte *)gs_malloc(pdev->memory, in_size, 1, "eps_print_page(buf1)");
        buf2 = (byte *)gs_malloc(pdev->memory, in_size, 1, "eps_print_page(buf2)");
        in = buf1;
        out = buf2;
-        
        /* Check allocations */
        if ( buf1 == 0 || buf2 == 0 ) {
diff --git a/devices/gdevfax.c b/devices/gdevfax.c
index 27b3c8889..f97e6a2be 100644
--- a/devices/gdevfax.c
+++ b/devices/gdevfax.c
@@ -69,7 +69,7 @@ gdev_fax_get_params(gx_device * dev, gs_param_list * plist)
        ecode = code;
     if ((code = param_write_bool(plist, "BlackIs1", &fdev->BlackIs1)) < 0)
        ecode = code;
- 
    return ecode;
 }
 int
diff --git a/devices/gdevicov.c b/devices/gdevicov.c
index 355be2403..db735c64f 100644
--- a/devices/gdevicov.c
+++ b/devices/gdevicov.c
@@ -77,7 +77,7 @@ cov_write_page(gx_device_printer *pdev, gp_file *file)
            k = (double)k_pix / total_pix;
            }
-        
        if (IS_LIBCTX_STDOUT(pdev->memory, gp_get_file(file))) {
            outprintf(pdev->memory, "%8.5f %8.5f %8.5f %8.5f CMYK %s\n",
                c, m, y, k, code ? "ERROR" : "OK");
@@ -122,13 +122,13 @@ static int cov_write_page_ink(gx_device_printer *pdev, gp_file *file)
        end = row + raster;
        for (; row < end; row += 4) {
-          
                        dc_pix += row[0];
            dm_pix += row[1];
                        dy_pix += row[2];
-            
                        dk_pix += row[3];
                        ++total_pix;
diff --git a/devices/gdevlxm.c b/devices/gdevlxm.c
index 6e557edef..b804f9554 100644
--- a/devices/gdevlxm.c
+++ b/devices/gdevlxm.c
@@ -298,7 +298,7 @@ lxm5700m_print_page(gx_device_printer *pdev, gp_file *prn_stream)
                    sxMask = 0x80>>(sx%8);
                    /* loop through all the swipeHeight bits of this column.
-                    
                    Note that <sx> looks like it can get out of range, so we
                    check for this here. This fixes bug 701842.
diff --git a/devices/gdevxcf.c b/devices/gdevxcf.c
index c4c44bf64..5ca2fee8b 100644
--- a/devices/gdevxcf.c
+++ b/devices/gdevxcf.c
@@ -1241,7 +1241,7 @@ xcf_icc_to_tile(gx_device_printer *pdev, xcf_write_ctx *xc, byte **tile_data, co
                   understand what is going on in the loop
                   with the 255^row[row_idx++] operation */
-            gscms_transform_color((gx_device*) pdev, link, 
+            gscms_transform_color((gx_device*) pdev, link,
                                  (void *) (&(row[row_idx])),
                                   &(base_ptr[base_idx]), 1);
diff --git a/devices/gdevxini.c b/devices/gdevxini.c
index ca8ca2f97..77e109c5c 100644
--- a/devices/gdevxini.c
+++ b/devices/gdevxini.c
@@ -892,7 +892,7 @@ gdev_x_put_params(gx_device * dev, gs_param_list * plist)
                                  dev->width, dev->height, dev->dname);
            return_error(gs_error_rangecheck);
        }
-        
        /* points */
        dev->MediaSize[0] = (float)dev->width / xdev->x_pixels_per_inch * 72;
        dev->MediaSize[1] = (float)dev->height / xdev->y_pixels_per_inch * 72;
@@ -927,7 +927,7 @@ gdev_x_put_params(gx_device * dev, gs_param_list * plist)
    }
    xdev->MaxTempPixmap = values.MaxTempPixmap;
    xdev->MaxTempImage = values.MaxTempImage;
-    
    if (clear_window || xdev->space_params.MaxBitmap != orig_MaxBitmap) {
        if (xdev->is_open)
            gdev_x_clear_window(xdev);
diff --git a/devices/vector/gdevpdfg.c b/devices/vector/gdevpdfg.c
index 39da7ea4a..8bd240c7a 100644
--- a/devices/vector/gdevpdfg.c
+++ b/devices/vector/gdevpdfg.c
@@ -2371,7 +2371,7 @@ pdf_write_spot_function(gx_device_pdf *pdev, const gx_ht_order *porder,
    return code;
 }
-/* if (memcmp(order.levels, porder->levels, order.num_levels * sizeof(*order.levels))) */ 
+/* if (memcmp(order.levels, porder->levels, order.num_levels * sizeof(*order.levels))) */
 static int
 compare_gx_ht_order_levels(const gx_ht_order *order1, const gx_ht_order *order2) {
  int i;
diff --git a/devices/vector/gdevpdfk.c b/devices/vector/gdevpdfk.c
index e48718d1f..88f0a142e 100644
--- a/devices/vector/gdevpdfk.c
+++ b/devices/vector/gdevpdfk.c
@@ -115,7 +115,7 @@ cie_to_xyz(const double *in, double out[3], const gs_color_space *pcs,
        handles mapping to CIE D50.  This forces an achromatic result */
        xyz_float[0] = pWhitePoint->u * xyz_float[1];
        xyz_float[2] = pWhitePoint->w * xyz_float[1];
-    } 
+    }
    /* Do wp mapping to D50 in XYZ for now.  We should do bradford correction.
       Will add that in next release */
diff --git a/devices/vector/gdevpsdu.c b/devices/vector/gdevpsdu.c
index c4be6ac06..33f9600b8 100644
--- a/devices/vector/gdevpsdu.c
+++ b/devices/vector/gdevpsdu.c
@@ -408,8 +408,8 @@ psdf_DCT_filter(gs_param_list *plist /* may be NULL */,
        /* Make sure we get at least a full scan line of input. */
        ss->scan_line_size = jcdp->cinfo.input_components *
            jcdp->cinfo.image_width;
-        /* Profile not used in pdfwrite output */        
+        /* Profile not used in pdfwrite output */
-        ss->icc_profile = NULL; 
+        ss->icc_profile = NULL;
        jcdp->templat.min_in_size =
            max(s_DCTE_template.min_in_size, ss->scan_line_size);
        /* Make sure we can write the user markers in a single go. */
diff --git a/devices/vector/gdevpx.c b/devices/vector/gdevpx.c
index 5195339f7..438cf3c26 100644
--- a/devices/vector/gdevpx.c
+++ b/devices/vector/gdevpx.c
@@ -1353,7 +1353,7 @@ pclxl_setdash(gx_device_vector * vdev, const float *pattern, uint count,
            pattern_length += (uint) (pattern[i]);
        if (pattern_length == 0)
            return_error(gs_error_rangecheck);
-        
        spputc(s, pxt_uint16_array);
        px_put_ub(s, (byte) count);
        for (i = 0; i < count; ++i)
@@ -2078,7 +2078,7 @@ pclxl_begin_image(gx_device * dev,
            goto use_default;
    }
-    /* 
+    /*
     * NOTE: this predicate should be fixed to be readable and easily
     * debugged.  Each condition should be separate.  See the large
     * similar conditional in clist_begin_typed_image which has
diff --git a/devices/vector/gdevxps.c b/devices/vector/gdevxps.c
index 8eb26196d..fa9124fd2 100644
--- a/devices/vector/gdevxps.c
+++ b/devices/vector/gdevxps.c
@@ -120,7 +120,7 @@ typedef struct gx_device_xps_f2i_s {
    struct gx_device_xps_f2i_s *next;
 } gx_device_xps_f2i_t;
-/* Used for keeping track of icc profiles that we have written.   This way we 
+/* Used for keeping track of icc profiles that we have written.   This way we
   avoid writing the same one multiple times.  It would be nice to do this
   based upon the gs_id for images, but that id is really created after we
   have already drawn the path.  Not clear to me how to get a source ID. */
@@ -373,13 +373,13 @@ zip_new_info_node(gx_device_xps *xps_dev, const char *filename)
    int lenstr;
    /* NB should use GC */
-    gx_device_xps_zinfo_t *info = 
+    gx_device_xps_zinfo_t *info =
        (gx_device_xps_zinfo_t *)gs_alloc_bytes(mem->non_gc_memory, sizeof(gx_device_xps_zinfo_t), "zinfo");
-    gx_device_xps_f2i_t *f2i = 
+    gx_device_xps_f2i_t *f2i =
        (gx_device_xps_f2i_t *)gs_alloc_bytes(mem->non_gc_memory, sizeof(gx_device_xps_f2i_t), "zinfo node");
    if_debug1m('_', dev->memory, "new node %s\n", filename);
-    
    if (info == NULL || f2i == NULL)
        return gs_throw_code(gs_error_Fatal);
@@ -397,7 +397,7 @@ zip_new_info_node(gx_device_xps *xps_dev, const char *filename)
    lenstr = strlen(filename);
    f2i->filename = (char*)gs_alloc_bytes(mem->non_gc_memory, lenstr + 1, "zinfo_filename");
    strcpy(f2i->filename, filename);
-        
    info->data.fp = 0;
    info->data.count = 0;
    info->saved = false;
@@ -408,7 +408,7 @@ zip_new_info_node(gx_device_xps *xps_dev, const char *filename)
        int node = 1;
        gx_device_xps_f2i_t *prev_f2i;
 #endif
-        
        while (f2i != NULL) {
            if_debug2m('_', dev->memory, "node:%d %s\n", node++, f2i->filename);
 #ifdef DEBUG
@@ -454,14 +454,14 @@ zip_append_data(gs_memory_t *mem, gx_device_xps_zinfo_t *info, byte *data, uint
       archive file, open a temporary file to store the data. */
    if (info->data.count == 0) {
        char *filename =
-          (char *)gs_alloc_bytes(mem->non_gc_memory, gp_file_name_sizeof, 
+          (char *)gs_alloc_bytes(mem->non_gc_memory, gp_file_name_sizeof,
                "zip_append_data(filename)");
        gp_file *fp;
-        
        if (!filename) {
            return(gs_throw_code(gs_error_VMerror));
        }
-        
        fp = gp_open_scratch_file_rm(mem, "xpsdata-",
                                        filename, "wb+");
        gs_free_object(mem->non_gc_memory, filename, "zip_append_data(filename)");
@@ -737,7 +737,7 @@ zip_close_archive_file(gx_device_xps *xps_dev, const char *filename)
        }
        /* If this is a TIFF file, then update the data count information.
           During the writing of the TIFF directory there is seeking and
-           relocations that occur, which make data.count incorrect. 
+           relocations that occur, which make data.count incorrect.
           We could just do this for all the files and avoid the test. */
        len = strlen(filename);
        if (len > 3 && (strncmp("tif", &(filename[len - 3]), 3) == 0)) {
@@ -934,7 +934,7 @@ xps_open_device(gx_device *dev)
                                 fixed_document_sequence);
    if (code < 0)
        return gs_rethrow_code(code);
-    
    code = write_str_to_zip_file(xps, (char *)"[Content_Types].xml",
                                 xps_content_types);
    if (code < 0)
@@ -969,7 +969,7 @@ write_str_to_current_page(gx_device_xps *xps, const char *str)
    int code = gs_sprintf(buf, page_template, xps->page_count+1);
    if (code < 0)
        return gs_rethrow_code(code);
-    
    return write_str_to_zip_file(xps, buf, str);
 }
@@ -987,7 +987,7 @@ add_new_relationship(gx_device_xps *xps, const char *str)
        return gs_rethrow_code(code);
    /* Check if this is our first one */
-    if (xps->relationship_count == 0) 
+    if (xps->relationship_count == 0)
        write_str_to_zip_file(xps, buf, rels_header);
    /* Now add the reference */
@@ -1232,10 +1232,10 @@ static int
 set_state_color(gx_device_vector *vdev, const gx_drawing_color *pdc, gx_color_index *color)
 {
    gx_device_xps *xps = (gx_device_xps *)vdev;
-    
    /* hack so beginpage is called */
    (void)gdev_vector_stream((gx_device_vector*)xps);
- 
    /* Usually this is not an actual error but a signal to the
       graphics library to simplify the color */
    if (!gx_dc_is_pure(pdc)) {
@@ -1252,7 +1252,7 @@ xps_setfillcolor(gx_device_vector *vdev, const gs_gstate *pgs, const gx_drawing_
    gx_device_xps *xps = (gx_device_xps *)vdev;
    if_debug1m('_', xps->memory, "xps_setfillcolor:%06X\n", (uint32_t)gx_dc_pure_color(pdc));
-    
    return set_state_color(vdev, pdc, &xps->fillcolor);
 }
@@ -1260,9 +1260,9 @@ static int
 xps_setstrokecolor(gx_device_vector *vdev, const gs_gstate *pgs, const gx_drawing_color *pdc)
 {
    gx_device_xps *xps = (gx_device_xps *)vdev;
-    
    if_debug1m('_', xps->memory, "xps_setstrokecolor:%06X\n", (uint32_t)gx_dc_pure_color(pdc));
-    
    return set_state_color(vdev, pdc, &xps->strokecolor);
 }
@@ -1473,8 +1473,8 @@ xps_dorect(gx_device_vector *vdev, fixed x0, fixed y0,
                fixed2float(x0), fixed2float(y1),
                fixed2float(x1), fixed2float(y1),
                fixed2float(x1), fixed2float(y0));
-               
-    
    /* skip non-drawing paths for now */
    if (!drawing_path(type, xps->filltype)) {
        if_debug1m('_', xps->memory, "xps_dorect: type not supported %x\n", type);
@@ -1552,7 +1552,7 @@ gdev_xps_stroke_path(gx_device * dev, const gs_gstate * pgs, gx_path * ppath,
    }
    return gdev_vector_stroke_path(dev, pgs, ppath, params, pdcolor, pcpath);
 }
-           
 static int
 xps_beginpath(gx_device_vector *vdev, gx_path_type_t type)
 {
@@ -1560,7 +1560,7 @@ xps_beginpath(gx_device_vector *vdev, gx_path_type_t type)
    gx_device_xps *xps = (gx_device_xps *)vdev;
    uint32_t c;
    const char *fmt;
-    
    (void)gdev_vector_stream((gx_device_vector*)xps);
    /* skip non-drawing paths for now */
@@ -1588,7 +1588,7 @@ xps_beginpath(gx_device_vector *vdev, gx_path_type_t type)
    else {
        write_str_to_current_page(xps, "<Path Data=\"");
    }
-    
    if_debug1m('_', xps->memory, "xps_beginpath %s\n", line);
    return 0;
@@ -1623,7 +1623,7 @@ xps_lineto(gx_device_vector *vdev, double x0, double y0,
    char line[200];
    if_debug2m('_', xps->memory, "xps_lineto %g %g\n", x, y);
-    
    /* skip non-drawing paths for now */
    if (!drawing_path(type, xps->filltype)) {
        if_debug1m('_', xps->memory, "xps_lineto: type not supported %x\n", type);
@@ -1642,18 +1642,18 @@ xps_curveto(gx_device_vector *vdev, double x0, double y0,
 {
    gx_device_xps *xps = (gx_device_xps *)vdev;
    char line[200];
-    
    /* skip non-drawing paths for now */
    if (!drawing_path(type, xps->filltype)) {
        if_debug1m('_', xps->memory, "xps_curveto: type not supported %x\n", type);
        return 0;
    }
-    
    gs_sprintf(line, " C %g,%g %g,%g %g,%g", x1, y1,
            x2,y2,x3,y3);
    write_str_to_current_page(xps,line);
    if_debug1m('_', xps->memory, "xps_curveto %s\n", line);
-            
    return 0;
 }
@@ -1716,7 +1716,7 @@ static const gx_image_enum_procs_t xps_image_enum_procs = {
 /* Prototypes */
 static TIFF* tiff_from_name(gx_device_xps *dev, const char *name, int big_endian,
    bool usebigtiff);
-static int tiff_set_values(xps_image_enum_t *pie, TIFF *tif, 
+static int tiff_set_values(xps_image_enum_t *pie, TIFF *tif,
                            cmm_profile_t *profile, bool force8bit);
 static void xps_tiff_set_handlers(void);
@@ -1770,7 +1770,7 @@ xps_add_icc_relationship(xps_image_enum_t *pie)
    return 0;
 }
-static int 
+static int
 xps_add_image_relationship(xps_image_enum_t *pie)
 {
    gx_device_xps *xps = (gx_device_xps*) (pie->dev);
@@ -1796,8 +1796,8 @@ xps_write_profile(const gs_gstate *pgs, char *name, cmm_profile_t *profile, gx_d
 }
 static int
-xps_begin_image(gx_device *dev, const gs_gstate *pgs, 
+xps_begin_image(gx_device *dev, const gs_gstate *pgs,
-                const gs_image_t *pim, gs_image_format_t format, 
+                const gs_image_t *pim, gs_image_format_t format,
                const gs_int_rect *prect, const gx_drawing_color *pdcolor,
                const gx_clip_path *pcpath, gs_memory_t *mem,
                gx_image_enum_common_t **pinfo)
@@ -1814,7 +1814,7 @@ xps_begin_image(gx_device *dev, const gs_gstate *pgs,
    int bits_per_pixel;
    int num_components;
    int bsize;
-    cmm_profile_t *icc_profile = NULL; 
+    cmm_profile_t *icc_profile = NULL;
    gs_color_space_index csindex;
    float index_decode[2];
    gsicc_rendering_param_t rendering_params;
@@ -1856,8 +1856,8 @@ xps_begin_image(gx_device *dev, const gs_gstate *pgs,
    /* We need this set a bit early for the ICC relationship writing */
    pie->dev = (gx_device*) xdev;
-    /* If the color space is DeviceN, Sep or indexed these end up getting 
+    /* If the color space is DeviceN, Sep or indexed these end up getting
-       mapped to the color space defined by the device profile.  XPS only 
+       mapped to the color space defined by the device profile.  XPS only
       support RGB indexed images so we just expand if for now. ICC link
       creation etc is handled during the remap/concretization of the colors */
    if (csindex == gs_color_space_index_Indexed ||
@@ -1927,7 +1927,7 @@ xps_begin_image(gx_device *dev, const gs_gstate *pgs,
            xdev->icc_data = icc_data;
        }
-        /* Get name for mark up and for relationship. Have to wait and do 
+        /* Get name for mark up and for relationship. Have to wait and do
           this after it is added to the package */
        code = xps_create_icc_name(xdev, icc_profile, &(pie->icc_name[0]));
        if (code < 0)
@@ -1965,8 +1965,8 @@ xps_begin_image(gx_device *dev, const gs_gstate *pgs,
        pcpath = &cpath;
    } else {
        /* Force vector device to do new path as the clip path is the image
-           path.  I had a case where the clip path ids were the same but the 
+           path.  I had a case where the clip path ids were the same but the
-           CTM was changing which resulted in subsequent images coming up 
+           CTM was changing which resulted in subsequent images coming up
           missing on the page. i.e. only the first one was shown. */
        ((gx_device_vector*) vdev)->clip_path_id = vdev->no_clip_path_id;
    }
@@ -1996,7 +1996,7 @@ xps_begin_image(gx_device *dev, const gs_gstate *pgs,
    pie->bytes_comp = (pie->decode_st.bps > 8 ? 2 : 1);
    pie->decode_st.spp = num_components;
    pie->decode_st.unpack = NULL;
-    get_unpack_proc((gx_image_enum_common_t*)pie, &(pie->decode_st), pim->format, 
+    get_unpack_proc((gx_image_enum_common_t*)pie, &(pie->decode_st), pim->format,
        pim->Decode);
    /* The decode mapping for index colors needs an adjustment */
@@ -2011,7 +2011,7 @@ xps_begin_image(gx_device *dev, const gs_gstate *pgs,
        }
        get_map(&(pie->decode_st), pim->format, index_decode);
    } else {
-        get_map(&(pie->decode_st), pim->format, pim->Decode); 
+        get_map(&(pie->decode_st), pim->format, pim->Decode);
    }
    /* Allocate our decode buffer. */
@@ -2232,7 +2232,7 @@ exit:
 #define TIFF_PRINT_BUF_LENGTH 1024
 static const char tifs_msg_truncated[] = "\n*** Previous line has been truncated.\n";
-static int 
+static int
 tiff_set_values(xps_image_enum_t *pie, TIFF *tif, cmm_profile_t *profile,
                bool force8bit)
 {
@@ -2283,7 +2283,7 @@ tiff_set_values(xps_image_enum_t *pie, TIFF *tif, cmm_profile_t *profile,
 typedef struct tifs_io_xps_t
 {
    gx_device_xps *pdev;
-    gp_file *fid; 
+    gp_file *fid;
 } tifs_io_xps;
 /* libtiff i/o hooks */
@@ -2384,7 +2384,7 @@ xps_tifsSizeProc(thandle_t fd)
 }
 static void
-xps_tifsWarningHandlerEx(thandle_t client_data, const char *module, 
+xps_tifsWarningHandlerEx(thandle_t client_data, const char *module,
                         const char *fmt, va_list ap)
 {
    tifs_io_xps *tiffio = (tifs_io_xps *)client_data;
@@ -2403,7 +2403,7 @@ xps_tifsWarningHandlerEx(thandle_t client_data, const char *module,
 }
 static void
-xps_tifsErrorHandlerEx(thandle_t client_data, const char *module, 
+xps_tifsErrorHandlerEx(thandle_t client_data, const char *module,
                       const char *fmt, va_list ap)
 {
    tifs_io_xps *tiffio = (tifs_io_xps *)client_data;
diff --git a/pcl/pcl/pccid.c b/pcl/pcl/pccid.c
index 99bc9622a..9fea5e4df 100644
--- a/pcl/pcl/pccid.c
+++ b/pcl/pcl/pccid.c
@@ -313,7 +313,7 @@ check_cid_hdr(pcl_state_t * pcs, pcl_cid_data_t * pcid)
        pcidh->bits_per_primary[2] = 8;
    }
-    /* 
+    /*
     * All long form color commands appear to be deprecated on modern
     * HP devices.  We simply truncate all long form commands to the 6
     * byte short form.
diff --git a/pcl/pcl/pcdraw.c b/pcl/pcl/pcdraw.c
index 778aff9b0..bc09b2456 100644
--- a/pcl/pcl/pcdraw.c
+++ b/pcl/pcl/pcdraw.c
@@ -142,9 +142,9 @@ pcl_grestore(pcl_state_t * pcs)
    /* check for bottom of graphic state stack */
    if (pcs == 0 || pcs->pids == 0 || pcs->pids->prev == 0)
        return e_Range;
-    
    pids = pcs->pids->prev;
-    
    if ((code = gs_grestore(pcs->pgs)) >= 0) {
        pcs->pids->prev = pids->prev;
        pcl_ccolor_copy_from(pcs->pids->pccolor, pids->pccolor);
diff --git a/pcl/pcl/pcfrgrnd.c b/pcl/pcl/pcfrgrnd.c
index 96fd330af..6ea7fdb6a 100644
--- a/pcl/pcl/pcfrgrnd.c
+++ b/pcl/pcl/pcfrgrnd.c
@@ -102,7 +102,7 @@ build_foreground(pcl_state_t * pcs,
    }
    num_entries = pindexed->num_entries;
-    
    /* release the existing foreground */
    if (pfrgrnd != 0) {
        rc_decrement(pfrgrnd, "build pcl foreground");
diff --git a/pcl/pcl/pcfsel.c b/pcl/pcl/pcfsel.c
index 88b16163c..8544aa42e 100644
--- a/pcl/pcl/pcfsel.c
+++ b/pcl/pcl/pcfsel.c
@@ -343,7 +343,7 @@ score_match(const pcl_state_t * pcs, const pcl_font_selection_t * pfs,
            tscore = 14 + delta;
        score[score_weight] = tscore;
-        /* 
+        /*
         * The following is a workaround needed because our font
         * selection algorithm is different than HP's.  HP uses a
         * filtering algorithm where fonts cannot be given points
@@ -422,7 +422,7 @@ score_match(const pcl_state_t * pcs, const pcl_font_selection_t * pfs,
     * (undocumented).  Negate the font number so that smaller numbers
     * have a higher score.
     */
-    
    score[score_pjl_fontnumber] = -fp->params.pjl_font_number;
 #ifdef DEBUG
diff --git a/pcl/pcl/pcjob.c b/pcl/pcl/pcjob.c
index 4a4ca5f0f..98d48dcfc 100644
--- a/pcl/pcl/pcjob.c
+++ b/pcl/pcl/pcjob.c
@@ -182,7 +182,7 @@ pcl_duplex_page_side_select(pcl_args_t * pargs, pcl_state_t * pcs)
        if (errcode < 0)
            return errcode;
    }
-    
    /* if there is an error (code < 0) or the page is unmarked (code
       == 0) then nothing to update */
    if (code <= 0)
@@ -330,7 +330,7 @@ pcjob_do_reset(pcl_state_t * pcs, pcl_reset_type_t type)
            /* resolution is always a single number in PJL */
            res[0] = res[1] = pcl_pjl_res(pcs);
-            /* 
+            /*
             * again we only have a single number from PJL so just
             *  check the width
             */
diff --git a/pcl/pcl/pcpage.c b/pcl/pcl/pcpage.c
index 5089490db..0ecbfbc22 100644
--- a/pcl/pcl/pcpage.c
+++ b/pcl/pcl/pcpage.c
@@ -44,9 +44,9 @@
 /*
 * The PCL printable region. In older HP printers this region was set to
 * 1/6" from the edge of the paper, irrespecitve of the paper size or the
- * device. However, recent HP printers allow the margin to be configurable 
+ * device. However, recent HP printers allow the margin to be configurable
- * and even set to 0 for full bleed.  If a non-zero margin is needed it can be 
+ * and even set to 0 for full bleed.  If a non-zero margin is needed it can be
- * set on the command line via -H (e.g. -H12x12x12x12 restores the previous 
+ * set on the command line via -H (e.g. -H12x12x12x12 restores the previous
 * 1/6" margin).  See doc/ghostpdl.pdf for details.
 */
 #define PRINTABLE_MARGIN_CP inch2coord(0.0)
@@ -393,7 +393,7 @@ new_page_size(pcl_state_t * pcs,
    reset_margins(pcs, for_passthrough);
    /* check if update_xfm_state changed the page size */
-    changed_page_size = !((int)old_page_size[0] == pcs->xfm_state.paper_size->width/100 && 
+    changed_page_size = !((int)old_page_size[0] == pcs->xfm_state.paper_size->width/100 &&
                          (int)old_page_size[1] == pcs->xfm_state.paper_size->height/100);
    /*
@@ -522,12 +522,12 @@ pcl_mark_page_for_current_pos(pcl_state_t * pcs)
        if (code < 0)
            /* shouldn't happen. */
            return code;
-        
        code = gx_path_current_point(gx_current_path(pcs->pgs), &pt);
        if (code < 0)
            /* shouldn't happen */
            return code;
-        
        /* half-open lower - not sure this is correct */
        if (pt.x >= page_box.p.x && pt.y >= page_box.p.y &&
@@ -571,7 +571,7 @@ pcl_mark_page_for_character(pcl_state_t * pcs, gs_fixed_point *org)
    return 0;
 }
-/* 
+/*
 *  Just use the current position to see if we marked the page.  This
 *  could be improved by using the bounding box of the path object but
 *  for page marking that case does not seem to come up in practice.
@@ -1055,8 +1055,8 @@ set_logical_page(pcl_args_t * pargs, pcl_state_t * pcs)
    return code;
 }
-/* 
+/*
- * Custom Paper Width/Length 
+ * Custom Paper Width/Length
 * from Windows Driver "HP Universal Printing PCL 5" (.GPD files) and
 * http://www.office.xerox.com/support/dctips/dc10cc0471.pdf
 *
@@ -1087,7 +1087,7 @@ set_paper_width(pcl_args_t * pargs, pcl_state_t * pcs)
    return 0;
 }
-int 
+int
 pcl_set_custom_paper_size(pcl_state_t *pcs, pcl_paper_size_t *p)
 {
    pcl_paper_size_t *psize = NULL;
@@ -1107,7 +1107,7 @@ pcl_set_custom_paper_size(pcl_state_t *pcs, pcl_paper_size_t *p)
        /* this should never happen - the custom paper size is
           always in the table */
        return -1;
-    
    return new_logical_page(pcs, 0, psize, false, false);
 }
 /*
diff --git a/pcl/pcl/pcsymbol.c b/pcl/pcl/pcsymbol.c
index d12ed6e3c..9c56c96a3 100644
--- a/pcl/pcl/pcsymbol.c
+++ b/pcl/pcl/pcsymbol.c
@@ -103,7 +103,7 @@ pcl_define_symbol_set(pcl_args_t * pargs, pcl_state_t * pcs)
    if (last_code > 255 || first_code > last_code)
        return e_Range;
-    
    {
        int num_codes = last_code - first_code + 1;  /* must be in [0,256] now. */
        int i;
@@ -185,13 +185,13 @@ pcl_symbol_set_control(pcl_args_t * pargs, pcl_state_t * pcs)
    switch (int_arg(pargs)) {
        case 0:
-            {                   
+            {
                /* Delete all user-defined symbol sets. */
                /* Note: When deleting symbol set(s), it is easier
                 * (safer?)  to decache and reselect fonts
                 * unconditionally.  (Consider, for example, deleting
                 * a downloaded overload of a built-in which might be
-                 * the default ID.) 
+                 * the default ID.)
                 */
                pl_dict_release(&pcs->soft_symbol_sets);
                pcl_decache_font(pcs, -1, true);
diff --git a/pcl/pcl/pgchar.c b/pcl/pcl/pgchar.c
index f1b011b44..65c38b632 100644
--- a/pcl/pcl/pgchar.c
+++ b/pcl/pcl/pgchar.c
@@ -349,7 +349,7 @@ hpgl_DV(hpgl_args_t * pargs, hpgl_state_t * pgls)
    if (!hpgl_arg_c_int(pgls->memory, pargs, &path))
        path = 0;
-    
    if (!hpgl_arg_c_int(pgls->memory, pargs, &line))
        line = 0;
diff --git a/pcl/pcl/pgconfig.c b/pcl/pcl/pgconfig.c
index 9a72330e2..80f57e99e 100644
--- a/pcl/pcl/pgconfig.c
+++ b/pcl/pcl/pgconfig.c
@@ -367,17 +367,17 @@ hpgl_scaling_points_set(hpgl_state_t *pgls, int32 *ptxy, bool track)
    pgls->g.P1.x = ptxy[0];
    pgls->g.P1.y = ptxy[1];
- 
  /* if either coordinate is equal it is incremented by 1 */
    if (pgls->g.P1.x == pgls->g.P2.x)
        pgls->g.P2.x++;
    if (pgls->g.P1.y == pgls->g.P2.y)
        pgls->g.P2.y++;
-    
    return 0;
 }
-    
 /* IP p1x,p1y[,p2x,p2y]; */
 /* IP; */
 int
diff --git a/pcl/pcl/pglfill.c b/pcl/pcl/pglfill.c
index a8169cd3c..44d81bfad 100644
--- a/pcl/pcl/pglfill.c
+++ b/pcl/pcl/pglfill.c
@@ -75,7 +75,7 @@ hpgl_FT(hpgl_args_t * pargs, hpgl_state_t * pgls)
    if (!hpgl_arg_int(pgls->memory, pargs, &type))
        type = hpgl_FT_pattern_solid_pen1;
-    
    switch (type) {
        case hpgl_FT_pattern_solid_pen1:       /* 1 */
diff --git a/pcl/pcl/pgparse.c b/pcl/pcl/pgparse.c
index d0451140b..300ca6bcf 100644
--- a/pcl/pcl/pgparse.c
+++ b/pcl/pcl/pgparse.c
@@ -220,7 +220,7 @@ hpgl_process(hpgl_parser_state_t * pst, hpgl_state_t * pgls,
     */
    if (pgls->macro_level > 0 && (code == gs_error_NeedInput))
        code = gs_error_Fatal;
-        
    return (code == gs_error_NeedInput ? 0 : code);
 }
diff --git a/pcl/pcl/rtgmode.c b/pcl/pcl/rtgmode.c
index ddbc8bf4b..a2d072b45 100644
--- a/pcl/pcl/rtgmode.c
+++ b/pcl/pcl/rtgmode.c
@@ -403,7 +403,7 @@ pcl_end_graphics_mode(pcl_state_t * pcs)
 int
 pcl_end_graphics_mode_implicit(pcl_state_t * pcs, bool ignore_in_rtl)
 {
-    
 #ifdef DEBUG
    if_debug0('I', "Graphics exited implicitly\n");
 #endif
@@ -431,7 +431,7 @@ pcl_end_graphics_mode_implicit(pcl_state_t * pcs, bool ignore_in_rtl)
 * integer resolution, and we do the same in RTL mode.
 */
-/* 
+/*
 * A table to round up to the next higher permitted resolution.  Note
 * there are duplicates in the table because some factors are not
 * supported and they default to the next higher resolution.
@@ -766,12 +766,12 @@ gmode_do_reset(pcl_state_t * pcs, pcl_reset_type_t type)
        prstate->gmargin_cp = 0L;
-        /* 
+        /*
         * The raster resolution default is device dependent, we've
         * decided to use 75 dpi for regular PCL mode and the PJL
         * resolution for HPGL/2 rtl mode based on our experience with
         * various HP products, but we doubt it is always correct.
-         */ 
+         */
        prstate->resolution = 75;
        if (pcs->personality == rtl) {
diff --git a/pcl/pl/plsymbol.c b/pcl/pl/plsymbol.c
index 03240dc07..5aff8cf1b 100644
--- a/pcl/pl/plsymbol.c
+++ b/pcl/pl/plsymbol.c
@@ -3615,7 +3615,7 @@ static const pl_symbol_map_t map_12N_unicode = {
        0x03c8, 0x03c9, 0x03ca, 0x03cb, 0x03cc, 0x03cd, 0x03ce, 0xffff
    }
 };
-    
 /*************************************************************
 * HP-GL/2 stick font extended character set Unicode mapping *
 * (Note: this symbol set is not documented anywhere.)       *
diff --git a/pcl/pl/plwmainc.c b/pcl/pl/plwmainc.c
index c42372137..21c690bf3 100644
--- a/pcl/pl/plwmainc.c
+++ b/pcl/pl/plwmainc.c
@@ -358,7 +358,7 @@ main_utf8(int argc, char *argv[])
        return 1;
    }
-#ifndef METRO    
+#ifndef METRO
    if (_beginthread(winthread, 65535, NULL) == -1) {
        fprintf(stderr, "GUI thread creation failed\n");
    }
diff --git a/pcl/pxl/pxffont.c b/pcl/pxl/pxffont.c
index 50d9094ab..d8f0d4ef1 100644
--- a/pcl/pxl/pxffont.c
+++ b/pcl/pxl/pxffont.c
@@ -95,7 +95,7 @@ px_find_existing_font(px_value_t * pfnv, px_font_t ** ppxfont,
    void *pxfont;
    *ppxfont = NULL;
-    
    /* Normalize the font name to Unicode. */
    code = px_widen_font_name(pfnv, pxs);
    if (code < 0)
diff --git a/pcl/pxl/pxfont.c b/pcl/pxl/pxfont.c
index de874672c..8457aeba8 100644
--- a/pcl/pxl/pxfont.c
+++ b/pcl/pxl/pxfont.c
@@ -828,7 +828,7 @@ pxRemoveFont(px_args_t * par, px_state_t * pxs)
         */
        if (pxfont->pfont == gs_currentfont(pxs->pgs))
            gs_setfont(pxs->pgs, NULL);
-        
        px_dict_undef(&pxs->font_dict, par->pv[0]);
    }
diff --git a/pcl/pxl/pxpaint.c b/pcl/pxl/pxpaint.c
index 1fc8eed24..bb40b3699 100644
--- a/pcl/pxl/pxpaint.c
+++ b/pcl/pxl/pxpaint.c
@@ -500,7 +500,7 @@ pxPaintPath(px_args_t * par, px_state_t * pxs)
    if (code >= 0)
        code = gx_setcurrentpoint_from_path(pxs->pgs, ppath);
-    
    return code;
 }
diff --git a/pcl/pxl/pxptable.c b/pcl/pxl/pxptable.c
index 4cc36b819..9582fcf9d 100644
--- a/pcl/pxl/pxptable.c
+++ b/pcl/pxl/pxptable.c
@@ -190,7 +190,7 @@ const px_attr_value_type_t px_attr_value_types[] = {
    /* 43 */ xyp(ub | us | rl, checkPageScale), /* PageScale */
    /* 44 */ scub(), /* ROP3 */
    /* 45 */ en(pxeTxMode_next), /* TxMode */
-    /* 46 */ none, 
+    /* 46 */ none,
    /* 47 */ xy(us | rl), /* CustomMediaSize  */
    /* 48 */ en(pxeMeasure_next), /* CustomMediaSizeUnits */
    /* 49 */ sc(us), /* PageCopies */
diff --git a/psi/apitest.c b/psi/apitest.c
index 6f5bc41db..fbd12f501 100644
--- a/psi/apitest.c
+++ b/psi/apitest.c
@@ -72,7 +72,7 @@ static void *gs_main(void *arg)
        gsargv[i] = my_argv[i];
    gsargv[my_argv_file] = text;
    gsargc = my_argc;
-    
    strncpy(text, my_argv[my_argv_file], sizeof(text));
    text[sizeof(text)-1]=0;
    pos = strlen(text);
@@ -111,11 +111,11 @@ int main(int argc, char *argv[])
    my_argc = argc;
    my_argv = argv;
-    
    for (i=0; i < argc; i++)
        if (!strcmp(argv[i], "-o"))
            break;
-    
    if (i >= argc-1)
    {
        fprintf(stderr, "Expected a -o argument to rewrite!\n");
diff --git a/psi/dwmainc.c b/psi/dwmainc.c
index 7fd21b91b..07e890f83 100644
--- a/psi/dwmainc.c
+++ b/psi/dwmainc.c
@@ -168,7 +168,7 @@ gsdll_stdin_utf8(void *instance, char *buf, int len)
            /* Previously the code here has always just checked for whether
             * _read returns <= 0 to see whether we should exit. According
             * to the docs -1 means error, 0 means EOF. Unfortunately,
-             * building using VS2015 there appears to be a bug in the 
+             * building using VS2015 there appears to be a bug in the
             * runtime, whereby a line with a single return on it (on an
             * ANSI encoded Text file at least) causes a 0 return value.
             * We hack around this by second guessing the code. We clear
diff --git a/psi/dxmain.c b/psi/dxmain.c
index 728effd58..6ef1ac1a8 100644
--- a/psi/dxmain.c
+++ b/psi/dxmain.c
@@ -1232,7 +1232,7 @@ int main(int argc, char *argv[])
                code = 0;
            }
        }
-        
        if (code == 0)
            code = gsapi_init_with_args(instance, nargc, nargv);
diff --git a/psi/zcolor.c b/psi/zcolor.c
index 0ddc15f4f..4683053f1 100644
--- a/psi/zcolor.c
+++ b/psi/zcolor.c
@@ -1598,7 +1598,7 @@ static int setcmykspace(i_ctx_t * i_ctx_p, ref *r, int *stage, int *cont, int CI
                pcs = gs_cspace_new_DeviceCMYK(imemory);
                if (pcs == NULL)
                    return_error(gs_error_VMerror);
-                /* Bug 693816 unset device color prior to possible overprint 
+                /* Bug 693816 unset device color prior to possible overprint
                   colorant check */
                gx_unset_dev_color(igs);
                code = gs_setcolorspace(igs, pcs);
diff --git a/psi/zfapi.c b/psi/zfapi.c
index 19043b84e..aa988ed6e 100644
--- a/psi/zfapi.c
+++ b/psi/zfapi.c
@@ -2873,7 +2873,7 @@ ps_get_glyphname_or_cid(gs_text_enum_t *penum,
                        cmapnmlen = r_size(&CMapNameStr);
                    }
                }
-                /* We only have to lookup the char code if we're *not* using an identity ordering 
+                /* We only have to lookup the char code if we're *not* using an identity ordering
                   with the exception of Identity-UTF16 which is a different beast altogether */
                if (unicode_cp || (cmapnmlen > 0 && !strncmp(cmapnm, utfcmap, cmapnmlen > utfcmaplen ? utfcmaplen : cmapnmlen))
                    || (dict_find_string(pdr, "CIDSystemInfo", &CIDSystemInfo) > 0
diff --git a/psi/zfimscale.c b/psi/zfimscale.c
index 088a6c5f6..ce180e3d2 100644
--- a/psi/zfimscale.c
+++ b/psi/zfimscale.c
@@ -49,8 +49,8 @@ z_imscale_d(i_ctx_t * i_ctx_p)
    if (dict_int_param(op, "Height", 0, 1<<24, -1, &height) < 0)
        return_error(gs_error_rangecheck);
-    state.params.spp_decode = 1;                
+    state.params.spp_decode = 1;
-    state.params.spp_interp = 1;            
+    state.params.spp_interp = 1;
    state.params.BitsPerComponentIn = 1;
    state.params.MaxValueIn = 1;
    state.params.WidthIn = width;
diff --git a/psi/zform.c b/psi/zform.c
index 3c00b5a5e..e2555d698 100644
--- a/psi/zform.c
+++ b/psi/zform.c
@@ -61,7 +61,7 @@ static int zbeginform(i_ctx_t *i_ctx_p)
    tmplate.BBox.p.y = BBox[1];
    tmplate.BBox.q.x = BBox[2];
    tmplate.BBox.q.y = BBox[3];
- 
    code = dict_floats_param(imemory, op, "Matrix", 6, Matrix, NULL);
    if (code < 0)
        return code;
diff --git a/psi/zpdf_r6.c b/psi/zpdf_r6.c
index a958fdb2b..3315291a0 100644
--- a/psi/zpdf_r6.c
+++ b/psi/zpdf_r6.c
@@ -144,7 +144,7 @@ zcheck_r6_password(i_ctx_t * i_ctx_p)
        return_error(gs_error_typecheck);
    if (!r_has_type(Pref, t_string))
        return_error(gs_error_typecheck);
-    
    code = dict_find_string(CryptDict, "O", &Oref);
    if (code < 0)
        return code;