(no commit message)

diff --git a/MagickCore/feature.c b/MagickCore/feature.c
index fa1e9c5bfd3d10079959d8e9c3625b26f8368d85..e7b1031e9020e6d3fd5378dd517746081b4be583 100644 (file)
--- a/MagickCore/feature.c
+++ b/MagickCore/feature.c
@@ -2017,8 +2017,7 @@ MagickExport Image *HoughLineImage(const Image *image,const size_t width,
 %  The format of the MeanShiftImage method is:
 %
 %      Image *MeanShiftImage(const Image *image,const size_t width,
-%        const size_t height,const size_t shift,const size_t iterations,
-%        ExceptionInfo *exception)
+%        const size_t height,const double distance,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -2026,16 +2025,13 @@ MagickExport Image *HoughLineImage(const Image *image,const size_t width,
 %
 %    o width, height: find clusters as local maxima in this neighborhood.
 %
-%    o shift: the shift threshold.
-%
-%    o iterations: maximum iteration to find local maxima.
+%    o distance: the color distance.
 %
 %    o exception: return any errors or warnings in this structure.
 %
 */
 MagickExport Image *MeanShiftImage(const Image *image,const size_t width,
-  const size_t height,const size_t shift,const size_t iterations,
-  ExceptionInfo *exception)
+  const size_t height,const double shift,ExceptionInfo *exception)
 {
   return((Image *) NULL);
 }

diff --git a/MagickCore/feature.h b/MagickCore/feature.h
index 8e5e311dda471e685280226b5c73f0ea0cdbb52d..ed0a660798628bde91fde0fee34c5ba2f640ed68 100644 (file)
--- a/MagickCore/feature.h
+++ b/MagickCore/feature.h
@@ -52,8 +52,8 @@ extern MagickExport Image
     const double,ExceptionInfo *),
   *HoughLineImage(const Image *,const size_t,const size_t,const size_t,
     ExceptionInfo *),
-  *MeanShiftImage(const Image *,const size_t,const size_t,const size_t,
-    const size_t,ExceptionInfo *);
+  *MeanShiftImage(const Image *,const size_t,const size_t,const double,
+    ExceptionInfo *);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 9e057f5ac756afe8b68170d71a2cb8aed9538b46..e73a17d721320eb32e7c825ab05d4e1a887aac30 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2014 ImageMagick Studio LLC"
-#define MagickSVNRevision  "15511:15513"
+#define MagickSVNRevision  "15559M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0
@@ -48,7 +48,7 @@ extern "C" {
 #define MagickppLibAddendum  "-0"
 #define MagickppLibInterface  1
 #define MagickppLibMinInterface  1
-#define MagickReleaseDate  "2014-04-22"
+#define MagickReleaseDate  "2014-04-26"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index cb982b93a8095052cb25f94df9baaae6cae3fd06..7939dc87ca2810eecdbe3cfe9e386e8e4d8a0ff3 100644 (file)
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -2103,12 +2103,12 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
             flags=ParseGeometry(argv[i+1],&geometry_info);
             if ((flags & SigmaValue) == 0)
               geometry_info.sigma=geometry_info.rho;
-            if ((flags & PsiValue) == 0)
-              geometry_info.psi=3;
             if ((flags & XiValue) == 0)
-              geometry_info.xi=100;
+              geometry_info.xi=0.10*QuantumRange;
+            if ((flags & PercentValue) != 0)
+              geometry_info.xi=(double) QuantumRange*geometry_info.xi/100.0;
             mogrify_image=MeanShiftImage(*image,(size_t) geometry_info.rho,
-              (size_t) geometry_info.sigma,(size_t) geometry_info.xi,exception);
+              (size_t) geometry_info.sigma,geometry_info.xi,exception);
             break;
           }
         if (LocaleCompare("median",option+1) == 0)

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 96ad3327b31cfd24273f92ab6a7e4bb6c3d1d74b..54dc38261a49348e3252d6e2200a5ee57532a370 100644 (file)
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -2719,7 +2719,7 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand,
         {
           CLIWandWarnReplaced(IfNormalOp?"-alpha Set":"-alpha Off");
           (void) SetImageAlphaChannel(_image,IfNormalOp ? SetAlphaChannel :
-                         DeactivateAlphaChannel, _exception);
+            DeactivateAlphaChannel, _exception);
           break;
         }
       if (LocaleCompare("mean-shift",option+1) == 0)
