Change hard coded limits of (32768, 32768) pixels for an image to a platform dependant size of (INT_MAX, INT_MAX)

nicolas-pascal · nicolas-pascal · commit 75595dabcf8f · 2014-09-02T17:06:16.000+02:00
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -2518,9 +2518,11 @@ Py::Object _backend_agg_module::new_renderer(const Py::Tuple &args,
     unsigned int height = (int)Py::Int(args[1]);
     double dpi = Py::Float(args[2]);
 
-    if (width > 1 << 15 || height > 1 << 15)
+    char msg [256];
+    if (width > INT_MAX || height > INT_MAX)
     {
-        throw Py::ValueError("width and height must each be below 32768");
+        sprintf(msg, "width and height must each be below %d", INT_MAX);
+        throw Py::ValueError(msg);
     }
 
     if (dpi <= 0.0)
diff --git a/src/_backend_agg.h b/src/_backend_agg.h
@@ -7,6 +7,7 @@
 #ifndef __BACKEND_AGG_H
 #define __BACKEND_AGG_H
 #include <utility>
+#include <climits>
 #include "CXX/Extensions.hxx"
 
 #include "agg_arrowhead.h"
diff --git a/src/_image.cpp b/src/_image.cpp
@@ -786,9 +786,11 @@ _image_module::from_images(const Py::Tuple& args)
     size_t numrows = (long)Py::Int(args[0]);
     size_t numcols = (long)Py::Int(args[1]);
 
-    if (numrows >= 32768 || numcols >= 32768)
+    char msg [256];
+    if (numrows >= INT_MAX || numcols >= INT_MAX)
     {
-        throw Py::RuntimeError("numrows and numcols must both be less than 32768");
+        sprintf(msg, "numrows and numcols must both be less than %d", INT_MAX);
+        throw Py::ValueError(msg);
     }
 
     Py::SeqBase<Py::Object> tups = args[2];
@@ -1268,9 +1270,11 @@ _image_module::frombuffer(const Py::Tuple& args)
     size_t x = (long)Py::Int(args[1]);
     size_t y = (long)Py::Int(args[2]);
 
-    if (x >= 32768 || y >= 32768)
+    char msg [256];
+    if (x >= INT_MAX || y >= INT_MAX)
     {
-        throw Py::ValueError("x and y must both be less than 32768");
+        sprintf(msg, "numrows and numcols must both be less than %d", INT_MAX);
+        throw Py::ValueError(msg);
     }
 
     int isoutput = Py::Int(args[3]);
@@ -1576,9 +1580,11 @@ _image_module::pcolor(const Py::Tuple& args)
     Py::Tuple bounds = args[5];
     unsigned int interpolation = (unsigned long)Py::Int(args[6]);
 
-    if (rows >= 32768 || cols >= 32768)
+    char msg [256];
+    if (rows >= INT_MAX || cols >= INT_MAX)
     {
-        throw Py::ValueError("rows and cols must both be less than 32768");
+        sprintf(msg, "rows and cols must both be less than %d", INT_MAX);
+        throw Py::ValueError(msg);
     }
 
     if (bounds.length() != 4)
@@ -1822,11 +1828,15 @@ _image_module::pcolor2(const Py::Tuple& args)
     Py::Tuple bounds = args[5];
     Py::Object bgp = args[6];
 
-    if (rows >= 32768 || cols >= 32768)
+    char msg [256];
+    if (rows >= INT_MAX || cols >= INT_MAX)
     {
-        throw Py::ValueError("rows and cols must both be less than 32768");
+        sprintf(msg, "rows and cols must both be less than %d", INT_MAX);
+        throw Py::ValueError(msg);
     }
 
+
+
     if (bounds.length() != 4)
     {
         throw Py::TypeError("Incorrect number of bounds (4 expected)");
diff --git a/src/_image.h b/src/_image.h
@@ -7,6 +7,7 @@
 #ifndef _IMAGE_H
 #define _IMAGE_H
 #include <utility>
+#include <climits>
 #include "Python.h"
 
 #include "agg_trans_affine.h"

Original file line number	Diff line number	Diff line change
`@@ -2518,9 +2518,11 @@ Py::Object _backend_agg_module::new_renderer(const Py::Tuple &args,`
`2518`	`2518`	`unsigned int height = (int)Py::Int(args[1]);`
`2519`	`2519`	`double dpi = Py::Float(args[2]);`
`2520`	`2520`
`2521`		`- if (width > 1 << 15 \|\| height > 1 << 15)`
	`2521`	`+ char msg [256];`
	`2522`	`+ if (width > INT_MAX \|\| height > INT_MAX)`
`2522`	`2523`	`{`
`2523`		`- throw Py::ValueError("width and height must each be below 32768");`
	`2524`	`+ sprintf(msg, "width and height must each be below %d", INT_MAX);`
	`2525`	`+ throw Py::ValueError(msg);`
`2524`	`2526`	`}`
`2525`	`2527`
`2526`	`2528`	`if (dpi <= 0.0)`
Original file line number	Diff line number	Diff line change
`@@ -786,9 +786,11 @@ _image_module::from_images(const Py::Tuple& args)`
`786`	`786`	`size_t numrows = (long)Py::Int(args[0]);`
`787`	`787`	`size_t numcols = (long)Py::Int(args[1]);`
`788`	`788`
`789`		`- if (numrows >= 32768 \|\| numcols >= 32768)`
	`789`	`+ char msg [256];`
	`790`	`+ if (numrows >= INT_MAX \|\| numcols >= INT_MAX)`
`790`	`791`	`{`
`791`		`- throw Py::RuntimeError("numrows and numcols must both be less than 32768");`
	`792`	`+ sprintf(msg, "numrows and numcols must both be less than %d", INT_MAX);`
	`793`	`+ throw Py::ValueError(msg);`
`792`	`794`	`}`
`793`	`795`
`794`	`796`	`Py::SeqBase<Py::Object> tups = args[2];`
`@@ -1268,9 +1270,11 @@ _image_module::frombuffer(const Py::Tuple& args)`
`1268`	`1270`	`size_t x = (long)Py::Int(args[1]);`
`1269`	`1271`	`size_t y = (long)Py::Int(args[2]);`
`1270`	`1272`
`1271`		`- if (x >= 32768 \|\| y >= 32768)`
	`1273`	`+ char msg [256];`
	`1274`	`+ if (x >= INT_MAX \|\| y >= INT_MAX)`
`1272`	`1275`	`{`
`1273`		`- throw Py::ValueError("x and y must both be less than 32768");`
	`1276`	`+ sprintf(msg, "numrows and numcols must both be less than %d", INT_MAX);`
	`1277`	`+ throw Py::ValueError(msg);`
`1274`	`1278`	`}`
`1275`	`1279`
`1276`	`1280`	`int isoutput = Py::Int(args[3]);`
`@@ -1576,9 +1580,11 @@ _image_module::pcolor(const Py::Tuple& args)`
`1576`	`1580`	`Py::Tuple bounds = args[5];`
`1577`	`1581`	`unsigned int interpolation = (unsigned long)Py::Int(args[6]);`
`1578`	`1582`
`1579`		`- if (rows >= 32768 \|\| cols >= 32768)`
	`1583`	`+ char msg [256];`
	`1584`	`+ if (rows >= INT_MAX \|\| cols >= INT_MAX)`
`1580`	`1585`	`{`
`1581`		`- throw Py::ValueError("rows and cols must both be less than 32768");`
	`1586`	`+ sprintf(msg, "rows and cols must both be less than %d", INT_MAX);`
	`1587`	`+ throw Py::ValueError(msg);`
`1582`	`1588`	`}`
`1583`	`1589`
`1584`	`1590`	`if (bounds.length() != 4)`
`@@ -1822,11 +1828,15 @@ _image_module::pcolor2(const Py::Tuple& args)`
`1822`	`1828`	`Py::Tuple bounds = args[5];`
`1823`	`1829`	`Py::Object bgp = args[6];`
`1824`	`1830`
`1825`		`- if (rows >= 32768 \|\| cols >= 32768)`
	`1831`	`+ char msg [256];`
	`1832`	`+ if (rows >= INT_MAX \|\| cols >= INT_MAX)`
`1826`	`1833`	`{`
`1827`		`- throw Py::ValueError("rows and cols must both be less than 32768");`
	`1834`	`+ sprintf(msg, "rows and cols must both be less than %d", INT_MAX);`
	`1835`	`+ throw Py::ValueError(msg);`
`1828`	`1836`	`}`
`1829`	`1837`
	`1838`	`+`
	`1839`	`+`
`1830`	`1840`	`if (bounds.length() != 4)`
`1831`	`1841`	`{`
`1832`	`1842`	`throw Py::TypeError("Incorrect number of bounds (4 expected)");`