[gs-commits] ghostpdl branch, master, updated. jbig2dec-0.14-1826-g66878fb

The ghostpdl branch, master has been updated
       via  66878fb30f37b06a532fdce39991f31642cdb09b (commit)
       via  76db3df8090127482960b742f15831e59816a05e (commit)
      from  9caccf9f09e06324f07822cc55e1737d881c6eb3 (commit)

----------------------------------------------------------------------
commit 66878fb30f37b06a532fdce39991f31642cdb09b
Author: Julian Smith <[email protected]>
Date:   Thu Nov 7 16:18:32 2019 +0000

    Bug 701856: fix bad bracketting in original fix.

diff --git a/devices/gdevepsn.c b/devices/gdevepsn.c
index c8e10f4..34f0e3a 100644
--- a/devices/gdevepsn.c
+++ b/devices/gdevepsn.c
@@ -178,14 +178,14 @@ eps_print_page(gx_device_printer *pdev, gp_file *prn_stream, int y_9pin_high,
         if (y_24pin) {
             if (x_dpi / 60 >= sizeof(graphics_modes_24) / sizeof(graphics_modes_24[0])) {
                 return_error(gs_error_rangecheck);
-                start_graphics = graphics_modes_24[x_dpi / 60];
             }
+            start_graphics = graphics_modes_24[x_dpi / 60];
         }
         else {
             if (x_dpi / 60 >= sizeof(graphics_modes_9) / sizeof(graphics_modes_9[0])) {
                 return_error(gs_error_rangecheck);
-                start_graphics = graphics_modes_9[x_dpi / 60];
             }
+            start_graphics = graphics_modes_9[x_dpi / 60];
         }
         first_pass = (start_graphics & DD ? 1 : 0);
         last_pass = first_pass * (y_9pin_high == 2 ? 1 : 2);

----------------------------------------------------------------------
commit 76db3df8090127482960b742f15831e59816a05e
Author: Julian Smith <[email protected]>
Date:   Thu Nov 7 16:13:06 2019 +0000

    Coverity issue 102147: initialise gx_device_color::type.
    
    Might fix Coverity issue in base/gxiscale.c.

diff --git a/base/gxiscale.c b/base/gxiscale.c
index 72e3257..3eec2f7 100644
--- a/base/gxiscale.c
+++ b/base/gxiscale.c
@@ -1204,6 +1204,7 @@ image_render_interpolate(gx_image_enum * penum, const byte * buffer,
             int scaled_x_prev = 0;
             gx_dda_fixed save_x_dda = pss->params.scale_dda.x;
 
+            devc.type = gx_dc_type_none; /* Needed for coverity, in call to color_is_pure() if color_handler is NULL. */
             stream_w.limit = out + pss->params.WidthOut *
                 max(spp_decode * sizeofPixelOut, ARCH_SIZEOF_COLOR_INDEX) - 1;
             stream_w.ptr = stream_w.limit - width * spp_decode * sizeofPixelOut;


Summary of changes:
 base/gxiscale.c    | 1 +
 devices/gdevepsn.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)