@@ -2730,11 +2730,11 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand,
           if ((flags & SigmaValue) == 0)
             geometry_info.sigma=1.0;
           if ((flags & XiValue) == 0)
-            geometry_info.xi=3;
-          if ((flags & PsiValue) == 0)
-            geometry_info.psi10030;
-          new_image=MeanShiftImage(_image,geometry_info.rho,
-            geometry_info.sigma,geometry_info.xi,geometry_info.psi,_exception);
+            geometry_info.xi=0.10*QuantumRange;
+          if ((flags & PercentValue) != 0)
+            geometry_info.xi=(double) QuantumRange*geometry_info.xi/100.0;
+          new_image=MeanShiftImage(_image,(size_t) geometry_info.rho,
+            (size_t) geometry_info.sigma,geometry_info.xi,_exception);
           break;
         }
       if (LocaleCompare("median",option+1) == 0)

diff --git a/Makefile.in b/Makefile.in
index 67d5fafdee7423aa4a11d7261db4aa426a754af5..d0a1b1518031d8fa2a4370832fd8ef6e067f5730 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -565,13 +565,14 @@ am__MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURC
        coders/sun.c coders/svg.c coders/tga.c coders/thumbnail.c \
        coders/tile.c coders/tim.c coders/ttf.c coders/txt.c \
        coders/uil.c coders/url.c coders/uyvy.c coders/vicar.c \
-       coders/vid.c coders/viff.c coders/wbmp.c coders/wpg.c \
-       coders/xbm.c coders/xc.c coders/xcf.c coders/xpm.c \
-       coders/xps.c coders/ycbcr.c coders/yuv.c coders/dps.c \
-       coders/djvu.c coders/exr.c coders/fpx.c coders/clipboard.c \
-       coders/emf.c coders/jbig.c coders/jpeg.c coders/jp2.c \
-       coders/png.c coders/ept.c coders/tiff.c coders/webp.c \
-       coders/wmf.c coders/x.c coders/xwd.c filters/analyze.c
+       coders/vid.c coders/viff.c coders/vips.c coders/wbmp.c \
+       coders/wpg.c coders/xbm.c coders/xc.c coders/xcf.c \
+       coders/xpm.c coders/xps.c coders/ycbcr.c coders/yuv.c \
+       coders/dps.c coders/djvu.c coders/exr.c coders/fpx.c \
+       coders/clipboard.c coders/emf.c coders/jbig.c coders/jpeg.c \
+       coders/jp2.c coders/png.c coders/ept.c coders/tiff.c \
+       coders/webp.c coders/wmf.c coders/x.c coders/xwd.c \
+       filters/analyze.c
 am__objects_1 = MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-accelerate.lo \
        MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-animate.lo \
        MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-annotate.lo \
@@ -781,6 +782,7 @@ am__objects_16 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_
        coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-vicar.lo \
        coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-vid.lo \
        coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-viff.lo \
+       coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-vips.lo \
        coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-wbmp.lo \
        coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-wpg.lo \
        coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-xbm.lo \
@@ -1707,6 +1709,14 @@ coders_viff_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_CFLAGS) $(CFLAGS) $(coders_viff_la_LDFLAGS) $(LDFLAGS) -o \
        $@
 @WITH_MODULES_TRUE@am_coders_viff_la_rpath = -rpath $(codersdir)
