Changeset 11628 for ImageMagick/trunk

Timestamp:

07/14/08 07:32:22 (3 months ago)

Author:

anthony

Message:

 

Files:

• ImageMagick/trunk/magick/distort.c (modified) (11 diffs)

ImageMagick/trunk/magick/distort.c

@@ -395 +395 @@
         return((double *) NULL);
       }
-      number_coefficients = poly_number_terms(arguments[0]);
-      if ( number_coefficients == 0 )
+      i = poly_number_terms(arguments[0]);
+      number_coefficients = i*2 + 2;
+      if ( i == 0 )
       {
         (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
@@ -403 +404 @@
         return((double *) NULL);
       }
-      if ( number_arguments < number_coefficients*4+1)
+      if ( number_arguments < i*4+1)
       {
         (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
@@ -410 +411 @@
         return((double *) NULL);
       }
-      number_coefficients = number_coefficients*2+1;
       break;
     case ArcDistortion:
@@ -523 +523 @@
       /* Solve for LeastSquares Coefficients */
         status=GaussJordanElimination(matrix,vectors,3UL,2UL);
+        matrix = RelinquishMagickMatrix(matrix, 3UL);
         if ( status == MagickTrue ) {
           /* Affine is a bit weird in its ordering of coefficients.
@@ -539 +540 @@
           coefficients[5] = vectors[1][2]; /* ty */
         }
-        matrix = RelinquishMagickMatrix(matrix, 3UL);
         vectors = RelinquishMagickMatrix(vectors, 2UL);
         if ( status == MagickFalse ) {
@@ -812 +812 @@
     {
       /* Polynomial Distortion
-           c0 = number of terms in one polynomial equation
-
-            u = c1 + c1*x + c2*y + c3*x*y + ... + c8*x^3 + c9*y^3
+           c0 = Order of the polynimial being created
+           c1 = number of terms in one polynomial equation
+
+            u = c2 + c3*x + c4*y + c5*x*y + c6*x^2 + c7*y^2 + c8*x^3 + ...
             v = ....
 
@@ -835 +836 @@
         status;
 
-      nterms = coefficients[0] = poly_number_terms(arguments[0]);
+      coefficients[0] = arguments[0];
+      coefficients[1] = nterms = poly_number_terms(arguments[0]);
 
       terms = AcquireQuantumMemory(nterms, sizeof(*terms));
-      if (terms == (double *) NULL) {
+      matrix = AcquireMagickMatrix(nterms,nterms);
+      if (terms == (double *) NULL && matrix == (double **) NULL) {
+        terms = RelinquishMagickMemory(terms);
+        matrix = RelinquishMagickMatrix(matrix, nterms);
         coefficients = RelinquishMagickMemory(coefficients);
         (void) ThrowMagickException(exception,GetMagickModule(),
@@ -845 +850 @@
         return((double *) NULL);
       }
-      matrix = AcquireMagickMatrix(nterms,nterms);
-      if (matrix == (double **) NULL) {
-        terms = RelinquishMagickMemory(terms);
-        coefficients = RelinquishMagickMemory(coefficients);
-        (void) ThrowMagickException(exception,GetMagickModule(),
-                  ResourceLimitError,"MemoryAllocationFailed",
-                  "%s", "DistortCoefficients");
-        return((double *) NULL);
-      }
       /* fake a 2xN vectors matrix from rest of coefficients array */
-      vectors[0] = &(coefficients[1]);
-      vectors[1] = &(coefficients[nterms+1]);
+      vectors[0] = &(coefficients[2]);
+      vectors[1] = &(coefficients[2+nterms]);
       /* Add control points for least squares solving */
-      for (i=0; i < (long)number_arguments; i+=4) {
+      for (i=2; i < number_arguments; i+=4) {
         for (j=0; j < nterms; j++)
-          terms[j] = poly_term(j,arguments[i=2],arguments[i+3]);
+          terms[j] = poly_term(j,arguments[i+2],arguments[i+3]);
         LeastSquaresAddTerms(matrix,vectors,terms,&(arguments[i]),nterms,2UL);
       }
@@ -875 +871 @@
       }
       if ( GetImageArtifact(image,"distort:verbose") != (const char *) NULL ) {
-        fprintf(stderr, "Polynomial (%ld terms) Reverse Map\n", (long)nterms);
-        fprintf(stderr, "  -fx 'xx=");
+        fprintf(stderr, "Polynomial (order %lg, terms %lg) Reverse Map\n",
+             coefficients[0], coefficients[1]);
+        fprintf(stderr, "  -fx 'xx =");
         for (i=0; i<nterms; i++) {
-          if ( i != 0 && i%4 == 0 ) fprintf(stderr, "\n          ");
-          fprintf(stderr, " %lf%s", coefficients[i+1], poly_term_str(i));
-        }
-        fprintf(stderr, "\n       yy=");
+          if ( i != 0 && i%4 == 0 ) fprintf(stderr, "\n         ");
+          fprintf(stderr, " %+lf%s", coefficients[i+2], poly_term_str(i));
+        }
+        fprintf(stderr, ";\n       yy =");
         for (i=0; i<nterms; i++) {
-          if ( i != 0 && i%4 == 0 ) fprintf(stderr, "\n          ");
-          fprintf(stderr, " %lf%s", coefficients[i+1+nterms], poly_term_str(i));
-        }
-        fprintf(stderr, "\n       p{xx,yy}'\n");
+          if ( i != 0 && i%4 == 0 ) fprintf(stderr, "\n         ");
+          fprintf(stderr, " %+lf%s", coefficients[i+2+nterms], poly_term_str(i));
+        }
+        fprintf(stderr, ";\n       p{xx,yy}'\n");
       }
       return(coefficients);
@@ -1495 +1492 @@
           register long
             k;
+          long
+            nterms=(long)coefficients[1];
 
           double
@@ -1500 +1499 @@
 
           point.x=point.y=dudx=dudy=dvdx=dvdy=0.0;
-          for(k=0; k < (long)coefficients[0]; k++) {
-            point.x += poly_term(k,x,y)*coefficients[k+1];
-            dudx += poly_term_dx(k,x,y)*coefficients[k+1];
-            dudy += poly_term_dy(k,x,y)*coefficients[k+1];
-            point.y += poly_term(k,x,y)*coefficients[k+1+(long)coefficients[0]];
-            dvdx += poly_term_dx(k,x,y)*coefficients[k+1+(long)coefficients[0]];
-            dvdy += poly_term_dy(k,x,y)*coefficients[k+1+(long)coefficients[0]];
+          for(k=0; k < nterms; k++) {
+            point.x += poly_term(k,x,y)*coefficients[k+2];
+            dudx += poly_term_dx(k,x,y)*coefficients[k+2];
+            dudy += poly_term_dy(k,x,y)*coefficients[k+2];
+            point.y += poly_term(k,x,y)*coefficients[k+2+nterms];
+            dvdx += poly_term_dx(k,x,y)*coefficients[k+2+nterms];
+            dvdy += poly_term_dy(k,x,y)*coefficients[k+2+nterms];
           }
           ScaleResampleFilter( resample_filter[id], dudx,dudy,dvdx,dvdy );