From b0cd74717c256f172145c7dd482318c6718dff36 Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 11 Jan 2012 18:57:14 +0000 Subject: [PATCH] --- MagickCore/magick-config.h | 26 +++++++------------------- MagickCore/pixel-accessor.h | 7 ++----- MagickCore/version.h | 2 +- config/configure.xml | 2 +- 4 files changed, 11 insertions(+), 26 deletions(-) diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h index d618a68e8..3db76f669 100644 --- a/MagickCore/magick-config.h +++ b/MagickCore/magick-config.h @@ -12,9 +12,7 @@ /* #undef AUTOTRACE_DELEGATE */ /* Define if coders and filters are to be built as modules. */ -#ifndef MAGICKCORE_BUILD_MODULES -#define MAGICKCORE_BUILD_MODULES 1 -#endif +/* #undef BUILD_MODULES */ /* Define if you have the bzip2 library */ #ifndef MAGICKCORE_BZLIB_DELEGATE @@ -221,9 +219,7 @@ #endif /* Define to 1 if you have the header file. */ -#ifndef MAGICKCORE_HAVE_CL_CL_H -#define MAGICKCORE_HAVE_CL_CL_H 1 -#endif +/* #undef HAVE_CL_CL_H */ /* Define to 1 if you have the header file. */ #ifndef MAGICKCORE_HAVE_COMPLEX_H @@ -1192,9 +1188,7 @@ #endif /* Define if you have JBIG library */ -#ifndef MAGICKCORE_JBIG_DELEGATE -#define MAGICKCORE_JBIG_DELEGATE 1 -#endif +/* #undef JBIG_DELEGATE */ /* Define if you have JPEG version 2 "Jasper" library */ #ifndef MAGICKCORE_JP2_DELEGATE @@ -1235,7 +1229,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/R/lib:/usr/lib64/alliance/lib:/usr/lib64/atlas:/opt/modules/pkg/intel/f77/10.0.025/lib:/usr/lib64/kicad:/usr/lib/llvm:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mpich2/lib/:/usr/lib64/mysql:/usr/lib64/nvidia:/usr/lib64/openmotif:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tracker-0.12:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2" +#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib/llvm:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib64/tracker-0.12:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2" #endif /* The archive extension */ @@ -1289,9 +1283,7 @@ /* #undef NO_MINUS_C_MINUS_O */ /* Define if you have OPENEXR library */ -#ifndef MAGICKCORE_OPENEXR_DELEGATE -#define MAGICKCORE_OPENEXR_DELEGATE 1 -#endif +/* #undef OPENEXR_DELEGATE */ /* Name of package */ #ifndef MAGICKCORE_PACKAGE @@ -1361,9 +1353,7 @@ #endif /* Define if you have RSVG library */ -#ifndef MAGICKCORE_RSVG_DELEGATE -#define MAGICKCORE_RSVG_DELEGATE 1 -#endif +/* #undef RSVG_DELEGATE */ /* Define to the type of arg 1 for `select'. */ #ifndef MAGICKCORE_SELECT_TYPE_ARG1 @@ -1591,9 +1581,7 @@ /* #undef _MINIX */ /* Define this for the OpenCL Accelerator */ -#ifndef MAGICKCORE__OPENCL -#define MAGICKCORE__OPENCL 1 -#endif +/* #undef _OPENCL */ /* Define to 2 if the system does not provide POSIX.1 features except with this defined. */ diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h index b7dad262d..c5f4bcb36 100644 --- a/MagickCore/pixel-accessor.h +++ b/MagickCore/pixel-accessor.h @@ -197,11 +197,8 @@ static inline Quantum GetPixelIntensity(const Image *restrict image, const Quantum *restrict pixel) { #if !defined(MAGICKCORE_HDRI_SUPPORT) - if ((pixel[image->channel_map[RedPixelChannel].offset] == - pixel[image->channel_map[GreenPixelChannel].offset]) && - (pixel[image->channel_map[GreenPixelChannel].offset] == - pixel[image->channel_map[BluePixelChannel].offset])) - return(pixel[image->channel_map[RedPixelChannel].offset]); + if (image->colorspace == GRAYColorspace) + return(pixel[image->channel_map[GrayPixelChannel].offset]); return((Quantum) (0.299*pixel[image->channel_map[RedPixelChannel].offset]+ 0.587*pixel[image->channel_map[GreenPixelChannel].offset]+0.114* pixel[image->channel_map[BluePixelChannel].offset]+0.5)); diff --git a/MagickCore/version.h b/MagickCore/version.h index 785ef90de..f081398e1 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,7 +27,7 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2012 ImageMagick Studio LLC" -#define MagickSVNRevision "exported" +#define MagickSVNRevision "6328" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 7,0,0 diff --git a/config/configure.xml b/config/configure.xml index 2a3953037..ad928662a 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -11,7 +11,7 @@ - + -- 2.40.0