X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=MagickWand%2Fwand-view.c;h=1cbf6ee7d830f11e9bc519663b4b40a9974181f4;hb=de984cdc3631106b1cbbb8d3972b76a0fc27e8e8;hp=96a8a5a5a1a6275f6b85e9280fda6cc6a315a1e4;hpb=4bc52025ac134838f6a62b8dc8ea6cfacab91796;p=imagemagick

diff --git a/MagickWand/wand-view.c b/MagickWand/wand-view.c
index 96a8a5a5a..1cbf6ee7d 100644
--- a/MagickWand/wand-view.c
+++ b/MagickWand/wand-view.c
@@ -18,11 +18,11 @@
 %                        MagickWand Wand View Methods                         %
 %                                                                             %
 %                              Software Design                                %
-%                                John Cristy                                  %
+%                                   Cristy                                    %
 %                                March 2003                                   %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization      %
 %  dedicated to making software imaging solutions freely available.           %
 %                                                                             %
 %  You may not use this file except in compliance with the License.  You may  %
@@ -271,8 +271,7 @@ WandExport MagickBooleanType DuplexTransferWandViewIterator(WandView *source,
 
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   size_t
-    height,
-    width;
+    height;
 #endif
 
   ssize_t
@@ -292,9 +291,8 @@ WandExport MagickBooleanType DuplexTransferWandViewIterator(WandView *source,
   progress=0;
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   height=source->extent.height-source->extent.y;
-  width=source->extent.width-source->extent.x;
-  #pragma omp parallel for schedule(static) shared(progress,status) \
-    dynamic_number_threads(source_image,width,height,1)
+  #pragma omp parallel for schedule(static,4) shared(progress,status) \
+    magick_threads(source_image,destination_image,height,1)
 #endif
   for (y=source->extent.y; y < (ssize_t) source->extent.height; y++)
   {
@@ -531,8 +529,7 @@ WandExport MagickBooleanType GetWandViewIterator(WandView *source,
 
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   size_t
-    height,
-    width;
+    height;
 #endif
 
   ssize_t
@@ -547,9 +544,8 @@ WandExport MagickBooleanType GetWandViewIterator(WandView *source,
   progress=0;
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   height=source->extent.height-source->extent.y;
-  width=source->extent.width-source->extent.x;
-  #pragma omp parallel for schedule(static) shared(progress,status) \
-    dynamic_number_threads(source_image,width,height,1)
+  #pragma omp parallel for schedule(static,4) shared(progress,status) \
+    magick_threads(source_image,source_image,height,1)
 #endif
   for (y=source->extent.y; y < (ssize_t) source->extent.height; y++)
   {
@@ -765,7 +761,7 @@ WandExport WandView *NewWandView(MagickWand *wand)
   wand_view->description=ConstantString("WandView");
   wand_view->wand=wand;
   exception=AcquireExceptionInfo();
-  wand_view->view=AcquireVirtualCacheView(wand_view->wand->images);
+  wand_view->view=AcquireVirtualCacheView(wand_view->wand->images,exception);
   wand_view->extent.width=wand->images->columns;
   wand_view->extent.height=wand->images->rows;
   wand_view->pixel_wands=AcquirePixelsThreadSet(wand_view->extent.width);
@@ -826,7 +822,7 @@ WandExport WandView *NewWandViewExtent(MagickWand *wand,const ssize_t x,
     WandViewId,(double) wand_view->id);
   wand_view->description=ConstantString("WandView");
   exception=AcquireExceptionInfo();
-  wand_view->view=AcquireVirtualCacheView(wand_view->wand->images);
+  wand_view->view=AcquireVirtualCacheView(wand_view->wand->images,exception);
   wand_view->wand=wand;
   wand_view->extent.width=width;
   wand_view->extent.height=height;
@@ -932,8 +928,7 @@ WandExport MagickBooleanType SetWandViewIterator(WandView *destination,
 
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   size_t
-    height,
-    width;
+    height;
 #endif
 
   ssize_t
@@ -952,9 +947,8 @@ WandExport MagickBooleanType SetWandViewIterator(WandView *destination,
   progress=0;
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   height=destination->extent.height-destination->extent.y;
-  width=destination->extent.width-destination->extent.x;
-  #pragma omp parallel for schedule(static) shared(progress,status) \
-    dynamic_number_threads(destination_image,width,height,1)
+  #pragma omp parallel for schedule(static,4) shared(progress,status) \
+    magick_threads(destination_image,destination_image,height,1)
 #endif
   for (y=destination->extent.y; y < (ssize_t) destination->extent.height; y++)
   {
@@ -1070,8 +1064,7 @@ WandExport MagickBooleanType TransferWandViewIterator(WandView *source,
 
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   size_t
-    height,
-    width;
+    height;
 #endif
 
   ssize_t
@@ -1091,9 +1084,8 @@ WandExport MagickBooleanType TransferWandViewIterator(WandView *source,
   progress=0;
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   height=source->extent.height-source->extent.y;
-  width=source->extent.width-source->extent.x;
-  #pragma omp parallel for schedule(static) shared(progress,status) \
-    dynamic_number_threads(source_image,width,height,1)
+  #pragma omp parallel for schedule(static,4) shared(progress,status) \
+    magick_threads(source_image,destination_image,height,1)
 #endif
   for (y=source->extent.y; y < (ssize_t) source->extent.height; y++)
   {
@@ -1228,8 +1220,7 @@ WandExport MagickBooleanType UpdateWandViewIterator(WandView *source,
 
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   size_t
-    height,
-    width;
+    height;
 #endif
 
   ssize_t
@@ -1247,9 +1238,8 @@ WandExport MagickBooleanType UpdateWandViewIterator(WandView *source,
   progress=0;
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   height=source->extent.height-source->extent.y;
-  width=source->extent.width-source->extent.x;
-  #pragma omp parallel for schedule(static) shared(progress,status) \
-    dynamic_number_threads(source_image,width,height,1)
+  #pragma omp parallel for schedule(static,4) shared(progress,status) \
+    magick_threads(source_image,source_image,height,1)
 #endif
   for (y=source->extent.y; y < (ssize_t) source->extent.height; y++)
   {