sigmoidal-contrast: prevent argument out of range and remove unnecessary ClampToQuantum

[imagemagick] / MagickCore / nt-base-private.h

diff --git a/MagickCore/nt-base-private.h b/MagickCore/nt-base-private.h
index 659122a32fec3fa5a8d10f5f083421a5e18935a5..bc7c2f4fa88c9dbd85768116f9a7f756e0c42c43 100644 (file)
--- a/MagickCore/nt-base-private.h
+++ b/MagickCore/nt-base-private.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2012 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.
@@ -135,6 +135,9 @@ extern "C" {
 #if !defined(inline)
 #  define inline __inline
 #endif
+#if !defined(isatty)
+#  define isatty  _isatty
+#endif
 #if !defined(locale_t)
 #define locale_t _locale_t
 #endif
@@ -349,11 +352,7 @@ typedef UINT
 #endif
 
 extern MagickPrivate char
-  *NTGetLastError(void),
-  **NTArgvToUTF8(const int argc,wchar_t **);
-
-extern MagickPrivate const GhostInfo
-  *NTGhostscriptDLLVectors(void);
+  *NTGetLastError(void);
 
 #if !defined(MAGICKCORE_LTDL_DELEGATE)
 extern MagickPrivate const char
@@ -386,7 +385,6 @@ extern MagickPrivate int
   NTGhostscriptEXE(char *,int),
   NTGhostscriptFonts(char *,int),
   NTGhostscriptLoadDLL(void),
-  NTGhostscriptUnLoadDLL(void),
   NTInitializeLibrary(void),
   NTSetSearchPath(const char *),
   NTSyncMemory(void *,size_t,int),
@@ -401,8 +399,6 @@ extern MagickPrivate MagickBooleanType
   NTGatherRandomData(const size_t,unsigned char *),
   NTGetExecutionPath(char *,const size_t),
   NTGetModulePath(const char *,char *),
-  NTIsMagickConflict(const char *),
-  NTLoadTypeLists(SplayTreeInfo *,ExceptionInfo *),
   NTReportEvent(const char *,const MagickBooleanType),
   NTReportException(const char *,const MagickBooleanType);