Changeset 11627 for ImageMagick/trunk

Timestamp:

07/13/08 22:55:01 (7 weeks ago)

Author:

anthony

Message:

 

Files:

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

ImageMagick/trunk/magick/distort.c

@@ -270 +270 @@
   switch(n) {
     case  0:  return(""); /* constant */
-    case  1:  return("*xx");
-    case  2:  return("*yy"); /* affine      order = 1   terms = 3 */
-    case  3:  return("*xx*yy"); /* bilinear    order = 1.5 terms = 4 */
-    case  4:  return("*xx*xx");
-    case  5:  return("*yy*yy"); /* quadratic   order = 2   terms = 6 */
-    case  6:  return("*xx*xx*xx");
-    case  7:  return("*xx*xx*yy");
-    case  8:  return("*xx*yy*yy");
-    case  9:  return("*yy*yy*yy"); /* cubic       order = 3   terms = 10 */
-    case 10:  return("*xx*xx*xx*xx");
-    case 11:  return("*xx*xx*xx*yy");
-    case 12:  return("*xx*xx*yy*yy");
-    case 13:  return("*xx*yy*yy*yy");
-    case 14:  return("*yy*yy*yy*yy"); /* quartic     order = 4   terms = 15 */
-    case 15:  return("*xx*xx*xx*xx*xx");
-    case 16:  return("*xx*xx*xx*xx*yy");
-    case 17:  return("*xx*xx*xx*yy*yy");
-    case 18:  return("*xx*xx*yy*yy*yy");
-    case 19:  return("*xx*yy*yy*yy*yy");
-    case 20:  return("*yy*yy*yy*yy*yy"); /* quintic     order = 5   terms = 21 */
+    case  1:  return("*i");
+    case  2:  return("*j"); /* affine      order = 1   terms = 3 */
+    case  3:  return("*i*j"); /* bilinear    order = 1.5 terms = 4 */
+    case  4:  return("*i*i");
+    case  5:  return("*j*j"); /* quadratic   order = 2   terms = 6 */
+    case  6:  return("*i*i*i");
+    case  7:  return("*i*i*j");
+    case  8:  return("*i*j*j");
+    case  9:  return("*j*j*j"); /* cubic       order = 3   terms = 10 */
+    case 10:  return("*i*i*i*i");
+    case 11:  return("*i*i*i*j");
+    case 12:  return("*i*i*j*j");
+    case 13:  return("*i*j*j*j");
+    case 14:  return("*j*j*j*j"); /* quartic     order = 4   terms = 15 */
+    case 15:  return("*i*i*i*i*i");
+    case 16:  return("*i*i*i*i*j");
+    case 17:  return("*i*i*i*j*j");
+    case 18:  return("*i*i*j*j*j");
+    case 19:  return("*i*j*j*j*j");
+    case 20:  return("*j*j*j*j*j"); /* quintic     order = 5   terms = 21 */
   }
   return( "UNKNOWN" ); /* should never happen */
@@ -565 +565 @@
             coefficients[1], coefficients[3], coefficients[5]);
         fprintf(stderr, "Affine Forward Map\n");
-        fprintf(stderr, "  -distort AffineProjection \\\n  '");
+        fprintf(stderr, "  -distort AffineProjection \\\n      '");
         for (i=0; i<5; i++)
           fprintf(stderr, "%lg,", inverse[i]);
@@ -595 +595 @@
         fprintf(stderr, "       yy=%+lf*i %+lf*j %+lf; p{xx,yy}'\n",
             coefficients[1], coefficients[3], coefficients[5]);
+        /* No AffineProjection output, as that is what was given! */
       }
       return(coefficients);
@@ -857 +858 @@
       vectors[1] = &(coefficients[nterms+1]);
       /* Add control points for least squares solving */
-      for (i=2; i < (long) number_arguments; i+=4) {
+      for (i=0; i < (long)number_arguments; i+=4) {
         for (j=0; j < nterms; j++)
-          terms[j] = poly_term(j,arguments[i],arguments[i+1]);
+          terms[j] = poly_term(j,arguments[i=2],arguments[i+3]);
         LeastSquaresAddTerms(matrix,vectors,terms,&(arguments[i]),nterms,2UL);
       }
@@ -980 +981 @@
         return((double *) NULL);
       }
+      /* Save the given arguments as an affine distortion */
+      *method = AffineDistortion;
       a=DegreesToRadians(a);
       cosine=cos(a);
@@ -1000 +1003 @@
         }
         InvertAffineCoefficients(coefficients, inverse);
-        fprintf(stderr, "Affine ReverseMap\n");
-        for (i=0; i<6; i++)
-          fprintf(stderr, "  %lf\n", coefficients[i]);
-        fprintf(stderr, "AffineProjection\n");
-        for (i=0; i<6; i++)
-          fprintf(stderr, "  %lf\n", inverse[i]);
-      }
-      if ( GetImageArtifact(image,"distort:verbose") != (const char *) NULL ) {
-        double *inverse = AcquireQuantumMemory(8,sizeof(coefficients[i]));
-        if (inverse == (double *) NULL) {
-          coefficients = RelinquishMagickMemory(coefficients);
-          (void) ThrowMagickException(exception,GetMagickModule(),
-                  ResourceLimitError,"MemoryAllocationFailed",
-                  "%s", "DistortCoefficients");
-          return((double *) NULL);
-        }
-        InvertAffineCoefficients(coefficients, inverse);
         fprintf(stderr, "Affine Reverse Map\n");
         fprintf(stderr, "  -fx 'xx=%+lf*i %+lf*j %+lf;\n",
@@ -1023 +1009 @@
             coefficients[1], coefficients[3], coefficients[5]);
         fprintf(stderr, "Affine Forward Map\n");
-        fprintf(stderr, "  -distort AffineProjection \\\n  '");
+        fprintf(stderr, "  -distort AffineProjection \\\n      '");
         for (i=0; i<5; i++)
           fprintf(stderr, "%lg,", inverse[i]);
@@ -1514 +1500 @@
 
           point.x=point.y=dudx=dudy=dvdx=dvdy=0.0;
-          for(k=0; k < coefficients[0]; k++) {
+          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];
@@ -1540 +1526 @@
             ScaleResampleFilter( resample_filter[id],
                 coefficients[1]/(2*MagickPI)/point.y, 0, 0, coefficients[3] );
+              //coefficients[1]*2*MagickPI/point.y, 0, 0, coefficients[3] );
           else
             ScaleResampleFilter( resample_filter[id],