From: cristy Date: Fri, 20 Nov 2009 03:14:08 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~10361 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=701db3105315e7d7d9cf2734ae94524c6bc38e80;p=imagemagick --- diff --git a/ImageMagick.spec b/ImageMagick.spec index 4538c836c..6e91139ad 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %define VERSION 6.5.7 -%define Patchlevel 9 +%define Patchlevel 10 Name: ImageMagick Version: %{VERSION} diff --git a/Makefile.in b/Makefile.in index 3687e9840..5b87bb189 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1350,14 +1350,15 @@ am__magick_libMagickCore_la_SOURCES_DIST = magick/ImageMagick.h \ magick/memory_.h magick/methods.h magick/mime.c magick/mime.h \ magick/module.c magick/module.h magick/monitor.c \ magick/monitor.h magick/monitor-private.h magick/montage.c \ - magick/montage.h magick/nt-base.h magick/nt-feature.h \ - magick/option.c magick/option.h magick/paint.c magick/paint.h \ - magick/pixel.c magick/pixel.h magick/pixel-private.h \ - magick/policy.c magick/policy.h magick/PreRvIcccm.c \ - magick/PreRvIcccm.h magick/prepress.c magick/prepress.h \ - magick/property.c magick/property.h magick/profile.c \ - magick/profile.h magick/quantize.c magick/quantize.h \ - magick/quantum.c magick/quantum.h magick/quantum-export.c \ + magick/montage.h magick/morphology.c magick/morphology.h \ + magick/nt-base.h magick/nt-feature.h magick/option.c \ + magick/option.h magick/paint.c magick/paint.h magick/pixel.c \ + magick/pixel.h magick/pixel-private.h magick/policy.c \ + magick/policy.h magick/PreRvIcccm.c magick/PreRvIcccm.h \ + magick/prepress.c magick/prepress.h magick/property.c \ + magick/property.h magick/profile.c magick/profile.h \ + magick/quantize.c magick/quantize.h magick/quantum.c \ + magick/quantum.h magick/quantum-export.c \ magick/quantum-import.c magick/quantum-private.h \ magick/random.c magick/random_.h magick/random-private.h \ magick/registry.c magick/registry.h magick/resample.c \ @@ -1455,6 +1456,7 @@ am__objects_2 = magick/magick_libMagickCore_la-animate.lo \ magick/magick_libMagickCore_la-module.lo \ magick/magick_libMagickCore_la-monitor.lo \ magick/magick_libMagickCore_la-montage.lo \ + magick/magick_libMagickCore_la-morphology.lo \ magick/magick_libMagickCore_la-option.lo \ magick/magick_libMagickCore_la-paint.lo \ magick/magick_libMagickCore_la-pixel.lo \ @@ -3801,6 +3803,8 @@ MAGICK_BASE_SRCS = \ magick/monitor-private.h \ magick/montage.c \ magick/montage.h \ + magick/morphology.c \ + magick/morphology.h \ magick/nt-base.h \ magick/nt-feature.h \ magick/option.c \ @@ -3953,6 +3957,7 @@ MAGICK_INCLUDE_HDRS = \ magick/module.h \ magick/monitor.h \ magick/montage.h \ + magick/morphology.h \ magick/option.h \ magick/paint.h \ magick/pixel.h \ @@ -5493,6 +5498,8 @@ magick/magick_libMagickCore_la-monitor.lo: magick/$(am__dirstamp) \ magick/$(DEPDIR)/$(am__dirstamp) magick/magick_libMagickCore_la-montage.lo: magick/$(am__dirstamp) \ magick/$(DEPDIR)/$(am__dirstamp) +magick/magick_libMagickCore_la-morphology.lo: magick/$(am__dirstamp) \ + magick/$(DEPDIR)/$(am__dirstamp) magick/magick_libMagickCore_la-option.lo: magick/$(am__dirstamp) \ magick/$(DEPDIR)/$(am__dirstamp) magick/magick_libMagickCore_la-paint.lo: magick/$(am__dirstamp) \ @@ -6772,6 +6779,8 @@ mostlyclean-compile: -rm -f magick/magick_libMagickCore_la-monitor.lo -rm -f magick/magick_libMagickCore_la-montage.$(OBJEXT) -rm -f magick/magick_libMagickCore_la-montage.lo + -rm -f magick/magick_libMagickCore_la-morphology.$(OBJEXT) + -rm -f magick/magick_libMagickCore_la-morphology.lo -rm -f magick/magick_libMagickCore_la-nt-base.$(OBJEXT) -rm -f magick/magick_libMagickCore_la-nt-base.lo -rm -f magick/magick_libMagickCore_la-nt-feature.$(OBJEXT) @@ -7233,6 +7242,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-module.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-monitor.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-montage.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-morphology.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-nt-base.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-nt-feature.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-option.Plo@am__quote@ @@ -8701,6 +8711,14 @@ magick/magick_libMagickCore_la-montage.lo: magick/montage.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-montage.lo `test -f 'magick/montage.c' || echo '$(srcdir)/'`magick/montage.c +magick/magick_libMagickCore_la-morphology.lo: magick/morphology.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-morphology.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-morphology.Tpo -c -o magick/magick_libMagickCore_la-morphology.lo `test -f 'magick/morphology.c' || echo '$(srcdir)/'`magick/morphology.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-morphology.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-morphology.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/morphology.c' object='magick/magick_libMagickCore_la-morphology.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-morphology.lo `test -f 'magick/morphology.c' || echo '$(srcdir)/'`magick/morphology.c + magick/magick_libMagickCore_la-option.lo: magick/option.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-option.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-option.Tpo -c -o magick/magick_libMagickCore_la-option.lo `test -f 'magick/option.c' || echo '$(srcdir)/'`magick/option.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-option.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-option.Plo diff --git a/config/configure.xml b/config/configure.xml index 8dbe6d784..69b989ffa 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,7 +8,7 @@ - + diff --git a/index.html b/index.html index e43979d99..a8c8fd1a5 100644 --- a/index.html +++ b/index.html @@ -124,7 +124,7 @@
diff --git a/libtool b/libtool index 7f31ab635..ddf407e1a 100755 --- a/libtool +++ b/libtool @@ -1,7 +1,7 @@ #! /bin/sh # libtool - Provide generalized library-building support services. -# Generated automatically by config.status (ImageMagick) 6.5.7-9 +# Generated automatically by config.status (ImageMagick) 6.5.7-10 # Libtool was configured on host magick.imagemagick.org: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff --git a/magick/Make.com b/magick/Make.com index c62d96a98..c694e3e14 100644 --- a/magick/Make.com +++ b/magick/Make.com @@ -68,6 +68,7 @@ $call Make mime.c $call Make module.c $call Make monitor.c $call Make montage.c +$call Make morphology.c $call Make option.c $call Make paint.c $call Make pixel.c @@ -136,9 +137,9 @@ $library/create libMagick.olb - configure, constitute, decorate, delegate, deprecate, display, distort, - draw, effect, enhance, exception, fx, gem, geometry, hashmap, histogram, - identify, image, layer, list, locale, log, magic, magick, matrix, memory, - - mime, module, monitor, montage, option, paint, pixel, PreRvIcccm, profile, - - quantize, quantum,quantum-export,quantum-import,random, registry, resample, - - resize, resource, segment, semaphore, - + mime, module, monitor, montage, morphology, option, paint, pixel, - + PreRvIcccm, profile, quantize, quantum, quantum-export, quantum-import, - + random, registry, resample, resize, resource, segment, semaphore, - shear, signature, splay-tree, static, stream, string, thread, timer, token, - transform, threshold, type, utility, version, vms, widget, xwindow, - statistic, prepress, property, xml-tree, - diff --git a/magick/Makefile.am b/magick/Makefile.am index 525be0a22..9799ce472 100644 --- a/magick/Makefile.am +++ b/magick/Makefile.am @@ -167,6 +167,8 @@ MAGICK_BASE_SRCS = \ magick/monitor-private.h \ magick/montage.c \ magick/montage.h \ + magick/morphology.c \ + magick/morphology.h \ magick/nt-base.h \ magick/nt-feature.h \ magick/option.c \ @@ -324,6 +326,7 @@ MAGICK_INCLUDE_HDRS = \ magick/module.h \ magick/monitor.h \ magick/montage.h \ + magick/morphology.h \ magick/option.h \ magick/paint.h \ magick/pixel.h \ diff --git a/magick/morphology.c b/magick/morphology.c new file mode 100644 index 000000000..4fa4df2a4 --- /dev/null +++ b/magick/morphology.c @@ -0,0 +1,61 @@ +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % +% M M OOO RRRR PPPP H H OOO L OOO GGGG Y Y % +% MM MM O O R R P P H H O O L O O G Y Y % +% M M M O O RRRR PPPP HHHHH O O L O O G GGG Y % +% M M O O R R P H H O O L O O G G Y % +% M M OOO R R P H H OOO LLLLL OOO GGG Y % +% % +% % +% MagickCore Morphology Methods % +% % +% Software Design % +% Anthony Thyssen % +% September 2009 % +% % +% % +% Copyright 1999-2009 ImageMagick Studio LLC, a non-profit organization % +% dedicated to making software imaging solutions freely available. % +% % +% You may not use this file except in compliance with the License. You may % +% obtain a copy of the License at % +% % +% http://www.imagemagick.org/script/license.php % +% % +% Unless required by applicable law or agreed to in writing, software % +% distributed under the License is distributed on an "AS IS" BASIS, % +% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. % +% See the License for the specific language governing permissions and % +% limitations under the License. % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% +*/ + +/* + Include declarations. +*/ +#include "magick/studio.h" +#include "magick/cache-view.h" +#include "magick/color-private.h" +#include "magick/enhance.h" +#include "magick/exception.h" +#include "magick/exception-private.h" +#include "magick/hashmap.h" +#include "magick/image.h" +#include "magick/list.h" +#include "magick/memory_.h" +#include "magick/monitor-private.h" +#include "magick/morphology.h" +#include "magick/pixel-private.h" +#include "magick/prepress.h" +#include "magick/quantize.h" +#include "magick/registry.h" +#include "magick/semaphore.h" +#include "magick/splay-tree.h" +#include "magick/statistic.h" +#include "magick/string_.h" diff --git a/magick/morphology.h b/magick/morphology.h new file mode 100644 index 000000000..959821b3c --- /dev/null +++ b/magick/morphology.h @@ -0,0 +1,29 @@ +/* + Copyright 1999-2009 ImageMagick Studio LLC, a non-profit organization + dedicated to making software imaging solutions freely available. + + You may not use this file except in compliance with the License. + obtain a copy of the License at + + http://www.imagemagick.org/script/license.php + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + MagickCore morphology methods. +*/ +#ifndef _MAGICKCORE_MORPHOLOGY_H +#define _MAGICKCORE_MORPHOLOGY_H + +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + +#if defined(__cplusplus) || defined(c_plusplus) +} +#endif + +#endif diff --git a/magick/version.h b/magick/version.h index eedb6c29b..1149df33c 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,7 +30,7 @@ extern "C" { #define MagickLibVersion 0x657 #define MagickLibVersionText "6.5.7" #define MagickLibVersionNumber 2,0,1 -#define MagickLibSubversion "-9" +#define MagickLibSubversion "-10" #define MagickReleaseDate "2009-11-19" #define MagickChangeDate "20091118" #define MagickAuthoritativeURL "http://www.imagemagick.org" diff --git a/version.sh b/version.sh index a2115df00..1a580f241 100644 --- a/version.sh +++ b/version.sh @@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick' # PACKAGE_NAME (e.g. "1.0.0"). PACKAGE_VERSION='6.5.7' PACKAGE_LIB_VERSION="0x657" -PACKAGE_RELEASE="9" +PACKAGE_RELEASE="10" PACKAGE_LIB_VERSION_NUMBER="6,5,7,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html index 4641e674b..7b54fc432 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -602,7 +602,7 @@ Options used to compile and link: Discourse Server • Mailing Lists • - Studio + Studio  
diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html index 4db450395..98ee8d8b1 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -124,7 +124,7 @@
diff --git a/www/animate.html b/www/animate.html index ee6144ea0..1ddda7cab 100644 --- a/www/animate.html +++ b/www/animate.html @@ -125,7 +125,7 @@
diff --git a/www/api.html b/www/api.html index 9446bd748..377ebf1a5 100644 --- a/www/api.html +++ b/www/api.html @@ -123,9 +123,6 @@ Sponsors:
- @@ -163,7 +160,7 @@

