From: anthony <anthony@git.imagemagick.org>
Date: Fri, 8 Oct 2010 04:44:56 +0000 (+0000)
Subject: Make verbose reports, report once only!
X-Git-Tag: 7.0.1-0~8725
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72949796e01f8b94a0976e74cb8eb3f86af280ea;p=imagemagick

Make verbose reports, report once only!
---

diff --git a/magick/resample.c b/magick/resample.c
index b6e020c7f..d41f94022 100644
--- a/magick/resample.c
+++ b/magick/resample.c
@@ -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;
 }
 
diff --git a/magick/resize.c b/magick/resize.c
index 981d8093b..096c0647c 100644
--- a/magick/resize.c
+++ b/magick/resize.c
@@ -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