[gs-commits] ghostpdl branch, master, updated. jbig2dec-0.14-1584-g6c18c70

The ghostpdl branch, master has been updated
  discards  e5ce6a47af547d5d8ef3e224d648cf90c9584c2f (commit)
       via  6c18c7092e8945dcd932226bfea790c842ae21a0 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (e5ce6a47af547d5d8ef3e224d648cf90c9584c2f)
            \
             N -- N -- N (6c18c7092e8945dcd932226bfea790c842ae21a0)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

----------------------------------------------------------------------
commit 6c18c7092e8945dcd932226bfea790c842ae21a0
Author: Robin Watts <[email protected]>
Date:   Fri Aug 16 15:43:32 2019 +0100

    Squash warnings in claptrap.
    
    Thanks to William Bader for highlighting these.

diff --git a/base/claptrap-planar.c b/base/claptrap-planar.c
index 84a486c..4686365 100644
--- a/base/claptrap-planar.c
+++ b/base/claptrap-planar.c
@@ -43,7 +43,7 @@ inline static void process_at_pixel(ClapTrap      * gs_restrict ct,
     /* Use local vars to avoid pointer aliasing */
     int            width        = ct->width;
     int            height       = ct->height;
-    int            num_comps    = ct->num_comps;
+    int            num_comp_lim = ct->num_comps;
     int            max_x_offset = ct->max_x_offset;
     int            max_y_offset = ct->max_y_offset;
     int            span         = ct->span;
@@ -60,7 +60,7 @@ inline static void process_at_pixel(ClapTrap      * gs_restrict ct,
     unsigned char *ppc;
 
     assert((first_comp != 1) ^ (prev_comp == -1));
-    assert((last_comp != 1) ^ (comp == ct->comp_order[num_comps-1]));
+    assert((last_comp != 1) ^ (comp == ct->comp_order[num_comp_lim]));
 
     /* Work out the search region bounds */
     sy = y - max_y_offset;
@@ -150,6 +150,7 @@ int ClapTrap_GetLinePlanar(ClapTrap       * gs_restrict ct,
     int x;
     int line_offset;
     unsigned char *process;
+    int num_comp_lim = ct->num_comps;
 
     /* Read in as many lines as we need */
     max_y = ct->y + ct->max_y_offset;
@@ -192,7 +193,7 @@ int ClapTrap_GetLinePlanar(ClapTrap       * gs_restrict ct,
         {
             process_at_pixel(ct, buffer[comp], x, 1, 1, 1, 0, -1, comp, line_offset, p++);
         }
-        for (comp_idx = 1; comp_idx < ct->num_comps-1; comp_idx++)
+        for (comp_idx = 1; comp_idx < num_comp_lim; comp_idx++)
         {
             prev_comp = comp;
             p = process;
@@ -243,7 +244,7 @@ int ClapTrap_GetLinePlanar(ClapTrap       * gs_restrict ct,
         {
             process_at_pixel(ct, buffer[comp], x, 1, 0, 1, 0, -1, comp, line_offset, p++);
         }
-        for (comp_idx = 1; comp_idx < ct->num_comps-1; comp_idx++)
+        for (comp_idx = 1; comp_idx < num_comp_lim; comp_idx++)
         {
             prev_comp = comp;
             p = process;


Summary of changes:
 windows/GhostPDL.sln | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)