(no commit message)

diff --git a/Makefile.in b/Makefile.in
index de434a7e7264b5570f233187d03dc8531f200706..9f72477320757025d66ee400f56ba507a2391b79 100644 (file)
--- 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 cf4134fba116eaa0258ff92eb3f67576da8127a0..57aba5440fb3fb4cd1916c2de6630e97afcd7375 100644 (file)
--- 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 f52fa07e844a4f25ee7ba212a5d1121d40644976..e93c91367d73efd6b7018cb14cb10885802e4efb 100644 (file)
--- 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 82750e4fb43a24dd09843c75c8bfecb456a25668..aba15fd7a0904a98c582995115d198cffb757235 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,17 +10,16 @@
   <configure name="VERSION" value="6.6.9"/>
   <configure name="LIB_VERSION" value="0x669"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,9,3"/>
-  <configure name="SVN_REVISION" value="4126" />
-  <configure name="RELEASE_DATE" value="2011-03-31"/>
+  <configure name="SVN_REVISION" value="4138" />
+  <configure name="RELEASE_DATE" value="2011-04-01"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
   <configure name="CONFIGURE_PATH" value="/usr/local/etc/ImageMagick/"/>
-  <configure name="SHARE_CONFIGURE_PATH" value="/usr/local/share/ImageMagick-6.6.9/config"/>
+  <configure name="SHARE_PATH" value="/usr/local/share/ImageMagick-6.6.9"/>
   <configure name="DOCUMENTATION_PATH" value="/usr/local/share/doc/ImageMagick-6.6.9/"/>
   <configure name="EXECUTABLE_PATH" value="/usr/local/bin"/>
   <configure name="LIBRARY_PATH" value="/usr/local/lib/ImageMagick-6.6.9"/>
-  <configure name="SHARE_PATH" value="/usr/local/share/ImageMagick-6.6.9"/>
   <configure name="CODER_PATH" value="/usr/local/lib/ImageMagick-6.6.9/modules-Q16/coders"/>
   <configure name="FILTER_PATH" value="/usr/local/lib/ImageMagick-6.6.9/modules-Q16/filters"/>
   <configure name="CC" value="gcc -std=gnu99 -std=gnu99"/>

diff --git a/config/configure.xml.in b/config/configure.xml.in
index fcee6ef07268fca4d2cb28d451108707a3ab487e..7300e21fe648afb08d88990c1a4a37e7410a2f33 100644 (file)
--- a/config/configure.xml.in
+++ b/config/configure.xml.in
@@ -16,11 +16,10 @@
   <configure name="PREFIX" value="@PREFIX_DIR@"/>
   <configure name="EXEC-PREFIX" value="@EXEC_PREFIX_DIR@"/>
   <configure name="CONFIGURE_PATH" value="@CONFIGURE_PATH@"/>
-  <configure name="SHARE_CONFIGURE_PATH" value="@SHARE_CONFIGURE_PATH@"/>
+  <configure name="SHARE_PATH" value="@SHARE_PATH@"/>
   <configure name="DOCUMENTATION_PATH" value="@DOCUMENTATION_PATH@"/>
   <configure name="EXECUTABLE_PATH" value="@EXECUTABLE_PATH@"/>
   <configure name="LIBRARY_PATH" value="@LIBRARY_PATH@"/>
-  <configure name="SHARE_PATH" value="@SHARE_PATH@"/>
   <configure name="CODER_PATH" value="@CODER_PATH@"/>
   <configure name="FILTER_PATH" value="@FILTER_PATH@"/>
   <configure name="CC" value="@CC@"/>

diff --git a/configure b/configure
index f12ff8d18e63252cb8d2664800b1acebf0935dd7..86bb0d317a700867bcc0af3d728151fbd3c69880 100755 (executable)
--- 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 a4a001daf78ac2b3571bf8f8acb59fb68769c81c..1a95b47c39e4eb09fb3f4ce26bc075fc2177b42c 100755 (executable)
--- 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 7fdfb45869660ea1e357ca6229e346f9f08304e0..cae5e08f35fa79bfb88f6fc85922681fef78962e 100644 (file)
--- 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 9506e3ccface0f9a4a1355024d8d0d05d84c0589..447c63830b915f2dec197d3d21562b7eda21c416 100644 (file)
--- 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 070f5bcf27d6811dbaf0ab1c149eca1aa6624e37..e60ba44c522d498f48f4e1e62dbdb766e20becc1 100644 (file)
--- 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 8d64fc3f93755b210b0e60788492ad376a9e7225..02ec8ea7edd0c2675596f69eb14753100307f10f 100644 (file)
--- 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 b04523e2e8141d1847acaef6a8a12ba7bcc39715..92e958e4505eac4dd958209bc84eefae0d3667d2 100644 (file)
--- 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)