(no commit message)

diff --git a/MagickCore/channel.c b/MagickCore/channel.c
index 2430bf1461cd6a7705703228e910fbacdec7b652..6512d66a4bb597f8ebc24c0488d12f13bac037ab 100644 (file)
--- a/MagickCore/channel.c
+++ b/MagickCore/channel.c
@@ -42,6 +42,7 @@
 */
 #include "MagickCore/studio.h"
 #include "MagickCore/cache-private.h"
+#include "MagickCore/channel.h"
 #include "MagickCore/colorspace-private.h"
 #include "MagickCore/composite-private.h"
 #include "MagickCore/enhance.h"
@@ -197,10 +198,6 @@ static MagickBooleanType ChannelImage(Image *destination_image,
   return(status);
 }
 
-#if defined(__cplusplus) || defined(c_plusplus)
-extern "C" {
-#endif
-
 MagickExport Image *ChannelFxImage(const Image *image,const char *expression,
   ExceptionInfo *exception)
 {
@@ -445,10 +442,6 @@ MagickExport Image *ChannelFxImage(const Image *image,const char *expression,
     }
   return(GetFirstImageInList(destination_image));
 }
-
-#if defined(__cplusplus) || defined(c_plusplus)
-}
-#endif
 \f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -480,10 +473,6 @@ MagickExport Image *ChannelFxImage(const Image *image,const char *expression,
 %    o exception: return any errors or warnings in this structure.
 %
 */
-#if defined(__cplusplus) || defined(c_plusplus)
-extern "C" {
-#endif
-
 MagickExport Image *CombineImages(const Image *image,
   const ColorspaceType colorspace,ExceptionInfo *exception)
 {
@@ -606,10 +595,6 @@ MagickExport Image *CombineImages(const Image *image,
     combine_image=DestroyImage(combine_image);
   return(combine_image);
 }
-
-#if defined(__cplusplus) || defined(c_plusplus)
-}
-#endif
 \f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -672,10 +657,6 @@ MagickExport MagickBooleanType GetImageAlphaChannel(const Image *image)
 %    o exception: return any errors or warnings in this structure.
 %
 */
-#if defined(__cplusplus) || defined(c_plusplus)
-extern "C" {
-#endif
-
 MagickExport Image *SeparateImage(const Image *image,
   const ChannelType channel_type,ExceptionInfo *exception)
 {
@@ -796,10 +777,6 @@ MagickExport Image *SeparateImage(const Image *image,
     separate_image=DestroyImage(separate_image);
   return(separate_image);
 }
-
-#if defined(__cplusplus) || defined(c_plusplus)
-}
-#endif
 \f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -826,10 +803,6 @@ MagickExport Image *SeparateImage(const Image *image,
 %    o exception: return any errors or warnings in this structure.
 %
 */
-#if defined(__cplusplus) || defined(c_plusplus)
-extern "C" {
-#endif
-
 MagickExport Image *SeparateImages(const Image *image,ExceptionInfo *exception)
 {
   Image
@@ -859,10 +832,6 @@ MagickExport Image *SeparateImages(const Image *image,ExceptionInfo *exception)
     images=SeparateImage(image,UndefinedChannel,exception);
   return(images);
 }
-
-#if defined(__cplusplus) || defined(c_plusplus)
-}
-#endif
 \f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -958,10 +927,6 @@ static inline void FlattenPixelInfo(const Image *image,const PixelInfo *p,
   }
 }
 
-#if defined(__cplusplus) || defined(c_plusplus)
-extern "C" {
-#endif
-
 MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
   const AlphaChannelOption alpha_type,ExceptionInfo *exception)
 {
@@ -1131,7 +1096,3 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
     return(status);
   return(SyncImagePixelCache(image,exception));
 }
-
-#if defined(__cplusplus) || defined(c_plusplus)
-}
-#endif

diff --git a/MagickCore/version.h b/MagickCore/version.h
index b427dfe2d07b88d50c283f48c9be69eaa605703c..43ec58ae11677f246de740ee5fcc62a3718abd4c 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -48,7 +48,7 @@ extern "C" {
 #define MagickppLibAddendum  "-0"
 #define MagickppLibInterface  1
 #define MagickppLibMinInterface  1
-#define MagickReleaseDate  "2013-11-27"
+#define MagickReleaseDate  "2013-11-28"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"