X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=MagickWand%2Fwand-view.c;h=1cbf6ee7d830f11e9bc519663b4b40a9974181f4;hb=de984cdc3631106b1cbbb8d3972b76a0fc27e8e8;hp=1addd31b74145d82fbb4ca56f0494222ea6f07d9;hpb=26b649100680af051e65caec259bf535dbdb5b1a;p=imagemagick diff --git a/MagickWand/wand-view.c b/MagickWand/wand-view.c index 1addd31b7..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 % @@ -291,8 +291,8 @@ WandExport MagickBooleanType DuplexTransferWandViewIterator(WandView *source, progress=0; #if defined(MAGICKCORE_OPENMP_SUPPORT) height=source->extent.height-source->extent.y; - #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_number_threads(source_image,destination_image,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++) { @@ -544,8 +544,8 @@ WandExport MagickBooleanType GetWandViewIterator(WandView *source, progress=0; #if defined(MAGICKCORE_OPENMP_SUPPORT) height=source->extent.height-source->extent.y; - #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_number_threads(source_image,source_image,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++) { @@ -947,8 +947,8 @@ WandExport MagickBooleanType SetWandViewIterator(WandView *destination, progress=0; #if defined(MAGICKCORE_OPENMP_SUPPORT) height=destination->extent.height-destination->extent.y; - #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_number_threads(destination_image,destination_image,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++) { @@ -1084,8 +1084,8 @@ WandExport MagickBooleanType TransferWandViewIterator(WandView *source, progress=0; #if defined(MAGICKCORE_OPENMP_SUPPORT) height=source->extent.height-source->extent.y; - #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_number_threads(source_image,destination_image,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++) { @@ -1238,8 +1238,8 @@ WandExport MagickBooleanType UpdateWandViewIterator(WandView *source, progress=0; #if defined(MAGICKCORE_OPENMP_SUPPORT) height=source->extent.height-source->extent.y; - #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_number_threads(source_image,source_image,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++) {