...

[imagemagick] / MagickCore / resample.h

diff --git a/MagickCore/resample.h b/MagickCore/resample.h
index 5d41711911cea9bae28ba9064b1e8cd930587505..99f0f89b16d991e153f8a75656b7eaf4c83a5276 100644 (file)
--- a/MagickCore/resample.h
+++ b/MagickCore/resample.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2013 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,15 +15,15 @@
 
   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() in "resize.c" otherwise the users filter
@@ -63,7 +63,7 @@ typedef enum
   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
@@ -94,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)
 }