diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c
index 806b05b..668abd8 100644
--- a/MagickCore/attribute.c
+++ b/MagickCore/attribute.c
@@ -169,7 +169,7 @@
GetPixelInfo(image,&zero);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -388,7 +388,7 @@
}
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -452,7 +452,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -936,7 +936,7 @@
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(status) \
- dynamic_num_threads_uno(image->colors)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i < (ssize_t) image->colors; i++)
{
@@ -980,7 +980,7 @@
range);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -1044,7 +1044,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 93de807..fa4600d 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -4898,7 +4898,7 @@
image_view=AcquireVirtualCacheView(image,exception); /* must be virtual */
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
diff --git a/MagickCore/channel.c b/MagickCore/channel.c
index 6e67441..56473a1 100644
--- a/MagickCore/channel.c
+++ b/MagickCore/channel.c
@@ -141,7 +141,7 @@
width=MagickMin(source_image->columns,destination_image->columns);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(status) \
- dynamic_num_threads_dos(width,height)
+ dynamic_number_threads(width,height,1)
#endif
for (y=0; y < (ssize_t) height; y++)
{
@@ -656,7 +656,7 @@
separate_view=AcquireAuthenticCacheView(separate_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
diff --git a/MagickCore/colormap.c b/MagickCore/colormap.c
index fff4f6a..dc3128a 100644
--- a/MagickCore/colormap.c
+++ b/MagickCore/colormap.c
@@ -206,7 +206,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -331,7 +331,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_uno(image->colors)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i < (ssize_t) image->colors; i++)
image->colormap[i].alpha=(double) i;
diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index a55c0fb..a8685d0 100644
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -245,7 +245,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -305,7 +305,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -362,7 +362,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -427,7 +427,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -492,7 +492,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -557,7 +557,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -664,7 +664,7 @@
0.002/film_gamma);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
logmap[i]=ScaleMapToQuantum((MagickRealType) (MaxMap*(reference_white+
@@ -673,7 +673,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -749,7 +749,7 @@
primary_info.z=(double) (MaxMap+1.0)/2.0;
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
@@ -775,7 +775,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
@@ -809,7 +809,7 @@
primary_info.z=(double) (MaxMap+1.0)/2.0;
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
@@ -834,7 +834,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
@@ -866,7 +866,7 @@
primary_info.z=(double) (MaxMap+1.0)/2.0;
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
@@ -890,7 +890,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
@@ -925,7 +925,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
@@ -996,7 +996,7 @@
primary_info.z=(double) (MaxMap+1.0)/2.0;
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
@@ -1028,7 +1028,7 @@
primary_info.z=(double) (MaxMap+1.0)/2.0;
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
@@ -1060,7 +1060,7 @@
primary_info.z=(double) (MaxMap+1.0)/2.0;
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
@@ -1083,7 +1083,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
@@ -1114,7 +1114,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -1730,7 +1730,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -1790,7 +1790,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -1847,7 +1847,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -1914,7 +1914,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -1981,7 +1981,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -2048,7 +2048,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -2164,7 +2164,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -2247,7 +2247,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
@@ -2283,7 +2283,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
@@ -2317,7 +2317,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
@@ -2348,7 +2348,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
@@ -2383,7 +2383,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
@@ -2412,7 +2412,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
@@ -2446,7 +2446,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
@@ -2482,7 +2482,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
@@ -2516,7 +2516,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
@@ -2543,7 +2543,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
@@ -2574,7 +2574,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -2679,7 +2679,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_uno(image->colors)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i < (ssize_t) image->colors; i++)
{
diff --git a/MagickCore/compare.c b/MagickCore/compare.c
index 5c9483a..f0ed875 100644
--- a/MagickCore/compare.c
+++ b/MagickCore/compare.c
@@ -179,7 +179,7 @@
highlight_view=AcquireAuthenticCacheView(highlight_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -328,7 +328,7 @@
reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -453,7 +453,7 @@
reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -554,7 +554,7 @@
reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -749,7 +749,7 @@
reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -984,7 +984,7 @@
reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -1594,7 +1594,7 @@
similarity_view=AcquireAuthenticCacheView(similarity_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) (image->rows-reference->rows+1); y++)
{
diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 2171ba4..e2bf604 100644
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -335,7 +335,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -609,7 +609,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) composite_image->rows; y++)
{
@@ -1166,7 +1166,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -2365,7 +2365,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y+=(ssize_t) texture_image->rows)
{
@@ -2415,7 +2415,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c
index 4c26d6f..e1a6cde 100644
--- a/MagickCore/decorate.c
+++ b/MagickCore/decorate.c
@@ -385,7 +385,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -690,7 +690,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) raise_info->height; y++)
{
@@ -796,7 +796,7 @@
}
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=(ssize_t) raise_info->height; y < (ssize_t) (image->rows-raise_info->height); y++)
{
@@ -879,7 +879,7 @@
}
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=(ssize_t) (image->rows-raise_info->height); y < (ssize_t) image->rows; y++)
{
diff --git a/MagickCore/distort.c b/MagickCore/distort.c
index 71d58d1..6e17f5f 100644
--- a/MagickCore/distort.c
+++ b/MagickCore/distort.c
@@ -2314,7 +2314,7 @@
distort_view=AcquireAuthenticCacheView(distort_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (j=0; j < (ssize_t) distort_image->rows; j++)
{
@@ -3039,7 +3039,7 @@
sparse_view=AcquireAuthenticCacheView(sparse_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (j=0; j < (ssize_t) sparse_image->rows; j++)
{
diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index 768c03a..53d40a3 100644
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -1169,7 +1169,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(status) \
- dynamic_num_threads_dos(width,height)
+ dynamic_number_threads(width,height,1)
#endif
for (y=start; y <= stop; y++)
{
@@ -3261,7 +3261,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(status) \
- dynamic_num_threads_dos(width,height)
+ dynamic_number_threads(width,height,1)
#endif
for (y=bounding_box.y; y < (ssize_t) bounding_box.height; y++)
{
@@ -3874,7 +3874,7 @@
stop=(ssize_t) floor(bounds.y2+0.5);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(status) \
- dynamic_num_threads_dos(width,height)
+ dynamic_number_threads(width,height,1)
#endif
for (y=start; y <= stop; y++)
{
@@ -3937,7 +3937,7 @@
stop=(ssize_t) floor(bounds.y2+0.5);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(status) \
- dynamic_num_threads_dos(width,height)
+ dynamic_number_threads(width,height,1)
#endif
for (y=start; y <= stop; y++)
{
diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index e974b0d..02390c4 100644
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -295,7 +295,7 @@
blur_view=AcquireAuthenticCacheView(blur_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) blur_image->rows; y++)
{
@@ -622,7 +622,7 @@
sharp_view=AcquireAuthenticCacheView(sharp_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) sharp_image->rows; y++)
{
@@ -952,7 +952,7 @@
blur_view=AcquireAuthenticCacheView(blur_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -1082,7 +1082,7 @@
blur_view=AcquireAuthenticCacheView(blur_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (x=0; x < (ssize_t) blur_image->columns; x++)
{
@@ -1293,7 +1293,7 @@
r=p+(y_offset*(columns+2)+x_offset);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) \
- dynamic_num_threads_dos(columns,rows)
+ dynamic_number_threads(columns,rows,1)
#endif
for (y=0; y < (ssize_t) rows; y++)
{
@@ -1330,7 +1330,7 @@
s=q-(y_offset*(columns+2)+x_offset);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) \
- dynamic_num_threads_dos(columns,rows)
+ dynamic_number_threads(columns,rows,1)
#endif
for (y=0; y < (ssize_t) rows; y++)
{
@@ -1956,7 +1956,7 @@
blur_view=AcquireAuthenticCacheView(blur_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -2734,7 +2734,7 @@
blur_view=AcquireAuthenticCacheView(blur_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -3029,7 +3029,7 @@
blur_view=AcquireAuthenticCacheView(blur_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -3283,7 +3283,7 @@
shade_view=AcquireAuthenticCacheView(shade_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -3611,7 +3611,7 @@
spread_view=AcquireAuthenticCacheView(spread_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,8) shared(progress,status) \
- dynamic_num_threads_tres(image->columns,image->rows,key == ~0UL)
+ dynamic_number_threads(image->columns,image->rows,key == ~0UL)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -3751,7 +3751,7 @@
unsharp_view=AcquireAuthenticCacheView(unsharp_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index 11b5f41..ac870bc 100644
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -344,7 +344,7 @@
clut_view=AcquireVirtualCacheView(clut_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
@@ -357,7 +357,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -707,7 +707,7 @@
image->filename);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
@@ -728,7 +728,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_uno(image->colors)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i < (ssize_t) image->colors; i++)
{
@@ -756,7 +756,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -912,7 +912,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -1099,7 +1099,7 @@
number_channels=GetPixelChannels(image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i < (ssize_t) number_channels; i++)
{
@@ -1137,7 +1137,7 @@
number_channels=GetPixelChannels(image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i < (ssize_t) number_channels; i++)
{
@@ -1169,7 +1169,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_uno(image->colors)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (j=0; j < (ssize_t) image->colors; j++)
{
@@ -1211,7 +1211,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -1364,7 +1364,7 @@
enhance_view=AcquireAuthenticCacheView(enhance_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -1596,7 +1596,7 @@
number_channels=GetPixelChannels(image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i < (ssize_t) number_channels; i++)
{
@@ -1618,7 +1618,7 @@
number_channels=GetPixelChannels(image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i < (ssize_t) number_channels; i++)
{
@@ -1648,7 +1648,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_uno(image->colors)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (j=0; j < (ssize_t) image->colors; j++)
{
@@ -1693,7 +1693,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -1832,7 +1832,7 @@
if (gamma != 0.0)
#if defined(MAGICKCORE_OPENMP_SUPPORT) && (MaxMap > 256)
#pragma omp parallel for \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
gamma_map[i]=ScaleMapToQuantum((MagickRealType) (MaxMap*pow((double) i/
@@ -1844,7 +1844,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_uno(image->colors)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i < (ssize_t) image->colors; i++)
{
@@ -1870,7 +1870,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -2040,7 +2040,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -2221,7 +2221,7 @@
if (image->storage_class == PseudoClass)
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_uno(image->colors)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i < (ssize_t) image->colors; i++)
{
@@ -2249,7 +2249,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -2389,7 +2389,7 @@
if (image->storage_class == PseudoClass)
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_uno(image->colors)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i < (ssize_t) image->colors; i++)
{
@@ -2417,7 +2417,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -2902,7 +2902,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_uno(image->colors)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i < (ssize_t) image->colors; i++)
switch (colorspace)
@@ -2939,7 +2939,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -3072,7 +3072,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_uno(image->colors)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i < (ssize_t) image->colors; i++)
{
@@ -3101,7 +3101,7 @@
{
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -3175,7 +3175,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -3355,7 +3355,7 @@
(void) ResetMagickMemory(sigmoidal_map,0,(MaxMap+1)*sizeof(*sigmoidal_map));
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_uno(MaxMap)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
@@ -3419,7 +3419,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_uno(image->colors)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i < (ssize_t) image->colors; i++)
{
@@ -3445,7 +3445,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
diff --git a/MagickCore/feature.c b/MagickCore/feature.c
index 30e2a5f..016e19e 100644
--- a/MagickCore/feature.c
+++ b/MagickCore/feature.c
@@ -224,7 +224,7 @@
image_view=AcquireVirtualCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -595,7 +595,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(number_grays,number_grays)
+ dynamic_number_threads(number_grays,number_grays,1)
#endif
for (i=0; i < 4; i++)
{
@@ -780,7 +780,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(number_grays,number_grays)
+ dynamic_number_threads(number_grays,number_grays,1)
#endif
for (i=0; i < 4; i++)
{
@@ -856,7 +856,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(number_grays,number_grays)
+ dynamic_number_threads(number_grays,number_grays,1)
#endif
for (i=0; i < 4; i++)
{
@@ -977,7 +977,7 @@
(void) ResetMagickMemory(&sum_squares,0,sizeof(sum_squares));
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(number_grays,number_grays)
+ dynamic_number_threads(number_grays,number_grays,1)
#endif
for (i=0; i < 4; i++)
{
@@ -1129,7 +1129,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(number_grays,number_grays)
+ dynamic_number_threads(number_grays,number_grays,1)
#endif
for (i=0; i < 4; i++)
{
diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 0a57c64..e49ec76 100644
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -312,7 +312,7 @@
key=GetRandomSecretKey(random_info[0]);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_tres(image->columns,image->rows,key == ~0UL)
+ dynamic_number_threads(image->columns,image->rows,key == ~0UL)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -479,7 +479,7 @@
shift_view=AcquireAuthenticCacheView(shift_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -742,7 +742,7 @@
colorize_view=AcquireAuthenticCacheView(colorize_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -949,7 +949,7 @@
color_view=AcquireAuthenticCacheView(color_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -3044,7 +3044,7 @@
fx_view=AcquireAuthenticCacheView(fx_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) fx_image->rows; y++)
{
@@ -3243,7 +3243,7 @@
implode_view=AcquireAuthenticCacheView(implode_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -3488,7 +3488,7 @@
morph_view=AcquireAuthenticCacheView(morph_images,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) morph_images->rows; y++)
{
@@ -4144,7 +4144,7 @@
sepia_view=AcquireAuthenticCacheView(sepia_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -4435,7 +4435,7 @@
random_view=AcquireAuthenticCacheView(random_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_tres(image->columns,image->rows,key == ~0UL)
+ dynamic_number_threads(image->columns,image->rows,key == ~0UL)
#endif
for (y=0; y < (ssize_t) random_image->rows; y++)
{
@@ -4609,7 +4609,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -5094,7 +5094,7 @@
swirl_view=AcquireAuthenticCacheView(swirl_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -5328,7 +5328,7 @@
tint_view=AcquireAuthenticCacheView(tint_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -5632,7 +5632,7 @@
BackgroundVirtualPixelMethod);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) wave_image->rows; y++)
{
diff --git a/MagickCore/image-view.c b/MagickCore/image-view.c
index 4afd975..28be5e7 100644
--- a/MagickCore/image-view.c
+++ b/MagickCore/image-view.c
@@ -244,7 +244,7 @@
width=source->extent.width-source->extent.x;
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_dos(width,height)
+ dynamic_number_threads(width,height,1)
#endif
for (y=source->extent.y; y < (ssize_t) source->extent.height; y++)
{
@@ -556,7 +556,7 @@
width=source->extent.width-source->extent.x;
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_dos(width,height)
+ dynamic_number_threads(width,height,1)
#endif
for (y=source->extent.y; y < (ssize_t) source->extent.height; y++)
{
@@ -904,7 +904,7 @@
width=destination->extent.width-destination->extent.x;
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_dos(width,height)
+ dynamic_number_threads(width,height,1)
#endif
for (y=destination->extent.y; y < (ssize_t) destination->extent.height; y++)
{
@@ -1032,7 +1032,7 @@
width=source->extent.width-source->extent.x;
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_dos(width,height)
+ dynamic_number_threads(width,height,1)
#endif
for (y=source->extent.y; y < (ssize_t) source->extent.height; y++)
{
@@ -1163,7 +1163,7 @@
width=source->extent.width-source->extent.x;
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_dos(width,height)
+ dynamic_number_threads(width,height,1)
#endif
for (y=source->extent.y; y < (ssize_t) source->extent.height; y++)
{
diff --git a/MagickCore/image.c b/MagickCore/image.c
index f6d16c4..73ae3bd 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -536,7 +536,7 @@
image_view=AcquireVirtualCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -1644,7 +1644,7 @@
image_view=AcquireVirtualCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -1899,7 +1899,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -2171,7 +2171,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -2250,7 +2250,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -2438,7 +2438,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -3092,7 +3092,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -3747,7 +3747,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(range_exception,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index 9f0d47c..e30114a 100644
--- a/MagickCore/morphology.c
+++ b/MagickCore/morphology.c
@@ -2589,7 +2589,7 @@
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -2766,7 +2766,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
diff --git a/MagickCore/paint.c b/MagickCore/paint.c
index 99faf8f..6ef6723 100644
--- a/MagickCore/paint.c
+++ b/MagickCore/paint.c
@@ -592,7 +592,7 @@
paint_view=AcquireAuthenticCacheView(paint_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -793,7 +793,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -920,7 +920,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -1047,7 +1047,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
diff --git a/MagickCore/prepress.c b/MagickCore/prepress.c
index 2b7cfe6..3e4ee72 100644
--- a/MagickCore/prepress.c
+++ b/MagickCore/prepress.c
@@ -113,7 +113,7 @@
image_view=AcquireVirtualCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
diff --git a/MagickCore/profile.c b/MagickCore/profile.c
index 8d349ae..dd26629 100644
--- a/MagickCore/profile.c
+++ b/MagickCore/profile.c
@@ -6042,7 +6042,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c
index c1faafa..29a1c1d 100644
--- a/MagickCore/quantize.c
+++ b/MagickCore/quantize.c
@@ -543,7 +543,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -2380,7 +2380,7 @@
if (image->storage_class == PseudoClass)
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_uno(image->colors)
+ dynamic_number_threads(image->columns,1,1)
#endif
for (i=0; i < (ssize_t) image->colors; i++)
{
@@ -2408,7 +2408,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -3305,7 +3305,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -3383,7 +3383,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index 0d0ad94..13979e0 100644
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -1594,7 +1594,7 @@
scale.y=(double) image->rows/resize_image->rows;
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) resize_image->rows; y++)
{
@@ -2203,7 +2203,7 @@
resize_view=AcquireAuthenticCacheView(resize_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (x=0; x < (ssize_t) resize_image->columns; x++)
{
@@ -2421,7 +2421,7 @@
resize_view=AcquireAuthenticCacheView(resize_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) resize_image->rows; y++)
{
@@ -2776,7 +2776,7 @@
sample_view=AcquireAuthenticCacheView(sample_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) sample_image->rows; y++)
{
diff --git a/MagickCore/resource.c b/MagickCore/resource.c
index 61f4d05..0e6af9d 100644
--- a/MagickCore/resource.c
+++ b/MagickCore/resource.c
@@ -990,7 +990,7 @@
if (files < 0)
files=64;
(void) SetMagickResourceLimit(FileResource,MagickMax((size_t)
- (3*files/4)));
+ (3*files/4),64));
limit=GetEnvironmentValue("MAGICK_FILE_LIMIT");
if (limit == (char *) NULL)
limit=GetPolicyValue("file");
diff --git a/MagickCore/segment.c b/MagickCore/segment.c
index 88e59b5..758e3f8 100644
--- a/MagickCore/segment.c
+++ b/MagickCore/segment.c
@@ -533,7 +533,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
diff --git a/MagickCore/shear.c b/MagickCore/shear.c
index 74b687a..72dfac1 100644
--- a/MagickCore/shear.c
+++ b/MagickCore/shear.c
@@ -573,7 +573,7 @@
}
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) \
- dynamic_num_threads_dos(p->width,p->height)
+ dynamic_number_threads(p->width,p->height,1)
#endif
for (x=0; x < (ssize_t) p->width; x++)
{
@@ -654,7 +654,7 @@
image_view=AcquireVirtualCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -704,7 +704,7 @@
(void) ResetRadonCells(source_cells);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -1027,7 +1027,7 @@
GetPixelCacheTileSize(image,&tile_width,&tile_height);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (tile_y=0; tile_y < (ssize_t) image->rows; tile_y+=(ssize_t) tile_height)
{
@@ -1152,7 +1152,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -1249,7 +1249,7 @@
GetPixelCacheTileSize(image,&tile_width,&tile_height);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (tile_y=0; tile_y < (ssize_t) image->rows; tile_y+=(ssize_t) tile_height)
{
@@ -1452,7 +1452,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(width,height)
+ dynamic_number_threads(width,height,1)
#endif
for (y=0; y < (ssize_t) height; y++)
{
@@ -1668,7 +1668,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(width,height)
+ dynamic_number_threads(width,height,1)
#endif
for (x=0; x < (ssize_t) width; x++)
{
diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index 87e7f48..7d0ef38 100644
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -506,7 +506,7 @@
{
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_tres(images->columns,images->rows,key == ~0UL)
+ dynamic_number_threads(images->columns,images->rows,key == ~0UL)
#endif
for (y=0; y < (ssize_t) evaluate_image->rows; y++)
{
@@ -614,7 +614,7 @@
{
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_tres(images->columns,images->rows,key == ~0UL)
+ dynamic_number_threads(images->columns,images->rows,key == ~0UL)
#endif
for (y=0; y < (ssize_t) evaluate_image->rows; y++)
{
@@ -820,7 +820,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_tres(image->columns,image->rows,key == ~0UL)
+ dynamic_number_threads(image->columns,image->rows,key == ~0UL)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -1053,7 +1053,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -1317,7 +1317,7 @@
image_view=AcquireVirtualCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -1446,7 +1446,7 @@
image_view=AcquireVirtualCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -2268,7 +2268,7 @@
statistic_view=AcquireAuthenticCacheView(statistic_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) statistic_image->rows; y++)
{
diff --git a/MagickCore/thread-private.h b/MagickCore/thread-private.h
index 2623d52..f30b82f 100644
--- a/MagickCore/thread-private.h
+++ b/MagickCore/thread-private.h
@@ -29,15 +29,7 @@
Single threaded unless workload justifies the threading overhead.
*/
#define MinimumWorkLoad() (32*GetMagickResourceLimit(ThreadResource))
-#define dynamic_num_threads_uno(colors) \
- if ((colors) > MinimumWorkLoad()) \
- num_threads(GetMagickResourceLimit(ThreadResource))
-#define dynamic_num_threads_dos(columns,rows) \
- if (((((columns) > MinimumWorkLoad()) || \
- ((rows) > MinimumWorkLoad()))) && ((MagickSizeType) \
- ((columns)*(rows)) > (MinimumWorkLoad()*MinimumWorkLoad()))) \
- num_threads(GetMagickResourceLimit(ThreadResource))
-#define dynamic_num_threads_tres(columns,rows,expression) \
+#define dynamic_number_threads(columns,rows,expression) \
if (((((columns) > MinimumWorkLoad()) || \
((rows) > MinimumWorkLoad()))) && ((MagickSizeType) \
((columns)*(rows)) > (MinimumWorkLoad()*MinimumWorkLoad())) && \
diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c
index 0fe399d..6b42c38 100644
--- a/MagickCore/threshold.c
+++ b/MagickCore/threshold.c
@@ -206,7 +206,7 @@
threshold_view=AcquireAuthenticCacheView(threshold_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -393,7 +393,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,8) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -560,7 +560,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,8) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -703,7 +703,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,8) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -1327,7 +1327,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,8) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -1507,7 +1507,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,8) shared(progress,status) \
- dynamic_num_threads_tres(image->columns,image->rows,key == ~0UL)
+ dynamic_number_threads(image->columns,image->rows,key == ~0UL)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -1690,7 +1690,7 @@
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,8) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
diff --git a/MagickCore/transform.c b/MagickCore/transform.c
index 5c89264..ddd492d 100644
--- a/MagickCore/transform.c
+++ b/MagickCore/transform.c
@@ -161,7 +161,7 @@
chop_view=AcquireAuthenticCacheView(chop_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) extent.y; y++)
{
@@ -232,7 +232,7 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) (image->rows-(extent.y+extent.height)); y++)
{
@@ -588,7 +588,7 @@
crop_view=AcquireAuthenticCacheView(crop_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) crop_image->rows; y++)
{
@@ -950,7 +950,7 @@
excerpt_view=AcquireAuthenticCacheView(excerpt_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) excerpt_image->rows; y++)
{
@@ -1158,7 +1158,7 @@
flip_view=AcquireAuthenticCacheView(flip_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) flip_image->rows; y++)
{
@@ -1305,7 +1305,7 @@
flop_view=AcquireAuthenticCacheView(flop_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) flop_image->rows; y++)
{
@@ -1435,7 +1435,7 @@
destination_view=AcquireAuthenticCacheView(destination,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(status) \
- dynamic_num_threads_dos(columns,rows)
+ dynamic_number_threads(columns,rows,1)
#endif
for (y=0; y < (ssize_t) rows; y++)
{
@@ -1764,7 +1764,7 @@
splice_view=AcquireAuthenticCacheView(splice_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) splice_geometry.y; y++)
{
@@ -1869,7 +1869,7 @@
}
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=(ssize_t) (splice_geometry.y+splice_geometry.height);
y < (ssize_t) splice_image->rows; y++)
@@ -2221,7 +2221,7 @@
transpose_view=AcquireAuthenticCacheView(transpose_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -2371,7 +2371,7 @@
transverse_view=AcquireAuthenticCacheView(transverse_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
diff --git a/MagickWand/wand-view.c b/MagickWand/wand-view.c
index 777f26a..c49b439 100644
--- a/MagickWand/wand-view.c
+++ b/MagickWand/wand-view.c
@@ -292,7 +292,7 @@
width=source->extent.width-source->extent.x;
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_dos(width,height)
+ dynamic_number_threads(width,height,1)
#endif
for (y=source->extent.y; y < (ssize_t) source->extent.height; y++)
{
@@ -545,7 +545,7 @@
width=source->extent.width-source->extent.x;
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_dos(width,height)
+ dynamic_number_threads(width,height,1)
#endif
for (y=source->extent.y; y < (ssize_t) source->extent.height; y++)
{
@@ -948,7 +948,7 @@
width=destination->extent.width-destination->extent.x;
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_dos(width,height)
+ dynamic_number_threads(width,height,1)
#endif
for (y=destination->extent.y; y < (ssize_t) destination->extent.height; y++)
{
@@ -1085,7 +1085,7 @@
width=source->extent.width-source->extent.x;
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_dos(width,height)
+ dynamic_number_threads(width,height,1)
#endif
for (y=source->extent.y; y < (ssize_t) source->extent.height; y++)
{
@@ -1239,7 +1239,7 @@
width=source->extent.width-source->extent.x;
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- dynamic_num_threads_dos(width,height)
+ dynamic_number_threads(width,height,1)
#endif
for (y=source->extent.y; y < (ssize_t) source->extent.height; y++)
{
diff --git a/coders/hald.c b/coders/hald.c
index d14078d..236e58f 100644
--- a/coders/hald.c
+++ b/coders/hald.c
@@ -127,7 +127,7 @@
image->rows=(size_t) (level*cube_size);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,8) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y+=(ssize_t) level)
{
diff --git a/coders/rgb.c b/coders/rgb.c
index d3c7334..2ad462d 100644
--- a/coders/rgb.c
+++ b/coders/rgb.c
@@ -96,8 +96,7 @@
% o exception: return any errors or warnings in this structure.
%
*/
-static Image *ReadRGBImage(const ImageInfo *image_info,
- ExceptionInfo *exception)
+static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception)
{
Image
*canvas_image,
@@ -248,8 +247,7 @@
canvas_image->columns,1,exception);
q=QueueAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const Quantum *) NULL) ||
- (q == (Quantum *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -332,8 +330,7 @@
0,canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const Quantum *) NULL) ||
- (q == (Quantum *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -427,8 +424,7 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const Quantum *) NULL) ||
- (q == (Quantum *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -479,8 +475,7 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const Quantum *) NULL) ||
- (q == (Quantum *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -531,8 +526,7 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const Quantum *) NULL) ||
- (q == (Quantum *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -592,8 +586,7 @@
exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const Quantum *) NULL) ||
- (q == (Quantum *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -679,8 +672,7 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const Quantum *) NULL) ||
- (q == (Quantum *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -750,8 +742,7 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const Quantum *) NULL) ||
- (q == (Quantum *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -821,8 +812,7 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const Quantum *) NULL) ||
- (q == (Quantum *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -1066,8 +1056,8 @@
% o exception: return any errors or warnings in this structure.
%
*/
-static MagickBooleanType WriteRGBImage(const ImageInfo *image_info,
- Image *image,ExceptionInfo *exception)
+static MagickBooleanType WriteRGBImage(const ImageInfo *image_info,Image *image,
+ ExceptionInfo *exception)
{
MagickBooleanType
status;
diff --git a/filters/analyze.c b/filters/analyze.c
index 9622757..b4005c4 100644
--- a/filters/analyze.c
+++ b/filters/analyze.c
@@ -146,7 +146,7 @@
image_view=AcquireVirtualCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{