Merge pull request #19210 from pkgw/fix-gigapixel-agg

tacaswell · web-flow · commit 68ef27dec2b1 · 2021-01-05T17:38:08.000-05:00
FIX: creation of AGG images bigger than 1024**3 pixels
diff --git a/extern/agg24-svn/include/agg_rasterizer_cells_aa.h b/extern/agg24-svn/include/agg_rasterizer_cells_aa.h
@@ -329,6 +329,7 @@ namespace agg
             int cy = (y1 + y2) >> 1;
             line(x1, y1, cx, cy);
             line(cx, cy, x2, y2);
+            return;
         }
 
         int dy = y2 - y1;
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -29,7 +29,7 @@ RendererAgg::RendererAgg(unsigned int width, unsigned int height, double dpi)
     : width(width),
       height(height),
       dpi(dpi),
-      NUMBYTES(width * height * 4),
+      NUMBYTES((size_t)width * (size_t)height * 4),
       pixBuffer(NULL),
       renderingBuffer(),
       alphaBuffer(NULL),
diff --git a/src/_backend_agg_wrapper.cpp b/src/_backend_agg_wrapper.cpp
@@ -95,7 +95,7 @@ int PyBufferRegion_get_buffer(PyBufferRegion *self, Py_buffer *buf, int flags)
     Py_INCREF(self);
     buf->obj = (PyObject *)self;
     buf->buf = self->x->get_data();
-    buf->len = self->x->get_width() * self->x->get_height() * 4;
+    buf->len = (Py_ssize_t)self->x->get_width() * (Py_ssize_t)self->x->get_height() * 4;
     buf->readonly = 0;
     buf->format = (char *)"B";
     buf->ndim = 3;
@@ -531,7 +531,7 @@ int PyRendererAgg_get_buffer(PyRendererAgg *self, Py_buffer *buf, int flags)
     Py_INCREF(self);
     buf->obj = (PyObject *)self;
     buf->buf = self->x->pixBuffer;
-    buf->len = self->x->get_width() * self->x->get_height() * 4;
+    buf->len = (Py_ssize_t)self->x->get_width() * (Py_ssize_t)self->x->get_height() * 4;
     buf->readonly = 0;
     buf->format = (char *)"B";
     buf->ndim = 3;

Original file line number	Diff line number	Diff line change
`@@ -329,6 +329,7 @@ namespace agg`
`329`	`329`	`int cy = (y1 + y2) >> 1;`
`330`	`330`	`line(x1, y1, cx, cy);`
`331`	`331`	`line(cx, cy, x2, y2);`
	`332`	`+ return;`
`332`	`333`	`}`
`333`	`334`
`334`	`335`	`int dy = y2 - y1;`