+coders_vips_la_DEPENDENCIES = $(MAGICKCORE_LIBS)
+am_coders_vips_la_OBJECTS = coders/coders_vips_la-vips.lo
+coders_vips_la_OBJECTS = $(am_coders_vips_la_OBJECTS)
+coders_vips_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+       $(AM_CFLAGS) $(CFLAGS) $(coders_vips_la_LDFLAGS) $(LDFLAGS) -o \
+       $@
+@WITH_MODULES_TRUE@am_coders_vips_la_rpath = -rpath $(codersdir)
 coders_wbmp_la_DEPENDENCIES = $(MAGICKCORE_LIBS)
 am_coders_wbmp_la_OBJECTS = coders/coders_wbmp_la-wbmp.lo
 coders_wbmp_la_OBJECTS = $(am_coders_wbmp_la_OBJECTS)
@@ -2142,14 +2152,14 @@ SOURCES = $(Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_
        $(coders_uil_la_SOURCES) $(coders_url_la_SOURCES) \
        $(coders_uyvy_la_SOURCES) $(coders_vicar_la_SOURCES) \
        $(coders_vid_la_SOURCES) $(coders_viff_la_SOURCES) \
-       $(coders_wbmp_la_SOURCES) $(coders_webp_la_SOURCES) \
-       $(coders_wmf_la_SOURCES) $(coders_wpg_la_SOURCES) \
-       $(coders_x_la_SOURCES) $(coders_xbm_la_SOURCES) \
-       $(coders_xc_la_SOURCES) $(coders_xcf_la_SOURCES) \
-       $(coders_xpm_la_SOURCES) $(coders_xps_la_SOURCES) \
-       $(coders_xwd_la_SOURCES) $(coders_ycbcr_la_SOURCES) \
-       $(coders_yuv_la_SOURCES) $(filters_analyze_la_SOURCES) \
-       $(Magick___demo_analyze_SOURCES) \
+       $(coders_vips_la_SOURCES) $(coders_wbmp_la_SOURCES) \
+       $(coders_webp_la_SOURCES) $(coders_wmf_la_SOURCES) \
+       $(coders_wpg_la_SOURCES) $(coders_x_la_SOURCES) \
+       $(coders_xbm_la_SOURCES) $(coders_xc_la_SOURCES) \
+       $(coders_xcf_la_SOURCES) $(coders_xpm_la_SOURCES) \
+       $(coders_xps_la_SOURCES) $(coders_xwd_la_SOURCES) \
+       $(coders_ycbcr_la_SOURCES) $(coders_yuv_la_SOURCES) \
+       $(filters_analyze_la_SOURCES) $(Magick___demo_analyze_SOURCES) \
        $(Magick___demo_button_SOURCES) $(Magick___demo_demo_SOURCES) \
        $(Magick___demo_detrans_SOURCES) $(Magick___demo_flip_SOURCES) \
        $(Magick___demo_gravity_SOURCES) \
@@ -2232,14 +2242,14 @@ DIST_SOURCES = $(Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUF
        $(coders_uil_la_SOURCES) $(coders_url_la_SOURCES) \
        $(coders_uyvy_la_SOURCES) $(coders_vicar_la_SOURCES) \
        $(coders_vid_la_SOURCES) $(coders_viff_la_SOURCES) \
-       $(coders_wbmp_la_SOURCES) $(coders_webp_la_SOURCES) \
-       $(coders_wmf_la_SOURCES) $(coders_wpg_la_SOURCES) \
-       $(coders_x_la_SOURCES) $(coders_xbm_la_SOURCES) \
-       $(coders_xc_la_SOURCES) $(coders_xcf_la_SOURCES) \
-       $(coders_xpm_la_SOURCES) $(coders_xps_la_SOURCES) \
-       $(coders_xwd_la_SOURCES) $(coders_ycbcr_la_SOURCES) \
-       $(coders_yuv_la_SOURCES) $(filters_analyze_la_SOURCES) \
-       $(Magick___demo_analyze_SOURCES) \
+       $(coders_vips_la_SOURCES) $(coders_wbmp_la_SOURCES) \
+       $(coders_webp_la_SOURCES) $(coders_wmf_la_SOURCES) \
+       $(coders_wpg_la_SOURCES) $(coders_x_la_SOURCES) \
+       $(coders_xbm_la_SOURCES) $(coders_xc_la_SOURCES) \
+       $(coders_xcf_la_SOURCES) $(coders_xpm_la_SOURCES) \
+       $(coders_xps_la_SOURCES) $(coders_xwd_la_SOURCES) \
+       $(coders_ycbcr_la_SOURCES) $(coders_yuv_la_SOURCES) \
+       $(filters_analyze_la_SOURCES) $(Magick___demo_analyze_SOURCES) \
        $(Magick___demo_button_SOURCES) $(Magick___demo_demo_SOURCES) \
        $(Magick___demo_detrans_SOURCES) $(Magick___demo_flip_SOURCES) \
        $(Magick___demo_gravity_SOURCES) \
@@ -3233,6 +3243,7 @@ MAGICKCORE_CODER_SRCS = \
        coders/vicar.c \
        coders/vid.c \
        coders/viff.c \
+       coders/vips.c \
        coders/wbmp.c \
        coders/wpg.c \
        coders/xbm.c \
@@ -3356,6 +3367,7 @@ MAGICKCORE_CODER_SRCS = \
 @WITH_MODULES_TRUE@    coders/vicar.la \
 @WITH_MODULES_TRUE@    coders/vid.la \
 @WITH_MODULES_TRUE@    coders/viff.la \
+@WITH_MODULES_TRUE@    coders/vips.la \
 @WITH_MODULES_TRUE@    coders/wbmp.la \
 @WITH_MODULES_TRUE@    coders/wpg.la \
 @WITH_MODULES_TRUE@    coders/xbm.la \
@@ -4040,6 +4052,12 @@ coders_viff_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
 coders_viff_la_LDFLAGS = $(MODULECOMMONFLAGS)
 coders_viff_la_LIBADD = $(MAGICKCORE_LIBS)
 
+# VIPS coder module
+coders_vips_la_SOURCES = coders/vips.c
+coders_vips_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
+coders_vips_la_LDFLAGS = $(MODULECOMMONFLAGS)
+coders_vips_la_LIBADD = $(MAGICKCORE_LIBS)
+
 # WBMP coder module
 coders_wbmp_la_SOURCES = coders/wbmp.c
 coders_wbmp_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
@@ -5927,6 +5945,8 @@ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-vi
        coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp)
 coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-viff.lo:  \
        coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-vips.lo:  \
+       coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp)
 coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-wbmp.lo:  \
        coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp)
 coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-wpg.lo:  \
