...

[imagemagick] / MagickCore / resample.h

diff --git a/MagickCore/resample.h b/MagickCore/resample.h
index 253a0f801ce3cefe16402e0a53612cf2c6ca816c..99f0f89b16d991e153f8a75656b7eaf4c83a5276 100644 (file)
--- a/MagickCore/resample.h
+++ b/MagickCore/resample.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2017 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.
@@ -15,18 +15,18 @@
 
   MagickCore graphic resample methods.
 */
-#ifndef _MAGICKCORE_RESAMPLE_H
-#define _MAGICKCORE_RESAMPLE_H
+#ifndef MAGICKCORE_RESAMPLE_H
+#define MAGICKCORE_RESAMPLE_H
+
+#include "MagickCore/cache-view.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
 
-#include <MagickCore/cache-view.h>
-
 /*
   WARNING:  The order of this table must also match the order of a table
-  located in AcquireResizeFilter() or "resize.c" otherwise the users filter
+  located in AcquireResizeFilter() in "resize.c" otherwise the users filter
   will not match the actual filter that is setup.
 */
 typedef enum
@@ -36,7 +36,7 @@ typedef enum
   BoxFilter,
   TriangleFilter,
   HermiteFilter,
-  HanningFilter,
+  HannFilter,
   HammingFilter,
   BlackmanFilter,
   GaussianFilter,
@@ -48,7 +48,7 @@ typedef enum
   SincFilter,
   SincFastFilter,
   KaiserFilter,
-  WelshFilter,
+  WelchFilter,
   ParzenFilter,
   BohmanFilter,
   BartlettFilter,
@@ -58,22 +58,30 @@ typedef enum
   Lanczos2Filter,
   Lanczos2SharpFilter,
   RobidouxFilter,
+  RobidouxSharpFilter,
+  CosineFilter,
+  SplineFilter,
+  LanczosRadiusFilter,
   SentinelFilter  /* a count of all the filters, not a real filter */
-} FilterTypes;
+} FilterType;
 
 /*
   Backward compatibility for the more correctly named Jinc Filter.  Original
   source of this filter is from "zoom" but it refers to a reference by Pratt,
   who does not actualy name the filter.
+
+  also miss-spellings of common filters
 */
-#define BesselFilter JincFilter
+#define BesselFilter  JincFilter
+#define WelshFilter   WelchFilter
+#define HanningFilter HannFilter
 
 typedef struct _ResampleFilter
   ResampleFilter;
 
 extern MagickExport MagickBooleanType
   ResamplePixelColor(ResampleFilter *,const double,const double,
-    PixelInfo *),
+    PixelInfo *,ExceptionInfo *),
   SetResampleFilterInterpolateMethod(ResampleFilter *,
     const PixelInterpolateMethod),
   SetResampleFilterVirtualPixelMethod(ResampleFilter *,
@@ -86,7 +94,7 @@ extern MagickExport ResampleFilter
 extern MagickExport void
   ScaleResampleFilter(ResampleFilter *,const double,const double,const double,
     const double),
-  SetResampleFilter(ResampleFilter *,const FilterTypes);
+  SetResampleFilter(ResampleFilter *,const FilterType);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }