Changeset 86

Timestamp:

09/12/09 09:04:05 (6 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/trunk

Files:

• PerlMagick/t/filter.t (modified) (7 diffs)
• coders/cut.c (modified) (3 diffs)
• magick/resize.c (modified) (1 diff)
• magick/segment.c (modified) (1 diff)

ImageMagick/trunk/PerlMagick/t/filter.t

@@ -76 +76 @@
 ++$test;
 
-testFilterCompare('input.miff',  q//, 'reference/filter/Edge.miff', 'Edge', q//, 0.2, 1.02);
-++$test;
-
-testFilterCompare('input.miff',  q//, 'reference/filter/Emboss.miff', 'Emboss', q/'0x1'/, 0.002, 0.2);
-++$test;
-
-testFilterCompare('input.miff',  q//, 'reference/filter/Equalize.miff', 'Equalize', q//, 0.002, 0.02);
+testFilterCompare('input.miff',  q//, 'reference/filter/Edge.miff', 'Edge', q//, 0.3, 1.03);
+++$test;
+
+testFilterCompare('input.miff',  q//, 'reference/filter/Emboss.miff', 'Emboss', q/'0x1'/, 0.2, 1.02);
+++$test;
+
+testFilterCompare('input.miff',  q//, 'reference/filter/Equalize.miff', 'Equalize', q//, 0.03, 1.03);
 ++$test;
 
@@ -106 +106 @@
 ++$test;
 
-testFilterCompare('input.miff',  q//, 'reference/filter/Level.miff', 'Level', q/'20%'/, 0.002, 0.02);
+testFilterCompare('input.miff',  q//, 'reference/filter/Level.miff', 'Level', q/'20%'/, 0.2, 1.02);
 ++$test;
 
@@ -121 +121 @@
 ++$test;
 
-testFilterCompare('input.miff',  q//, 'reference/filter/Modulate.miff', 'Modulate', q/brightness=>110,saturation=>110,hue=>110/, 0.005, 0.5);
+testFilterCompare('input.miff',  q//, 'reference/filter/Modulate.miff', 'Modulate', q/brightness=>110,saturation=>110,hue=>110/, 0.08, 1.08);
 ++$test;
 
@@ -133 +133 @@
 ++$test;
 
-testFilterCompare('input.miff',  q//, 'reference/filter/Normalize.miff', 'Normalize', q//, 0.004, 0.04);
-++$test;
-
-testFilterCompare('input.miff',  q//, 'reference/filter/OilPaint.miff', 'OilPaint', q//, 0.02, 1.02);
+testFilterCompare('input.miff',  q//, 'reference/filter/Normalize.miff', 'Normalize', q//, 0.04, 1.04);
+++$test;
+
+testFilterCompare('input.miff',  q//, 'reference/filter/OilPaint.miff', 'OilPaint', q//, 0.03, 1.03);
 ++$test;
 
@@ -154 +154 @@
 ++$test;
 
-testFilterCompare('input.miff',  q//, 'reference/filter/Resize.miff', 'Resize', q/'60%'/, 0.007, 0.07);
+testFilterCompare('input.miff',  q//, 'reference/filter/Resize.miff', 'Resize', q/'60%'/, 0.02, 1.02);
 ++$test;
 
@@ -175 +175 @@
 ++$test;
 
-testFilterCompare('input.miff',  q//, 'reference/filter/Sharpen.miff', 'Sharpen', q/'0.0x1.0'/, 0.02, 0.2);
+testFilterCompare('input.miff',  q//, 'reference/filter/Sharpen.miff', 'Sharpen', q/'0.0x1.0'/, 0.05, 1.05);
 ++$test;
 
@@ -199 +199 @@
 ++$test;
 
-testFilterCompare('input.miff',  q//, 'reference/filter/UnsharpMask.miff', 'UnsharpMask', q/'0.0x1.0'/, 0.002, 0.06);
-++$test;
-
-testFilterCompare('input.miff',  q//, 'reference/filter/Wave.miff', 'Wave', q/'25x150'/, 0.4, 1.04);
+testFilterCompare('input.miff',  q//, 'reference/filter/UnsharpMask.miff', 'UnsharpMask', q/'0.0x1.0'/, 0.02, 1.02);
+++$test;
+
+testFilterCompare('input.miff',  q//, 'reference/filter/Wave.miff', 'Wave', q/'25x150'/, 0.6, 1.06);
 ++$test;
 

ImageMagick/trunk/coders/cut.c

@@ -481 +481 @@
             }
           image->colormap[i].red=(Quantum) ReadBlobLSBShort(palette);
-          if(QuantumRange!=(Quantum) PalHeader.MaxRed)
+          if (QuantumRange != (Quantum) PalHeader.MaxRed)
             {
               image->colormap[i].red=RoundToQuantum(((double)
@@ -488 +488 @@
             }
           image->colormap[i].green=(Quantum) ReadBlobLSBShort(palette);
-          if(QuantumRange!=(Quantum) PalHeader.MaxGreen)
+          if (QuantumRange != (Quantum) PalHeader.MaxGreen)
             {
               image->colormap[i].green=RoundToQuantum
@@ -494 +494 @@
             }
           image->colormap[i].blue=(Quantum) ReadBlobLSBShort(palette);
-          if(QuantumRange!=(Quantum) PalHeader.MaxBlue)
+          if (QuantumRange != (Quantum) PalHeader.MaxBlue)
             {
               image->colormap[i].blue=RoundToQuantum

ImageMagick/trunk/magick/resize.c

@@ -748 +748 @@
       (void) printf("# support = %lg\n",support);
       for (x=0.0; x <= support; x+=0.01f)
-        (void) printf("%5.2lf\t%lf\n",x,GetResizeFilterWeight(resize_filter,x));
+        (void) printf("%5.2lf\t%lf\n",x,(double) GetResizeFilterWeight(
+          resize_filter,x));
       (void) printf("%5.2lf\t%lf\n",support,0.0);
     }

ImageMagick/trunk/magick/segment.c

@@ -445 +445 @@
       (void) fprintf(stdout,"Fuzzy C-means Statistics\n");
       (void) fprintf(stdout,"===================\n\n");
-      (void) fprintf(stdout,"\tCluster Threshold = %g\n",cluster_threshold);
-      (void) fprintf(stdout,"\tWeighting Exponent = %g\n",weighting_exponent);
+      (void) fprintf(stdout,"\tCluster Threshold = %g\n",(double)
+        cluster_threshold);
+      (void) fprintf(stdout,"\tWeighting Exponent = %g\n",(double)
+        weighting_exponent);
       (void) fprintf(stdout,"\tTotal Number of Clusters = %lu\n\n",
         number_clusters);