@@ -6619,6 +6639,11 @@ coders/coders_viff_la-viff.lo: coders/$(am__dirstamp) \
 
 coders/viff.la: $(coders_viff_la_OBJECTS) $(coders_viff_la_DEPENDENCIES) $(EXTRA_coders_viff_la_DEPENDENCIES) coders/$(am__dirstamp)
        $(AM_V_CCLD)$(coders_viff_la_LINK) $(am_coders_viff_la_rpath) $(coders_viff_la_OBJECTS) $(coders_viff_la_LIBADD) $(LIBS)
+coders/coders_vips_la-vips.lo: coders/$(am__dirstamp) \
+       coders/$(DEPDIR)/$(am__dirstamp)
+
+coders/vips.la: $(coders_vips_la_OBJECTS) $(coders_vips_la_DEPENDENCIES) $(EXTRA_coders_vips_la_DEPENDENCIES) coders/$(am__dirstamp)
+       $(AM_V_CCLD)$(coders_vips_la_LINK) $(am_coders_vips_la_rpath) $(coders_vips_la_OBJECTS) $(coders_vips_la_LIBADD) $(LIBS)
 coders/coders_wbmp_la-wbmp.lo: coders/$(am__dirstamp) \
        coders/$(DEPDIR)/$(am__dirstamp)
 
