Release 10.64.05

git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2060 9d0c8265-081b-0410-96cb-a4ca84ce46f8

1 files changed, 18 insertions, 0 deletions

diff --git a/generator/ppmpat.c b/generator/ppmpat.c
index 2e8092b3..fe1a1d27 100644
--- a/generator/ppmpat.c
+++ b/generator/ppmpat.c
@@ -877,6 +877,19 @@ static ppmd_point sq_offs[SQ_MAXCIRCLE_POINTS];
 
 
 
+static void
+validateSquigAspect(unsigned int const cols,
+                    unsigned int const rows) {
+
+    if (cols / rows >= 25 || rows / cols >= 25)
+        pm_error("Image too narrow.  Aspect ratio: %u/%u=%f "
+                 "is outside accepted range: 0.04 - 25.0",
+                 cols, rows, (float)cols/rows ); 
+
+}
+
+
+
 static ppmd_point
 vectorSum(ppmd_point const a,
           ppmd_point const b) {
@@ -1081,6 +1094,8 @@ squig(pixel **     const pixels,
       pixval       const maxval) {
 
     int i;
+
+    validateSquigAspect(cols, rows);
     
     clearImageToBlack(pixels, cols, rows, maxval);
 
@@ -1106,6 +1121,9 @@ squig(pixel **     const pixels,
             unsigned int j;
 
             for (j = 1; j < SQ_POINTS - 1; ++j) {
+              /* validateSquigAspect() assures that
+                 cols - 2 * radius, rows -2 * radius are positive
+              */
                 c[j].x = (rand() % (cols - 2 * radius)) + radius;
                 c[j].y = (rand() % (rows - 2 * radius)) + radius;
             }