Ada

-

G2F implements an Ada 95 binding to a subset of the low-level MagickCore library.

+

G2F implements an Ada 95 binding to a subset of the low-level MagickCore library.

C

@@ -175,7 +172,7 @@

Ch

-

ChMagick is a Ch binding to the MagickCore and MagickWand API. Ch is an embeddable C/C++ interpreter for cross-platform scripting.

+

ChMagick is a Ch binding to the MagickCore and MagickWand API. Ch is an embeddable C/C++ interpreter for cross-platform scripting.

COM+

@@ -187,31 +184,31 @@

C++

-

Magick++ provides an object-oriented C++ interface to ImageMagick. See A Gentle Introduction to Magick++ for an introductory tutorial to Magick++. We include the source if you want to correct, enhance, or expand the tutorial.

+

Magick++ provides an object-oriented C++ interface to ImageMagick. See A Gentle Introduction to Magick++ for an introductory tutorial to Magick++. We include the source if you want to correct, enhance, or expand the tutorial.

Java

-

JMagick provides an object-oriented Java interface to ImageMagick. Im4java is a pure-java interface to the ImageMagick command-line.

+

JMagick provides an object-oriented Java interface to ImageMagick. Im4java is a pure-java interface to the ImageMagick command-line.

LabVIEW

-