@@ -7310,6 +7335,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-vicar.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-vid.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-viff.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-vips.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-wbmp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-webp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-wmf.Plo@am__quote@
@@ -7433,6 +7459,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_vicar_la-vicar.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_vid_la-vid.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_viff_la-viff.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_vips_la-vips.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_wbmp_la-wbmp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_webp_la-webp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_wmf_la-wmf.Plo@am__quote@
@@ -8831,6 +8858,13 @@ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-vi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-viff.lo `test -f 'coders/viff.c' || echo '$(srcdir)/'`coders/viff.c
 
+coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-vips.lo: coders/vips.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-vips.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-vips.Tpo -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-vips.lo `test -f 'coders/vips.c' || echo '$(srcdir)/'`coders/vips.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-vips.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-vips.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='coders/vips.c' object='coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-vips.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-vips.lo `test -f 'coders/vips.c' || echo '$(srcdir)/'`coders/vips.c
+
 coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-wbmp.lo: coders/wbmp.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-wbmp.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-wbmp.Tpo -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-wbmp.lo `test -f 'coders/wbmp.c' || echo '$(srcdir)/'`coders/wbmp.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-wbmp.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-wbmp.Plo
@@ -9951,6 +9985,13 @@ coders/coders_viff_la-viff.lo: coders/viff.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_viff_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/coders_viff_la-viff.lo `test -f 'coders/viff.c' || echo '$(srcdir)/'`coders/viff.c
 
+coders/coders_vips_la-vips.lo: coders/vips.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_vips_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/coders_vips_la-vips.lo -MD -MP -MF coders/$(DEPDIR)/coders_vips_la-vips.Tpo -c -o coders/coders_vips_la-vips.lo `test -f 'coders/vips.c' || echo '$(srcdir)/'`coders/vips.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) coders/$(DEPDIR)/coders_vips_la-vips.Tpo coders/$(DEPDIR)/coders_vips_la-vips.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='coders/vips.c' object='coders/coders_vips_la-vips.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_vips_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/coders_vips_la-vips.lo `test -f 'coders/vips.c' || echo '$(srcdir)/'`coders/vips.c
+
 coders/coders_wbmp_la-wbmp.lo: coders/wbmp.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_wbmp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/coders_wbmp_la-wbmp.lo -MD -MP -MF coders/$(DEPDIR)/coders_wbmp_la-wbmp.Tpo -c -o coders/coders_wbmp_la-wbmp.lo `test -f 'coders/wbmp.c' || echo '$(srcdir)/'`coders/wbmp.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) coders/$(DEPDIR)/coders_wbmp_la-wbmp.Tpo coders/$(DEPDIR)/coders_wbmp_la-wbmp.Plo

diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index 8e8af9ef728c26698f5fd7763db5db27da054dd8..d488219fbc396fde465a5817d05f394ac21859ca 100644 (file)
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -552,7 +552,7 @@ static struct
       {"threshold", IntegerReference} } },
     { "MeanShift", { {"geometry", StringReference},
       {"width", IntegerReference}, {"height", IntegerReference},
-      {"shift", IntegerReference}, {"iterations", IntegerReference} } },
+      {"distance", RealReference} } },
   };
 
 static SplayTreeInfo
@@ -11169,10 +11169,10 @@ Mogrify(ref,...)
                 &geometry_info);
               if ((flags & SigmaValue) == 0)
                 geometry_info.sigma=geometry_info.rho;
-              if ((flags & PsiValue) == 0)
-                geometry_info.psi=3;
               if ((flags & XiValue) == 0)
-                geometry_info.xi=100;
+                geometry_info.xi=0.10*QuantumRange;
+              if ((flags & PercentValue) != 0)
+                geometry_info.xi=QuantumRange*geometry_info.xi/100.0;
             }
           if (attribute_flag[1] != 0)
             geometry_info.rho=(double) argument_list[1].integer_reference;
