dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

plug-ins: fix integer overflow in print-draw-page.c

Browse source 
As mentioned by Massimo in issue #6618, part of the problem there is an
integer overflow when using large size images when computing the offset
in pixels.

Let's fix our part of the problem by casting to guint64.
Besides that, also use casts to correctly compute progress for very
large images.

(cherry picked from commit cd4401fee4)
This commit is contained in:
Jacob Boerema 2022-04-25 14:21:01 -04:00
parent f7e7f396aa
commit 96edeb02a4
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plug-ins/print/print-draw-page.c
View file

@ -99,7 +99,7 @@ print_surface_from_drawable (gint32 drawable_ID,
guchar *pixels;
gint stride;
guint count = 0;
guint done = 0;
guint64 done = 0;
if (gimp_drawable_has_alpha (drawable_ID))
format = babl_format ("cairo-ARGB32");
@ -145,7 +145,7 @@ print_surface_from_drawable (gint32 drawable_ID,
while (gegl_buffer_iterator_next (iter))
{
const guchar *src = iter->items[0].data;
guchar *dest = pixels + iter->items[0].roi.y * stride + iter->items[0].roi.x * 4;
guchar *dest = pixels + (guint64) iter->items[0].roi.y * stride + iter->items[0].roi.x * 4;
gint y;
for (y = 0; y < iter->items[0].roi.height; y++)
@ -156,10 +156,10 @@ print_surface_from_drawable (gint32 drawable_ID,
dest += stride;
}
done += iter->items[0].roi.height * iter->items[0].roi.width;
done += (guint64) iter->items[0].roi.height * iter->items[0].roi.width;
if (count++ % 16 == 0)
gimp_progress_update ((gdouble) done / (width * height));
gimp_progress_update ((gdouble) done / ((gdouble) width * height));
}
g_object_unref (buffer);