Handle short months in png_write_iTIME()

[imagemagick] / MagickCore / image-private.h

diff --git a/MagickCore/image-private.h b/MagickCore/image-private.h
index 7982299a3be419c9cfc48bbf270b1db7d2e5dd86..5b0a5dd0aa7f0b62cbedddfccbc4b55144774204 100644 (file)
--- a/MagickCore/image-private.h
+++ b/MagickCore/image-private.h
@@ -1,11 +1,11 @@
 /*
-  Copyright 1999-2011 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.
   obtain a copy of the License at
 
-    http://www.imagemagick.org/script/license.php
+    https://www.imagemagick.org/script/license.php
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,37 +15,52 @@
 
   MagickCore image private methods.
 */
-#ifndef _MAGICKCORE_IMAGE_PRIVATE_H
-#define _MAGICKCORE_IMAGE_PRIVATE_H
+#ifndef MAGICKCORE_IMAGE_PRIVATE_H
+#define MAGICKCORE_IMAGE_PRIVATE_H
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
 
-#define Magick2PI    6.28318530717958647692528676655900576839433879875020L
-#define MagickPHI    1.61803398874989484820458683436563811772030917980576L
-#define MagickPI2    1.57079632679489661923132169163975144209858469968755L
-#define MagickSQ1_2  0.70710678118654752440084436210484903928483593768847L
-#define MagickSQ2    1.41421356237309504880168872420969807856967187537695L
-#define MagickSQ2PI  2.50662827463100024161235523934010416269302368164062L
+#define MagickAbsoluteValue(x)  ((x) < 0 ? -(x) : (x))
+#define MagickMax(x,y)  (((x) > (y)) ? (x) : (y))
+#define MagickMin(x,y)  (((x) < (y)) ? (x) : (y))
+#define Magick2PI    6.28318530717958647692528676655900576839433879875020
+#define MagickPHI    1.61803398874989484820458683436563811772030917980576
+#define MagickPI  3.14159265358979323846264338327950288419716939937510
+#define MagickPI2    1.57079632679489661923132169163975144209858469968755
+#define MagickSQ1_2  0.70710678118654752440084436210484903928483593768847
+#define MagickSQ2    1.41421356237309504880168872420969807856967187537695
+#define MagickSQ2PI  2.50662827463100024161235523934010416269302368164062
 #define UndefinedTicksPerSecond  100L
 #define UndefinedCompressionQuality  0UL
 
-extern MagickPrivate const char
+extern MagickExport const char
+  AlphaColor[],
   BackgroundColor[],
   BorderColor[],
-  ForegroundColor[],
   DefaultTileFrame[],
-  MatteColor[];
+  DefaultTileGeometry[],
+  DefaultTileLabel[],
+  ForegroundColor[],
+  LoadImageTag[],
+  LoadImagesTag[],
+  PSDensityGeometry[],
+  PSPageGeometry[],
+  SaveImageTag[],
+  SaveImagesTag[];
+
+extern MagickExport const double
+  DefaultResolution;
 
 static inline double DegreesToRadians(const double degrees)
 {
   return((double) (MagickPI*degrees/180.0));
 }
 
-static inline MagickRealType RadiansToDegrees(const MagickRealType radians)
+static inline double RadiansToDegrees(const double radians)
 {
-  return((MagickRealType) (180.0*radians/MagickPI));
+  return((double) (180.0*radians/MagickPI));
 }
 
 static inline unsigned char ScaleColor5to8(const unsigned int color)