@@ -11181,7 +11181,7 @@ Mogrify(ref,...)
           if (attribute_flag[3] != 0)
             geometry_info.xi=(double) argument_list[3].integer_reference;
           image=MeanShiftImage(image,(size_t) geometry_info.rho,(size_t)
-            geometry_info.sigma,(size_t) geometry_info.xi,exception);
+            geometry_info.sigma,geometry_info.xi,exception);
           break;
         }
       }

diff --git a/PerlMagick/quantum/quantum.xs.in b/PerlMagick/quantum/quantum.xs.in
index c249599d72156a0d3022f45dac2d616b2fe94db6..4c4c19849dcc78ea184960d16a482c2e05ad613f 100644 (file)
--- a/PerlMagick/quantum/quantum.xs.in
+++ b/PerlMagick/quantum/quantum.xs.in
@@ -552,7 +552,7 @@ static struct
       {"threshold", IntegerReference} } },
     { "MeanShift", { {"geometry", StringReference},
       {"width", IntegerReference}, {"height", IntegerReference},
-      {"shift", IntegerReference}, {"iterations", IntegerReference} } },
+      {"double", RealReference} } },
   };
 
 static SplayTreeInfo
@@ -11169,10 +11169,8 @@ Mogrify(ref,...)
                 &geometry_info);
               if ((flags & SigmaValue) == 0)
                 geometry_info.sigma=geometry_info.rho;
-              if ((flags & PsiValue) == 0)
-                geometry_info.psi=3;
-              if ((flags & XiValue) == 0)
-                geometry_info.xi=100;
+              if ((flags & PercentValue) != 0)
+                geometry_info.xi=QuantumRange*geometry_info.xi/100.0;
             }
           if (attribute_flag[1] != 0)
             geometry_info.rho=(double) argument_list[1].integer_reference;
@@ -11181,7 +11179,7 @@ Mogrify(ref,...)
           if (attribute_flag[3] != 0)
             geometry_info.xi=(double) argument_list[3].integer_reference;
           image=MeanShiftImage(image,(size_t) geometry_info.rho,(size_t)
-            geometry_info.sigma,(size_t) geometry_info.xi,exception);
+            geometry_info.sigma,geometry_info.xi,exception);
           break;
         }
       }

diff --git a/coders/Makefile.am b/coders/Makefile.am
index 276383e0bcb44f4a6fbe480a2478288b3b4eb383..e686bb9853bd00a291dec28d3e28232a1df11574 100644 (file)
--- a/coders/Makefile.am
+++ b/coders/Makefile.am
@@ -182,6 +182,7 @@ MAGICKCORE_CODER_SRCS = \
        coders/vicar.c \
        coders/vid.c \
        coders/viff.c \
+       coders/vips.c \
        coders/wbmp.c \
        coders/wpg.c \
        coders/xbm.c \
@@ -305,6 +306,7 @@ coders_LTLIBRARIES = \
        coders/vicar.la \
        coders/vid.la \
        coders/viff.la \
+       coders/vips.la \
        coders/wbmp.la \
        coders/wpg.la \
        coders/xbm.la \
@@ -991,6 +993,12 @@ coders_viff_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)
 coders_viff_la_LDFLAGS     = $(MODULECOMMONFLAGS)
 coders_viff_la_LIBADD      = $(MAGICKCORE_LIBS)
 
+# VIPS coder module
+coders_vips_la_SOURCES     = coders/vips.c
+coders_vips_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)
+coders_vips_la_LDFLAGS     = $(MODULECOMMONFLAGS)
+coders_vips_la_LIBADD      = $(MAGICKCORE_LIBS)
+
 # WBMP coder module
 coders_wbmp_la_SOURCES     = coders/wbmp.c
 coders_wbmp_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)

diff --git a/configure b/configure
index 3297b32036edc444d90ade0675bde839ed8c90ae..3ab1a75d2f2f216196402405be9b9102eee319aa 100755 (executable)
--- a/configure
+++ b/configure
@@ -3697,7 +3697,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=15511:15513
+MAGICK_SVN_REVISION=15559M
 
 
 # Substitute library versioning