Blame SOURCES/ghostscript-cve-2020-16304.patch

6fb37a
diff --git a/base/gxicolor.c b/base/gxicolor.c
6fb37a
index 34cfaa4..585bd81 100644
6fb37a
--- a/base/gxicolor.c
6fb37a
+++ b/base/gxicolor.c
6fb37a
@@ -644,16 +644,16 @@ image_render_color_thresh(gx_image_enum *penum_orig, const byte *buffer, int dat
6fb37a
                                     *(devc_contone_gray+1) = *psrc_temp;
6fb37a
                             }
6fb37a
                         } else {
6fb37a
-                        /* Mono case, forward */
6fb37a
-                        psrc_temp = psrc_cm;
6fb37a
-                        for (k=0; k
6fb37a
-                            dda_next(dda_ht);
6fb37a
-                            xn = fixed2int_var_rounded(dda_current(dda_ht));
6fb37a
-                            while (xr < xn) {
6fb37a
-                                *devc_contone_gray++ = *psrc_temp;
6fb37a
-                                xr++;
6fb37a
-                            }           /* at loop exit xn will be >= xr */
6fb37a
-                            psrc_temp++;
6fb37a
+                            /* Mono case, forward */
6fb37a
+                            psrc_temp = psrc_cm;
6fb37a
+                            for (k=0; k
6fb37a
+                                dda_next(dda_ht);
6fb37a
+                                xn = fixed2int_var_rounded(dda_current(dda_ht));
6fb37a
+                                while (xr < xn) {
6fb37a
+                                    *devc_contone_gray++ = *psrc_temp;
6fb37a
+                                    xr++;
6fb37a
+                                }           /* at loop exit xn will be >= xr */
6fb37a
+                                psrc_temp++;
6fb37a
                             }
6fb37a
                         }
6fb37a
                     } else {
6fb37a
@@ -668,7 +668,7 @@ image_render_color_thresh(gx_image_enum *penum_orig, const byte *buffer, int dat
6fb37a
                                 xr--;
6fb37a
                             }           /* at loop exit xn will be >= xr */
6fb37a
                             psrc_temp++;
6fb37a
-                            }
6fb37a
+                        }
6fb37a
                     }
6fb37a
                     break;
6fb37a
                 /* Monochrome landscape */
6fb37a
@@ -811,10 +811,9 @@ image_render_color_thresh(gx_image_enum *penum_orig, const byte *buffer, int dat
6fb37a
                             dda_next(dda_ht);
6fb37a
                             xn = fixed2int_var_rounded(dda_current(dda_ht));
6fb37a
                             while (xr > xn) {
6fb37a
-                                for (j = 0; j < spp_out; j++) {
6fb37a
+                                for (j = 0; j < spp_out; j++)
6fb37a
                                     *(devc_contone[j] + position) = (psrc_plane[j])[i];
6fb37a
-                                    position -= LAND_BITS;
6fb37a
-                                }
6fb37a
+                                position -= LAND_BITS;
6fb37a
                                 xr--;
6fb37a
                             }           /* at loop exit xn will be <= xr */
6fb37a
                             i++;
6fb37a
@@ -825,9 +824,8 @@ image_render_color_thresh(gx_image_enum *penum_orig, const byte *buffer, int dat
6fb37a
                            and 2x scaling which we will run into in 300 and
6fb37a
                            600dpi devices and content */
6fb37a
                         /* Apply initial offset */
6fb37a
-                        for (k = 0; k < spp_out; k++) {
6fb37a
+                        for (k = 0; k < spp_out; k++)
6fb37a
                             devc_contone[k] = devc_contone[k] + position;
6fb37a
-                        }
6fb37a
                         if (src_size == dest_height) {
6fb37a
                             for (k = 0; k < data_length; k++) {
6fb37a
                                 /* Is it better to unwind this?  We know it is 4 */
6fb37a
@@ -853,10 +851,9 @@ image_render_color_thresh(gx_image_enum *penum_orig, const byte *buffer, int dat
6fb37a
                                 dda_next(dda_ht);
6fb37a
                                 xn = fixed2int_var_rounded(dda_current(dda_ht));
6fb37a
                                 while (xr > xn) {
6fb37a
-                                    for (j = 0; j < spp_out; j++) {
6fb37a
+                                    for (j = 0; j < spp_out; j++)
6fb37a
                                         *(devc_contone[j] + position) = (psrc_plane[j])[i];
6fb37a
-                                        position -= LAND_BITS;
6fb37a
-                                    }
6fb37a
+                                    position -= LAND_BITS;
6fb37a
                                     xr--;
6fb37a
                                 }           /* at loop exit xn will be <= xr */
6fb37a
                                 i++;