From: cristy Date: Sun, 21 Aug 2011 16:26:29 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~7167 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2e9101c394cc8eb7cec947801c493e2ff064fa6;p=imagemagick --- diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h index 2726a74e3..60334d7b9 100644 --- a/MagickCore/magick-config.h +++ b/MagickCore/magick-config.h @@ -12,7 +12,9 @@ /* #undef AUTOTRACE_DELEGATE */ /* Define if coders and filters are to be built as modules. */ -/* #undef BUILD_MODULES */ +#ifndef MAGICKCORE_BUILD_MODULES +#define MAGICKCORE_BUILD_MODULES 1 +#endif /* Define if you have the bzip2 library */ #ifndef MAGICKCORE_BZLIB_DELEGATE @@ -78,7 +80,9 @@ #endif /* Define if you have FFTW library */ -/* #undef FFTW_DELEGATE */ +#ifndef MAGICKCORE_FFTW_DELEGATE +#define MAGICKCORE_FFTW_DELEGATE 1 +#endif /* Location of filter modules */ #ifndef MAGICKCORE_FILTER_PATH @@ -432,15 +436,15 @@ #endif /* Define if you have the header file. */ -#ifndef MAGICKCORE_HAVE_LCMS2_H -#define MAGICKCORE_HAVE_LCMS2_H 1 -#endif +/* #undef HAVE_LCMS2_H */ /* Define if you have the header file. */ /* #undef HAVE_LCMS2_LCMS2_H */ /* Define if you have the header file. */ -/* #undef HAVE_LCMS_H */ +#ifndef MAGICKCORE_HAVE_LCMS_H +#define MAGICKCORE_HAVE_LCMS_H 1 +#endif /* Define if you have the header file. */ /* #undef HAVE_LCMS_LCMS_H */ @@ -1163,7 +1167,9 @@ #endif /* Define if you have JBIG library */ -/* #undef JBIG_DELEGATE */ +#ifndef MAGICKCORE_JBIG_DELEGATE +#define MAGICKCORE_JBIG_DELEGATE 1 +#endif /* Define if you have JPEG version 2 "Jasper" library */ #ifndef MAGICKCORE_JP2_DELEGATE @@ -1192,7 +1198,9 @@ #endif /* Define if you have LQR library */ -/* #undef LQR_DELEGATE */ +#ifndef MAGICKCORE_LQR_DELEGATE +#define MAGICKCORE_LQR_DELEGATE 1 +#endif /* Define if using libltdl to support dynamically loadable modules */ #ifndef MAGICKCORE_LTDL_DELEGATE @@ -1204,7 +1212,7 @@ /* Define to the system default library search path. */ #ifndef MAGICKCORE_LT_DLSEARCH_PATH -#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib/llvm:/usr/lib64/llvm:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2" +#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/R/lib:/usr/lib64/atlas:/opt/modules/pkg/intel/f77/10.0.025/lib:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/xulrunner-2" #endif /* The archive extension */ @@ -1255,7 +1263,9 @@ /* #undef NO_MINUS_C_MINUS_O */ /* Define if you have OPENEXR library */ -/* #undef OPENEXR_DELEGATE */ +#ifndef MAGICKCORE_OPENEXR_DELEGATE +#define MAGICKCORE_OPENEXR_DELEGATE 1 +#endif /* Define to the address where bug reports for this package should be sent. */ #ifndef MAGICKCORE_PACKAGE_BUGREPORT @@ -1310,7 +1320,9 @@ #endif /* Define if you have RSVG library */ -/* #undef RSVG_DELEGATE */ +#ifndef MAGICKCORE_RSVG_DELEGATE +#define MAGICKCORE_RSVG_DELEGATE 1 +#endif /* Define to the type of arg 1 for `select'. */ #ifndef MAGICKCORE_SELECT_TYPE_ARG1 @@ -1447,7 +1459,9 @@ /* Define if you have WEBP library */ -/* #undef WEBP_DELEGATE */ +#ifndef MAGICKCORE_WEBP_DELEGATE +#define MAGICKCORE_WEBP_DELEGATE 1 +#endif /* Define to use the Windows GDI32 library */ /* #undef WINGDI32_DELEGATE */ @@ -1456,7 +1470,9 @@ /* #undef WITH_DMALLOC */ /* Define if you have WMF library */ -/* #undef WMF_DELEGATE */ +#ifndef MAGICKCORE_WMF_DELEGATE +#define MAGICKCORE_WMF_DELEGATE 1 +#endif /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ diff --git a/MagickCore/magick-type.h b/MagickCore/magick-type.h index 286626386..3da8f64d6 100644 --- a/MagickCore/magick-type.h +++ b/MagickCore/magick-type.h @@ -137,7 +137,7 @@ typedef MagickSizeType QuantumAny; typedef enum { - UndefinedChannel, + UndefinedChannel = 0x0000, RedChannel = 0x0001, GrayChannel = 0x0001, CyanChannel = 0x0001, @@ -147,17 +147,18 @@ typedef enum YellowChannel = 0x0004, AlphaChannel = 0x0008, OpacityChannel = 0x0008, - BlackChannel = 0x0020, + BlackChannel = 0x0010, + IndexChannel = 0x0020, CompositeChannels = 0x002F, AllChannels = ~0L, /* Special purpose channel types. */ TrueAlphaChannel = 0x0040, /* extract actual alpha channel from opacity */ - RGBChannels = 0x0080, /* set alpha from grayscale mask in RGB */ + RGBChannels = 0x0080, /* set alpha from grayscale mask in RGB */ GrayChannels = 0x0080, SyncChannels = 0x0100, /* channels should be modified equally */ - DefaultChannels = ((AllChannels | SyncChannels) &~ AlphaChannel) + DefaultChannels = ((AllChannels | SyncChannels) &~ AlphaChannel &! IndexChannel) } ChannelType; typedef enum diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c index b5c226256..057f5ce21 100644 --- a/MagickCore/pixel.c +++ b/MagickCore/pixel.c @@ -3607,7 +3607,7 @@ MagickExport void InitializePixelChannelMap(Image *image) image->number_channels+=image->number_meta_channels; for ( ; i < (ssize_t) image->number_channels; i++) SetPixelChannelMapTraits(image,(PixelChannel) i,CopyPixelTrait); - SetPixelChannelMap(image,image->channel_mask); +// SetPixelChannelMap(image,image->channel_mask); } /* diff --git a/MagickCore/version.h b/MagickCore/version.h index d9b76f821..5ee8f2358 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,14 +27,14 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2011 ImageMagick Studio LLC" -#define MagickSVNRevision "4982" +#define MagickSVNRevision "exported" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 5,0,0 #define MagickLibAddendum "-0" #define MagickLibInterface 5 #define MagickLibMinInterface 5 -#define MagickReleaseDate "2011-08-20" +#define MagickReleaseDate "2011-08-21" #define MagickChangeDate "20110801" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT)