]> granicus.if.org Git - imagemagick/commitdiff
Make verbose reports, report once only!
authoranthony <anthony@git.imagemagick.org>
Fri, 8 Oct 2010 04:44:56 +0000 (04:44 +0000)
committeranthony <anthony@git.imagemagick.org>
Fri, 8 Oct 2010 04:44:56 +0000 (04:44 +0000)
magick/resample.c
magick/resize.c

index b6e020c7f26cda6007073d21c085e7e0a869d012..d41f94022b2e902ae0d2ee624165b90b96eafd58 100644 (file)
@@ -214,8 +214,10 @@ MagickExport ResampleFilter *AcquireResampleFilter(const Image *image,
   /* initialise the resampling filter settings */
   SetResampleFilter(resample_filter, resample_filter->image->filter,
     resample_filter->image->blur);
-  resample_filter->interpolate = resample_filter->image->interpolate;
-  resample_filter->virtual_pixel=GetImageVirtualPixelMethod(image);
+  SetResampleFilterInterpolateMethod(resample_filter,
+    resample_filter->image->interpolate);
+  SetResampleFilterVirtualPixelMethod(resample_filter,
+    GetImageVirtualPixelMethod(image));
 
   return(resample_filter);
 }
@@ -1830,7 +1832,8 @@ MagickExport void SetResampleFilter(ResampleFilter *resample_filter,
 #endif
 
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  /* if( GetOpenMPThreadId() == 0 ) */
+  #pragma omp single
+  {
 #endif
     if (GetImageArtifact(resample_filter->image,"resample:verbose")
           != (const char *) NULL)
@@ -1851,6 +1854,11 @@ MagickExport void SetResampleFilter(ResampleFilter *resample_filter,
                GetMagickPrecision(),sqrt((double)Q)*r_scale,
                GetMagickPrecision(),resample_filter->filter_lut[Q] );
       }
+    /* output the above once only for each image, and each setting */
+    (void) DeleteImageArtifact(resample_filter->image,"resample:verbose");
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+  }
+#endif
   return;
 }
 \f
index 981d8093bb90f6c1f7cdcd462e018a1edc0b09a0..096c0647c83f5ed2fa8576b690b6a4aa69289ed4 100644 (file)
@@ -1051,7 +1051,8 @@ MagickExport ResizeFilter *AcquireResizeFilter(const Image *image,
     Expert Option Request for verbose details of the resulting filter.
   */
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  if( GetOpenMPThreadId() == 0 ) {
+  #pragma omp single
+  {
 #endif
     artifact=GetImageArtifact(image,"filter:verbose");
     if (artifact != (const char *) NULL)
@@ -1103,6 +1104,8 @@ MagickExport ResizeFilter *AcquireResizeFilter(const Image *image,
         (void) fprintf(stdout,"%5.2lf\t%.*g\n",support,GetMagickPrecision(),
           0.0);
       }
+      /* output the above once only for each image, and each setting */
+      (void) DeleteImageArtifact(image,"filter:verbose");
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
     }
 #endif