Changeset 534 for ImageMagick/trunk

Timestamp:

11/03/09 23:28:07 (3 weeks ago)

Author:

anthony

Message:

Bug fixes for polynomial distort

Location:

ImageMagick/trunk

Files:

• ChangeLog (modified) (1 diff)
• magick/distort.c (modified) (5 diffs)

ImageMagick/trunk/ChangeLog

@@ +1 @@
+2009-11-04  6.5.7-5 Anthony Thyssen <A.Thyssen@griffith...>
+  * Bug Fix for Polynomial distortion. which is now working.
+
 2009-11-01  6.5.7-4 Cristy  <quetzlzacatenango@image...>
   * Use -define delegate:bimodal=true to activate any bimodal delegates.

ImageMagick/trunk/magick/distort.c

@@ -349 +349 @@
     fall back to Affine distortion (allowing 0 to 3 point pairs)
   */
-  if ( number_arguments < 4*cp_size &&
+  if ( number_arguments < 4*cp_size && 
        (  *method == BilinearForwardDistortion
        || *method == BilinearReverseDistortion
@@ -376 +376 @@
         (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
                    "InvalidArgument","%s : '%s'","Polynomial",
-                   "Invalid order, should be 1 to 5, or 1.5");
+                   "Invalid order, should be interger 1 to 5, or 1.5");
         return((double *) NULL);
       }
@@ -733 +733 @@
         status;
 
+      if ( number_arguments%cp_size != 0 ||
+           number_arguments < cp_size*4 ) {
+        (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+               "InvalidArgument", "%s : 'require at least %ld CPs'",
+               "Perspective", 4L);
+        coeff=(double *) RelinquishMagickMemory(coeff);
+        return((double *) NULL);
+      }
       /* fake 1x8 vectors matrix directly using the coefficients array */
       vectors[0] = &(coeff[0]);
@@ -840 +848 @@
         status;
 
+      /* check the number of arguments */
+      if ( number_arguments%cp_size != 0 ||
+           number_arguments < cp_size*4 ) {
+        (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+               "InvalidArgument", "%s : 'require at least %ld CPs'",
+               *method == BilinearForwardDistortion ? "BilinearForward" :
+               "BilinearReverse", 4L);
+        coeff=(double *) RelinquishMagickMemory(coeff);
+        return((double *) NULL);
+      }
       /* create matrix, and a fake vectors matrix */
       matrix = AcquireMagickMatrix(4UL,4UL);
@@ -1003 +1021 @@
         vectors[i] = &(coeff[2+i*nterms]);
       /* Add given control point pairs for least squares solving */
-      for (i=0; i < number_arguments; i+=cp_size) {
+      for (i=1; i < number_arguments; i+=cp_size) { /* NB: start = 1 not 0 */
         for (j=0; j < (long) nterms; j++)
           terms[j] = poly_basis_fn(j,arguments[i+cp_x],arguments[i+cp_y]);