LVOOP ImageMagick is an object-oriented LabVIEW interface to ImageMagick.

+

LVOOP ImageMagick is an object-oriented LabVIEW interface to ImageMagick.

Lisp

-

CL-Magick provides a Common Lisp interface to the ImageMagick library.

+

CL-Magick provides a Common Lisp interface to the ImageMagick library.

Neko

-

NMagick is a port of the ImageMagick library to the haXe and Neko platforms. It provides image manipulation capabilities to both web and desktop applications using Neko.

+

NMagick is a port of the ImageMagick library to the haXe and Neko platforms. It provides image manipulation capabilities to both web and desktop applications using Neko.

.NET

@@ -225,7 +222,7 @@

Pascal

-

PascalMagick a Pascal binding for the MagickWand API and also the low-level MagickCore library. It works with Free Pascal / Lazarus and Delphi.

+

PascalMagick a Pascal binding for the MagickWand API and also the low-level MagickCore library. It works with Free Pascal / Lazarus and Delphi.

Perl

@@ -237,50 +234,50 @@

PHP

-

MagickWand for PHP a native PHP-extension to the ImageMagick MagickWand API.

+

MagickWand for PHP a native PHP-extension to the ImageMagick MagickWand API.

-

IMagick is a native PHP extension to create and modify images using the ImageMagick API. Documentation for the extension is available here.

