From 4f82071d54d227f935cf83c505d098d1bcb23b6a Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 1 Apr 2011 12:35:43 +0000 Subject: [PATCH] --- Makefile.in | 3 +-- config/Makefile.am | 2 +- config/config.h.in | 7 ++----- config/configure.xml | 7 +++---- config/configure.xml.in | 3 +-- configure | 34 ++++++++-------------------------- configure.ac | 27 +++++++-------------------- magick/configure.c | 21 +++++++++------------ magick/deprecate.c | 2 +- magick/fx.c | 17 +++++++++++++---- magick/magick-config.h | 13 ++++--------- magick/version.h | 4 ++-- 12 files changed, 52 insertions(+), 88 deletions(-) diff --git a/Makefile.in b/Makefile.in index de434a7e7..9f7247732 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2504,7 +2504,6 @@ SCANDecodeDelegate = @SCANDecodeDelegate@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDSTATE_DIR = @SHAREDSTATE_DIR@ -SHARE_CONFIGURE_PATH = @SHARE_CONFIGURE_PATH@ SHARE_PATH = @SHARE_PATH@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -2740,7 +2739,7 @@ M4_EXTRA_DIST = \ # Where architecture-independent configuration files get installed # (share/ImageMagick-version) -configsharedir = $(SHARE_CONFIGURE_PATH) +configsharedir = $(SHARE_PATH) configshare_DATA = \ config/configure.xml \ config/english.xml \ diff --git a/config/Makefile.am b/config/Makefile.am index cf4134fba..57aba5440 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -16,7 +16,7 @@ # Where architecture-independent configuration files get installed # (share/ImageMagick-version) -configsharedir = $(SHARE_CONFIGURE_PATH) +configsharedir = $(SHARE_PATH) configshare_DATA = \ config/configure.xml \ config/english.xml \ diff --git a/config/config.h.in b/config/config.h.in index f52fa07e8..e93c91367 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -822,14 +822,11 @@ #undef SELECT_TYPE_ARG5 /* Directory where architecture-independent configuration files live. */ -#undef SHARE_CONFIGURE_PATH +#undef SHARE_PATH /* Subdirectory of lib where architecture-independent configuration files live. */ -#undef SHARE_CONFIGURE_RELATIVE_PATH - -/* Directory where architecture-independent files live. */ -#undef SHARE_PATH +#undef SHARE_RELATIVE_PATH /* The size of `off_t', as computed by sizeof. */ #undef SIZEOF_OFF_T diff --git a/config/configure.xml b/config/configure.xml index 82750e4fb..aba15fd7a 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,17 +10,16 @@ - - + + - + - diff --git a/config/configure.xml.in b/config/configure.xml.in index fcee6ef07..7300e21fe 100644 --- a/config/configure.xml.in +++ b/config/configure.xml.in @@ -16,11 +16,10 @@ - + - diff --git a/configure b/configure index f12ff8d18..86bb0d317 100755 --- a/configure +++ b/configure @@ -721,9 +721,8 @@ BrowseDelegate BZIPDelegate BlenderDecodeDelegate AutotraceDecodeDelegate -SHARE_CONFIGURE_PATH -CONFIGURE_PATH SHARE_PATH +CONFIGURE_PATH DOCUMENTATION_PATH FILTER_PATH CODER_PATH @@ -3451,7 +3450,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE` MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE -MAGICK_SVN_REVISION=4126 +MAGICK_SVN_REVISION=4138 @@ -30444,23 +30443,6 @@ _ACEOF -# -# Path to ImageMagick share files -SHARE_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}" -SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}" -DEFINE_SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}/" -case "${build_os}" in - mingw* ) - DEFINE_SHARE_PATH=`$WinPathScript "$DEFINE_SHARE_PATH" 1` - ;; -esac - -cat >>confdefs.h <<_ACEOF -#define SHARE_PATH "$DEFINE_SHARE_PATH" -_ACEOF - - - # Subdirectory to place ImageMagick configuration files CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}" @@ -30483,22 +30465,22 @@ _ACEOF # Subdirectory to place ImageMagick configuration files -SHARE_CONFIGURE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/config" +SHARE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}" cat >>confdefs.h <<_ACEOF -#define SHARE_CONFIGURE_RELATIVE_PATH "$SHARE_CONFIGURE_RELATIVE_PATH" +#define SHARE_RELATIVE_PATH "$SHARE_RELATIVE_PATH" _ACEOF -SHARE_CONFIGURE_PATH="${DATA_DIR}/${SHARE_CONFIGURE_RELATIVE_PATH}" -DEFINE_SHARE_CONFIGURE_PATH="${DATA_DIR}/${SHARE_CONFIGURE_RELATIVE_PATH}/" +SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}" +DEFINE_SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}/" case "${build_os}" in mingw* ) - DEFINE_SHARE_CONFIGURE_PATH=`$WinPathScript "$DEFINE_SHARE_CONFIGURE_PATH" 1` + DEFINE_SHARE_PATH=`$WinPathScript "$DEFINE_SHARE_PATH" 1` ;; esac cat >>confdefs.h <<_ACEOF -#define SHARE_CONFIGURE_PATH "$DEFINE_SHARE_CONFIGURE_PATH" +#define SHARE_PATH "$DEFINE_SHARE_PATH" _ACEOF diff --git a/configure.ac b/configure.ac index a4a001daf..1a95b47c3 100755 --- a/configure.ac +++ b/configure.ac @@ -2751,19 +2751,6 @@ esac AC_DEFINE_UNQUOTED(DOCUMENTATION_PATH,"$DEFINE_DOCUMENTATION_PATH",Directory where ImageMagick documents live.) AC_SUBST(DOCUMENTATION_PATH) -# -# Path to ImageMagick share files -SHARE_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}" -SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}" -DEFINE_SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}/" -case "${build_os}" in - mingw* ) - DEFINE_SHARE_PATH=`$WinPathScript "$DEFINE_SHARE_PATH" 1` - ;; -esac -AC_DEFINE_UNQUOTED(SHARE_PATH,"$DEFINE_SHARE_PATH",Directory where architecture-independent files live.) -AC_SUBST(SHARE_PATH) - # Subdirectory to place ImageMagick configuration files CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}" AC_DEFINE_UNQUOTED(CONFIGURE_RELATIVE_PATH,"$CONFIGURE_RELATIVE_PATH",Subdirectory of lib where architecture-dependent configuration files live.) @@ -2778,17 +2765,17 @@ AC_DEFINE_UNQUOTED(CONFIGURE_PATH,"$DEFINE_CONFIGURE_PATH",Directory where archi AC_SUBST(CONFIGURE_PATH) # Subdirectory to place ImageMagick configuration files -SHARE_CONFIGURE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/config" -AC_DEFINE_UNQUOTED(SHARE_CONFIGURE_RELATIVE_PATH,"$SHARE_CONFIGURE_RELATIVE_PATH",Subdirectory of lib where architecture-independent configuration files live.) -SHARE_CONFIGURE_PATH="${DATA_DIR}/${SHARE_CONFIGURE_RELATIVE_PATH}" -DEFINE_SHARE_CONFIGURE_PATH="${DATA_DIR}/${SHARE_CONFIGURE_RELATIVE_PATH}/" +SHARE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}" +AC_DEFINE_UNQUOTED(SHARE_RELATIVE_PATH,"$SHARE_RELATIVE_PATH",Subdirectory of lib where architecture-independent configuration files live.) +SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}" +DEFINE_SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}/" case "${build_os}" in mingw* ) - DEFINE_SHARE_CONFIGURE_PATH=`$WinPathScript "$DEFINE_SHARE_CONFIGURE_PATH" 1` + DEFINE_SHARE_PATH=`$WinPathScript "$DEFINE_SHARE_PATH" 1` ;; esac -AC_DEFINE_UNQUOTED(SHARE_CONFIGURE_PATH,"$DEFINE_SHARE_CONFIGURE_PATH",Directory where architecture-independent configuration files live.) -AC_SUBST(SHARE_CONFIGURE_PATH) +AC_DEFINE_UNQUOTED(SHARE_PATH,"$DEFINE_SHARE_PATH",Directory where architecture-independent configuration files live.) +AC_SUBST(SHARE_PATH) # # program_transform_name is formed for use in a Makefile, so create a diff --git a/magick/configure.c b/magick/configure.c index 7fdfb4586..cae5e08f3 100644 --- a/magick/configure.c +++ b/magick/configure.c @@ -663,9 +663,9 @@ MagickExport LinkedListInfo *GetConfigurePaths(const char *filename, } } #if defined(MAGICKCORE_INSTALLED_SUPPORT) -#if defined(MAGICKCORE_SHARE_CONFIGURE_PATH) +#if defined(MAGICKCORE_SHARE_PATH) (void) AppendValueToLinkedList(paths,ConstantString( - MAGICKCORE_SHARE_CONFIGURE_PATH)); + MAGICKCORE_SHARE_PATH)); #endif #if defined(MAGICKCORE_CONFIGURE_PATH) (void) AppendValueToLinkedList(paths,ConstantString( @@ -675,10 +675,7 @@ MagickExport LinkedListInfo *GetConfigurePaths(const char *filename, (void) AppendValueToLinkedList(paths,ConstantString( MAGICKCORE_DOCUMENTATION_PATH)); #endif -#if defined(MAGICKCORE_SHARE_PATH) - (void) AppendValueToLinkedList(paths,ConstantString(MAGICKCORE_SHARE_PATH)); -#endif -#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !(defined(MAGICKCORE_CONFIGURE_PATH) || defined(MAGICKCORE_SHARE_CONFIGURE_PATH)) +#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !(defined(MAGICKCORE_CONFIGURE_PATH) || defined(MAGICKCORE_SHARE_PATH)) { char *registry_key; @@ -716,11 +713,11 @@ MagickExport LinkedListInfo *GetConfigurePaths(const char *filename, DirectorySeparator); (void) AppendValueToLinkedList(paths,ConstantString(path)); #else - (void) FormatMagickString(path,MaxTextExtent,"%s/lib/%s/",home, + (void) FormatMagickString(path,MaxTextExtent,"%s/etc/%s/",home, MAGICKCORE_CONFIGURE_RELATIVE_PATH); (void) AppendValueToLinkedList(paths,ConstantString(path)); (void) FormatMagickString(path,MaxTextExtent,"%s/share/%s/",home, - MAGICKCORE_SHARE_CONFIGURE_RELATIVE_PATH); + MAGICKCORE_SHARE_RELATIVE_PATH); (void) AppendValueToLinkedList(paths,ConstantString(path)); #endif home=DestroyString(home); @@ -741,12 +738,12 @@ MagickExport LinkedListInfo *GetConfigurePaths(const char *filename, */ (void) CopyMagickString(prefix,GetClientPath(),MaxTextExtent); ChopPathComponents(prefix,1); - (void) FormatMagickString(path,MaxTextExtent,"%s/share/%s/",prefix, - MAGICKCORE_SHARE_CONFIGURE_RELATIVE_PATH); - (void) AppendValueToLinkedList(paths,ConstantString(path)); - (void) FormatMagickString(path,MaxTextExtent,"%s/lib/%s/",prefix, + (void) FormatMagickString(path,MaxTextExtent,"%s/etc/%s/",prefix, MAGICKCORE_CONFIGURE_RELATIVE_PATH); (void) AppendValueToLinkedList(paths,ConstantString(path)); + (void) FormatMagickString(path,MaxTextExtent,"%s/share/%s/",prefix, + MAGICKCORE_SHARE_RELATIVE_PATH); + (void) AppendValueToLinkedList(paths,ConstantString(path)); #endif } /* diff --git a/magick/deprecate.c b/magick/deprecate.c index 9506e3ccf..447c63830 100644 --- a/magick/deprecate.c +++ b/magick/deprecate.c @@ -2253,7 +2253,7 @@ MagickExport void *GetConfigureBlob(const char *filename,char *path, blob=FileToBlob(path,~0,length,exception); } #endif -#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !(defined(MAGICKCORE_CONFIGURE_PATH) || defined(MAGICKCORE_SHARE_CONFIGURE_PATH)) +#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !(defined(MAGICKCORE_CONFIGURE_PATH) || defined(MAGICKCORE_SHARE_PATH)) if (blob == (void *) NULL) { char diff --git a/magick/fx.c b/magick/fx.c index 070f5bcf2..e60ba44c5 100644 --- a/magick/fx.c +++ b/magick/fx.c @@ -1310,6 +1310,9 @@ static MagickRealType FxGetSymbol(FxInfo *fx_info,const ChannelType channel, Image *image; + InterpolatePixelMethod + interpolate_method; + MagickPixelPacket pixel; @@ -1443,8 +1446,10 @@ static MagickRealType FxGetSymbol(FxInfo *fx_info,const ChannelType channel, "NoSuchImage","`%s'",expression); return(0.0); } - (void) InterpolateMagickPixelPacket(image,fx_info->view[i], - NearestNeighborInterpolatePixel,point.x,point.y,&pixel,exception); + interpolate_method=image->interpolate == UndefinedInterpolatePixel ? + NearestNeighborInterpolatePixel : image->interpolate; + (void) InterpolateMagickPixelPacket(image,fx_info->view[i],interpolate_method, + point.x,point.y,&pixel,exception); if ((strlen(p) > 2) && (LocaleCompare(p,"intensity") != 0) && (LocaleCompare(p,"luminance") != 0) && @@ -1499,9 +1504,13 @@ static MagickRealType FxGetSymbol(FxInfo *fx_info,const ChannelType channel, case BlueChannel: return(QuantumScale*pixel.blue); case OpacityChannel: { + MagickRealType + alpha; + if (pixel.matte == MagickFalse) return(1.0); - return((MagickRealType) (QuantumScale*GetAlphaPixelComponent(&pixel))); + alpha=(MagickRealType) (QuantumScale*GetAlphaPixelComponent(&pixel)); + return(alpha); } case IndexChannel: { @@ -1514,7 +1523,7 @@ static MagickRealType FxGetSymbol(FxInfo *fx_info,const ChannelType channel, } return(QuantumScale*pixel.index); } - case DefaultChannels: + case DefaultChannels: { return(QuantumScale*MagickPixelIntensityToQuantum(&pixel)); } diff --git a/magick/magick-config.h b/magick/magick-config.h index 8d64fc3f9..02ec8ea7e 100644 --- a/magick/magick-config.h +++ b/magick/magick-config.h @@ -1235,19 +1235,14 @@ #endif /* Directory where architecture-independent configuration files live. */ -#ifndef MAGICKCORE_SHARE_CONFIGURE_PATH -#define MAGICKCORE_SHARE_CONFIGURE_PATH "/usr/local/share/ImageMagick-6.6.9/config/" +#ifndef MAGICKCORE_SHARE_PATH +#define MAGICKCORE_SHARE_PATH "/usr/local/share/ImageMagick-6.6.9/" #endif /* Subdirectory of lib where architecture-independent configuration files live. */ -#ifndef MAGICKCORE_SHARE_CONFIGURE_RELATIVE_PATH -#define MAGICKCORE_SHARE_CONFIGURE_RELATIVE_PATH "ImageMagick-6.6.9/config" -#endif - -/* Directory where architecture-independent files live. */ -#ifndef MAGICKCORE_SHARE_PATH -#define MAGICKCORE_SHARE_PATH "/usr/local/share/ImageMagick-6.6.9/" +#ifndef MAGICKCORE_SHARE_RELATIVE_PATH +#define MAGICKCORE_SHARE_RELATIVE_PATH "ImageMagick-6.6.9" #endif /* The size of `off_t', as computed by sizeof. */ diff --git a/magick/version.h b/magick/version.h index b04523e2e..92e958e45 100644 --- a/magick/version.h +++ b/magick/version.h @@ -27,14 +27,14 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2011 ImageMagick Studio LLC" -#define MagickSVNRevision "4126" +#define MagickSVNRevision "4138" #define MagickLibVersion 0x669 #define MagickLibVersionText "6.6.9" #define MagickLibVersionNumber 4,0,1 #define MagickLibAddendum "-3" #define MagickLibInterface 4 #define MagickLibMinInterface 4 -#define MagickReleaseDate "2011-03-31" +#define MagickReleaseDate "2011-04-01" #define MagickChangeDate "20110331" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) -- 2.49.0