Changeset 505 for ImageMagick/trunk

Timestamp:

10/28/09 10:18:47 (4 weeks ago)

Author:

cristy

Message:

 

Files:

• ImageMagick/trunk/wand/mogrify.c (modified) (3 diffs)

ImageMagick/trunk/wand/mogrify.c

@@ -111 +111 @@
     user_time;
 
-  long
-    j;
-
   MagickBooleanType
     concurrent,
@@ -150 +147 @@
   }
   timer=AcquireTimerInfo();
-  if (concurrent != MagickFalse)
-    SetOpenMPNested(1);
-  # pragma omp parallel for shared(status)
-  for (i=0; i < (long) (concurrent != MagickFalse ? iterations : 1); i++)
-  {
-    if (status == MagickFalse)
-      continue;
-    if (duration > 0)
+  if (concurrent == MagickFalse)
+    {
+      for (i=0; i < (long) iterations; i++)
       {
-        if (GetElapsedTime(timer) > duration)
+        if (status == MagickFalse)
           continue;
-        (void) ContinueTimer(timer);
-      }
-    for (j=0; j < (long) (concurrent == MagickFalse ? iterations : 1); j++)
-    {
-      if (status == MagickFalse)
-        break;
-      if (duration > 0)
-        {
-          if (GetElapsedTime(timer) > duration)
-            break;
-          (void) ContinueTimer(timer);
-        }
-      status=command(image_info,argc,argv,metadata,exception);
-      # pragma omp critical (MagickCore_Launch_Command)
-      {
+        if (duration > 0)
+          {
+            if (GetElapsedTime(timer) > duration)
+              continue;
+            (void) ContinueTimer(timer);
+          }
+        status=command(image_info,argc,argv,metadata,exception);
         if (exception->severity != UndefinedException)
           {
@@ -191 +175 @@
       }
     }
-  }
+  else
+    {
+      SetOpenMPNested(1);
+#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)
+  # pragma omp parallel for shared(status)
+#endif
+      for (i=0; i < (long) iterations; i++)
+      {
+        if (status == MagickFalse)
+          continue;
+        if (duration > 0)
+          {
+            if (GetElapsedTime(timer) > duration)
+              continue;
+            (void) ContinueTimer(timer);
+          }
+        status=command(image_info,argc,argv,metadata,exception);
+#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)
+  # pragma omp critical (MagickCore_Launch_Command)
+#endif
+        {
+          if (exception->severity != UndefinedException)
+            {
+              if ((exception->severity > ErrorException) ||
+                  (regard_warnings != MagickFalse))
+                status=MagickTrue;
+              CatchException(exception);
+            }
+          if ((metadata != (char **) NULL) && (*metadata != (char *) NULL))
+            {
+              (void) fputs(*metadata,stdout);
+              (void) fputc('\n',stdout);
+              *metadata=DestroyString(*metadata);
+            }
+        }
+      }
+    }
   if (iterations > 1)
     {