+

IMagick is a native PHP extension to create and modify images using the ImageMagick API. Documentation for the extension is available here.

-

phMagick is a wrapper class for ImageMagick, wrapping the most common web image manipulation actions in easy to use functions, but allowing full access to ImageMagick's power by issuing system calls to it's command-line programs.

+

phMagick is a wrapper class for ImageMagick, wrapping the most common web image manipulation actions in easy to use functions, but allowing full access to ImageMagick's power by issuing system calls to it's command-line programs.

Python

-

PythonMagick an object-oriented Python interface to ImageMagick.

+

PythonMagick an object-oriented Python interface to ImageMagick.

-

PythonMagickWand an object-oriented Python interface to MagickWand based on ctypes.

+

PythonMagickWand an object-oriented Python interface to MagickWand based on ctypes.

REALbasic

-

The MBS Realbasic ImageMagick is a plugin that utilizes the power of ImageMagick from within the RealBasic environment.

+

The MBS Realbasic ImageMagick is a plugin that utilizes the power of ImageMagick from within the RealBasic environment.

Ruby

-

RMagick is an interface between the Ruby programming language and the MagickCore image processing libraries. Get started with RMagick by perusing the documentation.

+

RMagick is an interface between the Ruby programming language and the MagickCore image processing libraries. Get started with RMagick by perusing the documentation.

-

MagickWand for Ruby is an interface between the Ruby programming language and the MagickWand image processing libraries. Get started with MagickWand for PHP by perusing the documentation.

+

MagickWand for Ruby is an interface between the Ruby programming language and the MagickWand image processing libraries. Get started with MagickWand for PHP by perusing the documentation.

-

MiniMagick is a Ruby wrapper for ImageMagick command line. MiniMagick gives you convenient access to all the command line options ImageMagick supports.

+

MiniMagick is a Ruby wrapper for ImageMagick command line. MiniMagick gives you convenient access to all the command line options ImageMagick supports.

-

QuickMagick is a gem for easily accessing ImageMagick command line tools from Ruby programs.

+

QuickMagick is a gem for easily accessing ImageMagick command line tools from Ruby programs.

Tcl/Tk

-

TclMagick a native Tcl-extension to the ImageMagick MagickWand API.

+

TclMagick a native Tcl-extension to the ImageMagick MagickWand API.

XML RPC

-

RemoteMagick is an XML-RPC web service that creates image thumbnails.

+

RemoteMagick is an XML-RPC web service that creates image thumbnails.

diff --git a/www/api/animate.html b/www/api/animate.html index 094b4d83a..a8979fe04 100644 --- a/www/api/animate.html +++ b/www/api/animate.html @@ -187,7 +187,7 @@ _8c.html" target="source" name="AnimateImages">AnimateImages Discourse Server • Mailing Lists • - Studio + Studio  
diff --git a/www/api/annotate.html b/www/api/annotate.html index 2fa4df951..9afbd66cf 100644 --- a/www/api/annotate.html +++ b/www/api/annotate.html @@ -326,7 +326,7 @@ _8c.html" target="source" name="GetTypeMetrics">GetTypeMetrics Discourse Server • Mailing Lists • - Studio + Studio   diff --git a/www/api/attribute.html b/www/api/attribute.html index 2bebf150f..bb15a5831 100644 --- a/www/api/attribute.html +++ b/www/api/attribute.html @@ -124,7 +124,7 @@