(no commit message)

[imagemagick] / MagickCore / resample-private.h

diff --git a/MagickCore/resample-private.h b/MagickCore/resample-private.h
index 706b818682e8fb48023c23eb9340d466f66a7b9d..c182ca01a6695149ca3c365f1a33256af1820f3b 100644 (file)
--- a/MagickCore/resample-private.h
+++ b/MagickCore/resample-private.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2012 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.
@@ -18,12 +18,12 @@
 #ifndef _MAGICKCORE_RESAMPLE_PRIVATE_H
 #define _MAGICKCORE_RESAMPLE_PRIVATE_H
 
+#include "MagickCore/thread-private.h"
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
 
-#include "MagickCore/thread-private.h"
-
 static inline ResampleFilter **DestroyResampleFilterThreadSet(
   ResampleFilter **filter)
 {
@@ -31,7 +31,7 @@ static inline ResampleFilter **DestroyResampleFilterThreadSet(
     i;
 
   assert(filter != (ResampleFilter **) NULL);
-  for (i=0; i < (ssize_t) GetOpenMPMaximumThreads(); i++)
+  for (i=0; i < (ssize_t) GetMagickResourceLimit(ThreadResource); i++)
     if (filter[i] != (ResampleFilter *) NULL)
       filter[i]=DestroyResampleFilter(filter[i]);
   filter=(ResampleFilter **) RelinquishMagickMemory(filter);
@@ -51,7 +51,7 @@ static inline ResampleFilter **AcquireResampleFilterThreadSet(
   size_t
     number_threads;
 
-  number_threads=GetOpenMPMaximumThreads();
+  number_threads=(size_t) GetMagickResourceLimit(ThreadResource);
   filter=(ResampleFilter **) AcquireQuantumMemory(number_threads,
     sizeof(*filter));
   if (filter == (ResampleFilter **) NULL)
@@ -65,7 +65,7 @@ static inline ResampleFilter **AcquireResampleFilterThreadSet(
     if (method != UndefinedVirtualPixelMethod)
       (void) SetResampleFilterVirtualPixelMethod(filter[i],method);
     if (interpolate != MagickFalse)
-      SetResampleFilter(filter[i],PointFilter,1.0);
+      SetResampleFilter(filter[i],PointFilter);
   }
   return(filter);
 }