From: cristy Date: Mon, 31 May 2010 15:10:05 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~9339 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85278ed38d3ca3655cf8e7e042e5aa24a2f4131e;p=imagemagick --- diff --git a/ImageMagick.spec b/ImageMagick.spec index 7348bd7e7..480e6d48d 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %define VERSION 6.6.2 -%define Patchlevel 1 +%define Patchlevel 2 Name: ImageMagick Version: %{VERSION} diff --git a/config/configure.xml b/config/configure.xml index 94257babb..ddbfe37bc 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,8 +8,8 @@ - - + + diff --git a/index.html b/index.html index 99fdd695f..0f1542d99 100644 --- a/index.html +++ b/index.html @@ -223,7 +223,7 @@ Discourse Server • - Studio + Studio   diff --git a/libtool b/libtool index 0cd0e3d83..c3eed83b9 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.6.2-1 +# Generated automatically by config.status (ImageMagick) 6.6.2-2 # Libtool was configured on host magick.imagemagick.org: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff --git a/ltdl/libltdl/lt__alloc.h b/ltdl/libltdl/lt__alloc.h index 75384b062..1ceddf009 100644 --- a/ltdl/libltdl/lt__alloc.h +++ b/ltdl/libltdl/lt__alloc.h @@ -22,7 +22,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License assize_t with GNU Libltdl; see the file COPYING.LIB. If not, a +License along with GNU Libltdl; see the file COPYING.LIB. If not, a copy can be downloaded from http://www.gnu.org/licenses/lgpl.html, or obtained by writing to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/ltdl/libltdl/lt__dirent.h b/ltdl/libltdl/lt__dirent.h index 4fc496b5d..4f24f82aa 100644 --- a/ltdl/libltdl/lt__dirent.h +++ b/ltdl/libltdl/lt__dirent.h @@ -22,7 +22,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License assize_t with GNU Libltdl; see the file COPYING.LIB. If not, a +License along with GNU Libltdl; see the file COPYING.LIB. If not, a copy can be downloaded from http://www.gnu.org/licenses/lgpl.html, or obtained by writing to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/ltdl/libltdl/lt__glibc.h b/ltdl/libltdl/lt__glibc.h index a8bbaa3c9..f284773d1 100644 --- a/ltdl/libltdl/lt__glibc.h +++ b/ltdl/libltdl/lt__glibc.h @@ -22,7 +22,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License assize_t with GNU Libltdl; see the file COPYING.LIB. If not, a +License along with GNU Libltdl; see the file COPYING.LIB. If not, a copy can be downloaded from http://www.gnu.org/licenses/lgpl.html, or obtained by writing to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/ltdl/libltdl/lt__private.h b/ltdl/libltdl/lt__private.h index 4076c675f..f4c4a3d7e 100644 --- a/ltdl/libltdl/lt__private.h +++ b/ltdl/libltdl/lt__private.h @@ -22,7 +22,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License assize_t with GNU Libltdl; see the file COPYING.LIB. If not, a +License along with GNU Libltdl; see the file COPYING.LIB. If not, a copy con be downloaded from http://www.gnu.org/licenses/lgpl.html, or obtained by writing to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/ltdl/libltdl/lt__strl.h b/ltdl/libltdl/lt__strl.h index c5cf28ef8..5799dc8a8 100644 --- a/ltdl/libltdl/lt__strl.h +++ b/ltdl/libltdl/lt__strl.h @@ -22,7 +22,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License assize_t with GNU Libltdl; see the file COPYING.LIB. If not, a +License along with GNU Libltdl; see the file COPYING.LIB. If not, a copy can be downloaded from http://www.gnu.org/licenses/lgpl.html, or obtained by writing to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/ltdl/libltdl/lt_dlloader.h b/ltdl/libltdl/lt_dlloader.h index df598ff93..ae131fae9 100644 --- a/ltdl/libltdl/lt_dlloader.h +++ b/ltdl/libltdl/lt_dlloader.h @@ -22,7 +22,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License assize_t with GNU Libltdl; see the file COPYING.LIB. If not, a +License along with GNU Libltdl; see the file COPYING.LIB. If not, a copy can be downloaded from http://www.gnu.org/licenses/lgpl.html, or obtained by writing to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/ltdl/libltdl/lt_error.h b/ltdl/libltdl/lt_error.h index 67052b59f..e789b3a4e 100644 --- a/ltdl/libltdl/lt_error.h +++ b/ltdl/libltdl/lt_error.h @@ -22,7 +22,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License assize_t with GNU Libltdl; see the file COPYING.LIB. If not, a +License along with GNU Libltdl; see the file COPYING.LIB. If not, a copy can be downloaded from http://www.gnu.org/licenses/lgpl.html, or obtained by writing to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -36,7 +36,7 @@ or obtained by writing to the Free Software Foundation, Inc., LT_BEGIN_C_DECLS -/* Defining error strings assize_tside their symbolic names in a macro in +/* Defining error strings alongside their symbolic names in a macro in this way allows us to expand the macro in different contexts with confidence that the enumeration of symbolic names will map correctly onto the table of error strings. \0 is appended to the strings to diff --git a/ltdl/libltdl/lt_system.h b/ltdl/libltdl/lt_system.h index 549c3283a..dab2ab6b3 100644 --- a/ltdl/libltdl/lt_system.h +++ b/ltdl/libltdl/lt_system.h @@ -22,7 +22,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License assize_t with GNU Libltdl; see the file COPYING.LIB. If not, a +License along with GNU Libltdl; see the file COPYING.LIB. If not, a copy can be downloaded from http://www.gnu.org/licenses/lgpl.html, or obtained by writing to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/ltdl/libltdl/slist.h b/ltdl/libltdl/slist.h index e653bad58..e4b7ead8d 100644 --- a/ltdl/libltdl/slist.h +++ b/ltdl/libltdl/slist.h @@ -22,7 +22,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License assize_t with GNU Libltdl; see the file COPYING.LIB. If not, a +License along with GNU Libltdl; see the file COPYING.LIB. If not, a copy can be downloaded from http://www.gnu.org/licenses/lgpl.html, or obtained by writing to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/ltdl/loaders/dld_link.c b/ltdl/loaders/dld_link.c index b3782f439..7e882c9ec 100644 --- a/ltdl/loaders/dld_link.c +++ b/ltdl/loaders/dld_link.c @@ -23,7 +23,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License assize_t with GNU Libltdl; see the file COPYING.LIB. If not, a +License along with GNU Libltdl; see the file COPYING.LIB. If not, a copy can be downloaded from http://www.gnu.org/licenses/lgpl.html, or obtained by writing to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -95,7 +95,7 @@ get_vtable (lt_user_data loader_data) #endif /* A function called through the vtable when this loader is no - ssize_ter needed by the application. */ + longer needed by the application. */ static int vl_exit (lt_user_data LT__UNUSED loader_data) { diff --git a/ltdl/loaders/dlopen.c b/ltdl/loaders/dlopen.c index c98674750..1d052b4fa 100644 --- a/ltdl/loaders/dlopen.c +++ b/ltdl/loaders/dlopen.c @@ -23,7 +23,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License assize_t with GNU Libltdl; see the file COPYING.LIB. If not, a +License along with GNU Libltdl; see the file COPYING.LIB. If not, a copy can be downloaded from http://www.gnu.org/licenses/lgpl.html, or obtained by writing to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -150,7 +150,7 @@ get_vtable (lt_user_data loader_data) /* A function called through the vtable when this loader is no - ssize_ter needed by the application. */ + longer needed by the application. */ static int vl_exit (lt_user_data LT__UNUSED loader_data) { diff --git a/ltdl/loaders/dyld.c b/ltdl/loaders/dyld.c index e8e79e845..b139d6c46 100644 --- a/ltdl/loaders/dyld.c +++ b/ltdl/loaders/dyld.c @@ -23,7 +23,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License assize_t with GNU Libltdl; see the file COPYING.LIB. If not, a +License along with GNU Libltdl; see the file COPYING.LIB. If not, a copy can be downloaded from http://www.gnu.org/licenses/lgpl.html, or obtained by writing to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -171,10 +171,10 @@ static const mach_header *lt__match_loadedlib (const char *name); static NSSymbol lt__linkedlib_symbol (const char *symname, const mach_header *mh); static const mach_header *(*lt__addimage) (const char *image_name, - size_t options) = 0; + unsigned long options) = 0; static NSSymbol (*lt__image_symbol) (const mach_header *image, const char *symbolName, - size_t options) = 0; + unsigned long options) = 0; static enum DYLD_BOOL (*lt__image_symbol_p) (const mach_header *image, const char *symbolName) = 0; static enum DYLD_BOOL (*lt__module_export) (NSModule module) = 0; @@ -183,7 +183,7 @@ static int dyld_cannot_close = 0; /* A function called through the vtable when this loader is no - ssize_ter needed by the application. */ + longer needed by the application. */ static int vl_exit (lt_user_data LT__UNUSED loader_data) { @@ -206,13 +206,13 @@ vl_init (lt_user_data loader_data) else { (void) _dyld_func_lookup ("__dyld_NSAddImage", - (size_t*) <__addimage); + (unsigned long*) <__addimage); (void) _dyld_func_lookup ("__dyld_NSLookupSymbolInImage", - (size_t*)<__image_symbol); + (unsigned long*)<__image_symbol); (void) _dyld_func_lookup ("__dyld_NSIsSymbolNameDefinedInImage", - (size_t*) <__image_symbol_p); + (unsigned long*) <__image_symbol_p); (void) _dyld_func_lookup ("__dyld_NSMakePrivateModulePublic", - (size_t*) <__module_export); + (unsigned long*) <__module_export); dyld_cannot_close = lt_dladderror ("can't close a dylib"); } } @@ -328,7 +328,7 @@ vm_sym (lt_user_data loader_data, lt_module module, const char *name) if (module == (lt_module) -1) { void *address, *unused; - _dyld_lookup_and_bind (name, (size_t*) &address, &unused); + _dyld_lookup_and_bind (name, (unsigned long*) &address, &unused); return address; } @@ -423,7 +423,7 @@ lt__nsmodule_get_header (NSModule module) static const char * lt__header_get_instnam (const mach_header *mh) { - size_t offset = sizeof(mach_header); + unsigned long offset = sizeof(mach_header); const char* result = 0; int j; @@ -431,11 +431,11 @@ lt__header_get_instnam (const mach_header *mh) { struct load_command *lc; - lc = (struct load_command*) (((size_t) mh) + offset); + lc = (struct load_command*) (((unsigned long) mh) + offset); if (LC_ID_DYLIB == lc->cmd) { result=(char*)(((dylib_command*) lc)->dylib.name.offset + - (size_t) lc); + (unsigned long) lc); } offset += lc->cmdsize; } @@ -473,17 +473,17 @@ lt__linkedlib_symbol (const char *symname, const mach_header *mh) if (lt__image_symbol && NSIsSymbolNameDefined (symname)) { - size_t offset = sizeof(mach_header); + unsigned long offset = sizeof(mach_header); struct load_command *lc; int j; for (j = 0; j < mh->ncmds; j++) { - lc = (struct load_command*) (((size_t) mh) + offset); + lc = (struct load_command*) (((unsigned long) mh) + offset); if ((LC_LOAD_DYLIB == lc->cmd) || (LC_LOAD_WEAK_DYLIB == lc->cmd)) { - size_t base = ((dylib_command *) lc)->dylib.name.offset; - char *name = (char *) (base + (size_t) lc); + unsigned long base = ((dylib_command *) lc)->dylib.name.offset; + char *name = (char *) (base + (unsigned long) lc); const mach_header *mh1 = lt__match_loadedlib (name); if (!mh1) diff --git a/ltdl/loaders/load_add_on.c b/ltdl/loaders/load_add_on.c index 9b1952e34..379f9ba1d 100644 --- a/ltdl/loaders/load_add_on.c +++ b/ltdl/loaders/load_add_on.c @@ -23,7 +23,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License assize_t with GNU Libltdl; see the file COPYING.LIB. If not, a +License along with GNU Libltdl; see the file COPYING.LIB. If not, a copy can be downloaded from http://www.gnu.org/licenses/lgpl.html, or obtained by writing to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -93,7 +93,7 @@ get_vtable (lt_user_data loader_data) #include /* A function called through the vtable when this loader is no - ssize_ter needed by the application. */ + longer needed by the application. */ static int vl_exit (lt_user_data LT__UNUSED loader_data) { diff --git a/ltdl/loaders/loadlibrary.c b/ltdl/loaders/loadlibrary.c index fd584efda..564467651 100644 --- a/ltdl/loaders/loadlibrary.c +++ b/ltdl/loaders/loadlibrary.c @@ -23,7 +23,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License assize_t with GNU Libltdl; see the file COPYING.LIB. If not, a +License along with GNU Libltdl; see the file COPYING.LIB. If not, a copy can be downloaded from http://www.gnu.org/licenses/lgpl.html, or obtained by writing to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -99,7 +99,7 @@ get_vtable (lt_user_data loader_data) #include /* A function called through the vtable when this loader is no - ssize_ter needed by the application. */ + longer needed by the application. */ static int vl_exit (lt_user_data LT__UNUSED loader_data) { diff --git a/ltdl/loaders/preopen.c b/ltdl/loaders/preopen.c index 74b5cd775..7149287d2 100644 --- a/ltdl/loaders/preopen.c +++ b/ltdl/loaders/preopen.c @@ -23,7 +23,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License assize_t with GNU Libltdl; see the file COPYING.LIB. If not, a +License along with GNU Libltdl; see the file COPYING.LIB. If not, a copy can be downloaded from http://www.gnu.org/licenses/lgpl.html, or obtained by writing to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -128,7 +128,7 @@ vl_init (lt_user_data LT__UNUSED loader_data) /* A function called through the vtable when this loader is no - ssize_ter needed by the application. */ + longer needed by the application. */ static int vl_exit (lt_user_data LT__UNUSED loader_data) { diff --git a/ltdl/loaders/shl_load.c b/ltdl/loaders/shl_load.c index 386477c9e..5a09d8724 100644 --- a/ltdl/loaders/shl_load.c +++ b/ltdl/loaders/shl_load.c @@ -23,7 +23,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License assize_t with GNU Libltdl; see the file COPYING.LIB. If not, a +License along with GNU Libltdl; see the file COPYING.LIB. If not, a copy can be downloaded from http://www.gnu.org/licenses/lgpl.html, or obtained by writing to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -136,7 +136,7 @@ get_vtable (lt_user_data loader_data) /* A function called through the vtable when this loader is no - ssize_ter needed by the application. */ + longer needed by the application. */ static int vl_exit (lt_user_data LT__UNUSED loader_data) { diff --git a/ltdl/lt__strl.c b/ltdl/lt__strl.c index 377739b5e..c2cee5874 100644 --- a/ltdl/lt__strl.c +++ b/ltdl/lt__strl.c @@ -37,7 +37,7 @@ or obtained by writing to the Free Software Foundation, Inc., lt_strlcat appends the NULL-terminated string src to the end of dst. It will append at most dstsize - strlen(dst) - 1 bytes, NULL-terminating the result. The total length of the string which - would have been created given sufficient buffer size (may be ssize_ter + would have been created given sufficient buffer size (may be longer than dstsize) is returned. This function substitutes for strlcat() which is available under NetBSD, FreeBSD and Solaris 9. @@ -85,7 +85,7 @@ lt_strlcat(char *dst, const char *src, const size_t dstsize) lt_strlcpy copies up to dstsize - 1 characters from the NULL-terminated string src to dst, NULL-terminating the result. The total length of the string which would have been created given sufficient buffer - size (may be ssize_ter than dstsize) is returned. This function + size (may be longer than dstsize) is returned. This function substitutes for strlcpy() which is available under OpenBSD, FreeBSD and Solaris 9. diff --git a/ltdl/ltdl.c b/ltdl/ltdl.c index a8913da08..7c426351c 100644 --- a/ltdl/ltdl.c +++ b/ltdl/ltdl.c @@ -1039,7 +1039,7 @@ parse_dotla_file(FILE *file, char **dlname, char **libdir, char **deplibs, } /* Handle the case where we occasionally need to read a line - that is ssize_ter than the initial buffer size. + that is longer than the initial buffer size. Behave even if the file contains NUL bytes due to corruption. */ while (line[line_len-2] != '\0' && line[line_len-2] != '\n' && !feof (file)) { @@ -1511,7 +1511,7 @@ has_library_ext (const char *filename) assert (filename); - ext = (char *) strrchr (filename, '.'); + ext = strrchr (filename, '.'); if (ext && ((streq (ext, archive_ext)) #if defined(LT_MODULE_EXT) diff --git a/ltdl/slist.c b/ltdl/slist.c index dfc3c8c59..c99f39914 100644 --- a/ltdl/slist.c +++ b/ltdl/slist.c @@ -185,7 +185,7 @@ slist_tail (SList *slist) } /* Return a list starting at the Nth item of SLIST. If SLIST is less - than N items ssize_t, NULL is returned. Just to be confusing, list items + than N items long, NULL is returned. Just to be confusing, list items are counted from 1, to get the 2nd element of slist: e.g. shared_list = slist_nth (slist, 2); */ diff --git a/magick/magick-config.h b/magick/magick-config.h index 699410cc4..bf4fdb835 100644 --- a/magick/magick-config.h +++ b/magick/magick-config.h @@ -9,14 +9,10 @@ /* #undef AC_APPLE_UNIVERSAL_BUILD */ /* Define if you have AUTOTRACE library */ -#ifndef MAGICKCORE_AUTOTRACE_DELEGATE -#define MAGICKCORE_AUTOTRACE_DELEGATE 1 -#endif +/* #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 @@ -113,9 +109,7 @@ /* #undef GS_DELEGATE */ /* Define if you have GVC library */ -#ifndef MAGICKCORE_GVC_DELEGATE -#define MAGICKCORE_GVC_DELEGATE 1 -#endif +/* #undef GVC_DELEGATE */ /* Define to 1 if you have the `argz_add' function. */ #ifndef MAGICKCORE_HAVE_ARGZ_ADD @@ -196,9 +190,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 @@ -1034,9 +1026,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 @@ -1065,9 +1055,7 @@ #endif /* Define if you have LQR library */ -#ifndef MAGICKCORE_LQR_DELEGATE -#define MAGICKCORE_LQR_DELEGATE 1 -#endif +/* #undef LQR_DELEGATE */ /* Define if using libltdl to support dynamically loadable modules */ #ifndef MAGICKCORE_LTDL_DELEGATE @@ -1079,7 +1067,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/alliance/lib:/usr/lib64/atlas:/usr/lib64/kicad:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/octave-3.2.4:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-1.9.2" +#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/alliance/lib:/usr/lib64/atlas:/usr/lib64/kicad:/usr/lib64/llvm:/usr/lib64/mysql:/usr/lib64/octave-3.2.4:/usr/lib64/openmotif:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib64/wine/:/usr/lib64/xulrunner-1.9.2" #endif /* The archive extension */ @@ -1120,9 +1108,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 */ /* Define to the address where bug reports for this package should be sent. */ #ifndef MAGICKCORE_PACKAGE_BUGREPORT @@ -1374,9 +1360,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/magick/version.h b/magick/version.h index 8c39f3c48..ab91dde92 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,10 +30,10 @@ extern "C" { #define MagickLibVersion 0x662 #define MagickLibVersionText "6.6.2" #define MagickLibVersionNumber 3,0,0 -#define MagickLibAddendum "-1" +#define MagickLibAddendum "-2" #define MagickLibInterface 3 #define MagickLibMinInterface 3 -#define MagickReleaseDate "2010-05-30" +#define MagickReleaseDate "2010-05-31" #define MagickChangeDate "20100528" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-6.6.2/index.html" diff --git a/version.sh b/version.sh index 235bb7eba..1bdfc0420 100644 --- a/version.sh +++ b/version.sh @@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick' # PACKAGE_NAME (e.g. "1.0.0"). PACKAGE_VERSION='6.6.2' PACKAGE_LIB_VERSION="0x662" -PACKAGE_RELEASE="1" +PACKAGE_RELEASE="2" PACKAGE_LIB_VERSION_NUMBER="6,6,2,${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 2c656e63f..4ae9ea07f 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -142,7 +142,7 @@ Druckerei Online @@ -176,7 +176,7 @@

The configure script looks at your environment and decides what it can cobble together to get ImageMagick compiled and installed on your system. This includes finding a compiler, where your compiler header files are located (e.g. stdlib.h), and if any delegate libraries are available for ImageMagick to use (e.g. JPEG, PNG, TIFF, etc.). If you are willing to accept configure's default options, and build from within the source directory, you can simply type:

-

$magick> cd ImageMagick-6.6.2-0 $magick> ./configure

+

$magick> cd ImageMagick-6.6.2-1 $magick> ./configure

Watch the configure script output to verify that it finds everything that you think it should. Pay particular attention to the last lines of the script output. For example, here is a recent report from our system:

@@ -528,7 +528,7 @@ Options used to compile and link:

Download the ImageMagick source distribution and verify the distribution against its message digest.

Unpack and change into the top-level ImageMagick directory:

-

$magick> tar xvfz ImageMagick-6.6.2-0.tar.gz $magick> cd ImageMagick-6.6.2-0

Configure ImageMagick:

+

$magick> tar xvfz ImageMagick-6.6.2-1.tar.gz $magick> cd ImageMagick-6.6.2-1

Configure ImageMagick:

$magick> ./configure --prefix=/opt --with-quantum-depth=16 \
--disable-dependency-tracking --with-x=yes \
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib/ \
@@ -548,7 +548,7 @@ Options used to compile and link:

Although you can download and install delegate libraries yourself, many are already available in the GnuWin32 distribution. Download and install whichever delegate libraries you require such as JPEG, PNG, TIFF, etc. Make sure you specify the development headers when you install a package. Next type,

-

$magick> tar jxvf ImageMagick-6.6.2-?.tar.bz2 $magick> cd ImageMagick-6.6.2-0 $magick> export CPPFLAGS="-Ic:/Progra~1/GnuWin32/include" $magick> export LDFLAGS="-Lc:/Progra~1/GnuWin32/lib" $magick> ./configure --without-perl $magick> make $magick> sudo make install

+

$magick> tar jxvf ImageMagick-6.6.2-?.tar.bz2 $magick> cd ImageMagick-6.6.2-1 $magick> export CPPFLAGS="-Ic:/Progra~1/GnuWin32/include" $magick> export LDFLAGS="-Lc:/Progra~1/GnuWin32/lib" $magick> ./configure --without-perl $magick> make $magick> sudo make install

Dealing with Unexpected Problems

@@ -593,7 +593,7 @@ Options used to compile and link: Discourse Server • - Studio + Studio  
diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html index 8b0bbe301..a3593a76e 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -142,7 +142,7 @@ Druckerei Online @@ -428,7 +428,7 @@
  1. Double-click on - VisualMagick/bin/ImageMagick-6.6.2-0-Q16-windows-dll.exe + VisualMagick/bin/ImageMagick-6.6.2-1-Q16-windows-dll.exe to launch the ImageMagick binary distribution.
  2. Complete the installer screens to install ImageMagick on your system.
diff --git a/www/animate.html b/www/animate.html index e035f0619..3386c40aa 100644 --- a/www/animate.html +++ b/www/animate.html @@ -143,7 +143,7 @@ Druckerei Online diff --git a/www/api.html b/www/api.html index cbed94ed9..f826d538b 100644 --- a/www/api.html +++ b/www/api.html @@ -141,9 +141,6 @@ - @@ -160,7 +157,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

@@ -172,7 +169,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+

@@ -184,31 +181,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

@@ -222,7 +219,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

@@ -234,50 +231,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

-

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

+

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

-

PythonMagick is an object-oriented Python interface to ImageMagick.

+

PythonMagick is an object-oriented Python interface to ImageMagick.

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.

@@ -285,7 +282,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/api/animate.html b/www/api/animate.html index 6b4f0f293..444668e02 100644 --- a/www/api/animate.html +++ b/www/api/animate.html @@ -142,7 +142,7 @@ Druckerei Online @@ -183,7 +183,7 @@ _8c.html" target="source" name="AnimateImages">AnimateImages Discourse Server • - Studio + Studio   diff --git a/www/api/attribute.html b/www/api/attribute.html index f8b2f1cbb..845165459 100644 --- a/www/api/attribute.html +++ b/www/api/attribute.html @@ -142,7 +142,7 @@ Druckerei Online @@ -330,7 +330,7 @@ _8c.html" target="source" name="SetImageChannelDepth">SetImageChannelDepth  --> Discourse Server • - Studio + Studio   diff --git a/www/api/blob.html b/www/api/blob.html index a3d0b67ea..c379b4c56 100644 --- a/www/api/blob.html +++ b/www/api/blob.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/cache-view.html b/www/api/cache-view.html index 3751e456c..96b805779 100644 --- a/www/api/cache-view.html +++ b/www/api/cache-view.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/cache.html b/www/api/cache.html index 89a8d364e..07d26a197 100644 --- a/www/api/cache.html +++ b/www/api/cache.html @@ -512,7 +512,7 @@ _8c.html" target="source" name="SyncAuthenticPixels">SyncAuthenticPixels  --> Discourse Server • - Studio + Studio   diff --git a/www/api/color.html b/www/api/color.html index c7ba41baa..ee34d6563 100644 --- a/www/api/color.html +++ b/www/api/color.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/colormap.html b/www/api/colormap.html index be7c193bc..11b1fd041 100644 --- a/www/api/colormap.html +++ b/www/api/colormap.html @@ -142,7 +142,7 @@ Druckerei Online @@ -204,7 +204,7 @@ _8c.html" target="source" name="CycleColormap">CycleColormap Discourse Server • - Studio + Studio   diff --git a/www/api/constitute.html b/www/api/constitute.html index e3f22c3d7..531e7fce9 100644 --- a/www/api/constitute.html +++ b/www/api/constitute.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/decorate.html b/www/api/decorate.html index 479481981..f1fd3e599 100644 --- a/www/api/decorate.html +++ b/www/api/decorate.html @@ -236,7 +236,7 @@ _8c.html" target="source" name="RaiseImage">RaiseImage Discourse Server • - Studio + Studio   diff --git a/www/api/deprecate.html b/www/api/deprecate.html index de47494f8..1e9c4f47c 100644 --- a/www/api/deprecate.html +++ b/www/api/deprecate.html @@ -3144,7 +3144,7 @@ _8c.html" target="source" name="UnshiftImageList">UnshiftImageList Discourse Server • - Studio + Studio   diff --git a/www/api/display.html b/www/api/display.html index 860baed61..bb8ca92f1 100644 --- a/www/api/display.html +++ b/www/api/display.html @@ -141,9 +141,6 @@ - diff --git a/www/api/draw.html b/www/api/draw.html index a48f42ddb..898bf0168 100644 --- a/www/api/draw.html +++ b/www/api/draw.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/drawing-wand.html b/www/api/drawing-wand.html index 1eae07d14..ef8872eac 100644 --- a/www/api/drawing-wand.html +++ b/www/api/drawing-wand.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/effect.html b/www/api/effect.html index 93669b2f3..59132d265 100644 --- a/www/api/effect.html +++ b/www/api/effect.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/exception.html b/www/api/exception.html index a198306d5..b9e8520f0 100644 --- a/www/api/exception.html +++ b/www/api/exception.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/feature.html b/www/api/feature.html index cc074a2e6..93c58d23d 100644 --- a/www/api/feature.html +++ b/www/api/feature.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/histogram.html b/www/api/histogram.html index 7c521182e..39411bbf0 100644 --- a/www/api/histogram.html +++ b/www/api/histogram.html @@ -142,7 +142,7 @@ Druckerei Online @@ -310,7 +310,7 @@ _8c.html" target="source" name="UniqueImageColors">UniqueImageColors Discourse Server • - Studio + Studio   diff --git a/www/api/image.html b/www/api/image.html index 0ae38186c..11b217a09 100644 --- a/www/api/image.html +++ b/www/api/image.html @@ -1050,7 +1050,7 @@ _8c.html" target="source" name="SyncImageSettings">SyncImageSettings Discourse Server • - Studio + Studio   diff --git a/www/api/layer.html b/www/api/layer.html index 39d8e503e..4300388f1 100644 --- a/www/api/layer.html +++ b/www/api/layer.html @@ -447,7 +447,7 @@ _8c.html" target="source" name="MergeImageLayers">MergeImageLayers Discourse Server • - Studio + Studio   diff --git a/www/api/list.html b/www/api/list.html index c4f452aaf..a47032943 100644 --- a/www/api/list.html +++ b/www/api/list.html @@ -142,7 +142,7 @@ Druckerei Online @@ -645,7 +645,7 @@ _8c.html" target="source" name="SplitImageList">SplitImageList Discourse Server • - Studio + Studio   diff --git a/www/api/magick-deprecate.html b/www/api/magick-deprecate.html index 483eac3c4..b9524a84e 100644 --- a/www/api/magick-deprecate.html +++ b/www/api/magick-deprecate.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/magick-image.html b/www/api/magick-image.html index b117da9ee..44d617d3b 100644 --- a/www/api/magick-image.html +++ b/www/api/magick-image.html @@ -142,7 +142,7 @@ Druckerei Online @@ -1128,8 +1128,7 @@ _8c.html" target="source" name="MagickCropImage">MagickCropImage 
   MagickBooleanType MagickCropImage(MagickWand *wand,
-    const size_t width,const size_t height,const ssize_t x,
-    const ssize_t y)
+    const size_t width,const size_t height,const ssize_t x,const ssize_t y)

A description of each parameter follows:

@@ -6463,7 +6462,7 @@ _8c.html" target="source" name="MagickWriteImagesFile">MagickWriteImagesFile Discourse Server • - Studio + Studio   diff --git a/www/api/magick-property.html b/www/api/magick-property.html index 19ce98fbd..721c7a366 100644 --- a/www/api/magick-property.html +++ b/www/api/magick-property.html @@ -1627,7 +1627,7 @@ _8c.html" target="source" name="MagickSetType">MagickSetType Discourse Server • - Studio + Studio   diff --git a/www/api/magick-wand.html b/www/api/magick-wand.html index c5c194a16..2f8c76a8f 100644 --- a/www/api/magick-wand.html +++ b/www/api/magick-wand.html @@ -142,7 +142,7 @@ Druckerei Online @@ -632,7 +632,7 @@ _8c.html" target="source" name="NewMagickWandFromImage">NewMagickWandFromImage  --> Discourse Server • - Studio + Studio   diff --git a/www/api/magick.html b/www/api/magick.html index b3e2c4256..af8508053 100644 --- a/www/api/magick.html +++ b/www/api/magick.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/memory.html b/www/api/memory.html index 9f8ceb4a6..ba787f751 100644 --- a/www/api/memory.html +++ b/www/api/memory.html @@ -142,7 +142,7 @@ Druckerei Online @@ -404,7 +404,7 @@ _8c.html" target="source" name="SetMagickMemoryMethods">SetMagickMemoryMethods  --> Discourse Server • - Studio + Studio   diff --git a/www/api/module.html b/www/api/module.html index 32f91a039..5ac2599c3 100644 --- a/www/api/module.html +++ b/www/api/module.html @@ -516,7 +516,7 @@ _8c.html" target="source" name="UnregisterModule">UnregisterModule Discourse Server • - Studio + Studio   diff --git a/www/api/monitor.html b/www/api/monitor.html index ccd302c3b..edfaded8f 100644 --- a/www/api/monitor.html +++ b/www/api/monitor.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/montage.html b/www/api/montage.html index 0678b37dc..063b1d8b6 100644 --- a/www/api/montage.html +++ b/www/api/montage.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/morphology.html b/www/api/morphology.html index 57ab5ae30..582a523d3 100644 --- a/www/api/morphology.html +++ b/www/api/morphology.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/pixel-iterator.html b/www/api/pixel-iterator.html index 72c4a35e2..59385575d 100644 --- a/www/api/pixel-iterator.html +++ b/www/api/pixel-iterator.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/pixel-view.html b/www/api/pixel-view.html index dcc2d7eb6..d9a0e4c54 100644 --- a/www/api/pixel-view.html +++ b/www/api/pixel-view.html @@ -142,7 +142,7 @@ Druckerei Online @@ -567,7 +567,7 @@ _8c.html" target="source" name="UpdatePixelViewIterator">UpdatePixelViewIterator Discourse Server • - Studio + Studio   diff --git a/www/api/pixel-wand.html b/www/api/pixel-wand.html index de45c2ccc..5c2ae96a8 100644 --- a/www/api/pixel-wand.html +++ b/www/api/pixel-wand.html @@ -142,7 +142,7 @@ Druckerei Online @@ -1397,7 +1397,7 @@ _8c.html" target="source" name="PixelSetYellowQuantum">PixelSetYellowQuantum Discourse Server • - Studio + Studio   diff --git a/www/api/profile.html b/www/api/profile.html index dc3d523da..e1e67153d 100644 --- a/www/api/profile.html +++ b/www/api/profile.html @@ -376,7 +376,7 @@ _8c.html" target="source" name="SyncImageProfiles">SyncImageProfiles Discourse Server • - Studio + Studio   diff --git a/www/api/property.html b/www/api/property.html index a024229b6..64fcfbe92 100644 --- a/www/api/property.html +++ b/www/api/property.html @@ -141,9 +141,6 @@ - diff --git a/www/api/quantize.html b/www/api/quantize.html index 8eab90ad3..998322a65 100644 --- a/www/api/quantize.html +++ b/www/api/quantize.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/registry.html b/www/api/registry.html index fe72b14c6..ab58bf615 100644 --- a/www/api/registry.html +++ b/www/api/registry.html @@ -314,7 +314,7 @@ _8c.html" target="source" name="SetImageRegistry">SetImageRegistry Discourse Server • - Studio + Studio   diff --git a/www/api/resize.html b/www/api/resize.html index 5a3ed8ae7..402fbf41f 100644 --- a/www/api/resize.html +++ b/www/api/resize.html @@ -452,7 +452,7 @@ _8c.html" target="source" name="ZoomImage">ZoomImage Discourse Server • - Studio + Studio   diff --git a/www/api/resource.html b/www/api/resource.html index 18d92ba74..4944786b3 100644 --- a/www/api/resource.html +++ b/www/api/resource.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/segment.html b/www/api/segment.html index 72fa8e60d..022af1019 100644 --- a/www/api/segment.html +++ b/www/api/segment.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/shear.html b/www/api/shear.html index 35b0b8b37..23f4c8efb 100644 --- a/www/api/shear.html +++ b/www/api/shear.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/signature.html b/www/api/signature.html index 0318c81bd..1447e6710 100644 --- a/www/api/signature.html +++ b/www/api/signature.html @@ -142,7 +142,7 @@ Druckerei Online @@ -179,7 +179,7 @@ _8c.html" target="source" name="SignatureImage">SignatureImage Discourse Server • - Studio + Studio   diff --git a/www/api/transform.html b/www/api/transform.html index f6eaaa14e..ad4a6bc49 100644 --- a/www/api/transform.html +++ b/www/api/transform.html @@ -142,7 +142,7 @@ Druckerei Online @@ -497,7 +497,7 @@ _8c.html" target="source" name="TrimImage">TrimImage Discourse Server • - Studio + Studio   diff --git a/www/api/version.html b/www/api/version.html index 297784dd7..67d3cd3d5 100644 --- a/www/api/version.html +++ b/www/api/version.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/architecture.html b/www/architecture.html index 7b92e65d1..9f7ce197e 100644 --- a/www/architecture.html +++ b/www/architecture.html @@ -239,7 +239,7 @@

When the pixel cache is initialized, pixels are scaled from whatever bit depth they originated from to that required by the pixel cache. For example, a 1-channel 1-bit monochrome PBM image is scaled to a 4 channel 8-bit RGBA image, if you are using the Q8 version of ImageMagick, and 16-bit RGBA for the Q16 version. You can determine which version you have with the ‑version option:

-

$magick> identify -versionVersion: ImageMagick 6.6.2-0 2010-04-15 Q16 http://www.imagemagick.org

+

$magick> identify -versionVersion: ImageMagick 6.6.2-1 2010-14-15 Q16 http://www.imagemagick.org

As you can see, the convenience of the pixel cache sometimes comes with a trade-off in storage (e.g. storing a 1-bit monochrome image as 16-bit RGBA is wasteful) and speed (i.e. storing the entire image in memory is generally slower than accessing one scanline of pixels at a time). In most cases, the benefits of the pixel cache typically outweigh any disadvantages.

@@ -1330,7 +1330,7 @@ ModuleExport unsigned long analyzeImage(Image **images,const int argc, Discourse Server • - Studio + Studio   diff --git a/www/binary-releases.html b/www/binary-releases.html index 31e2d5167..4e90d3d86 100644 --- a/www/binary-releases.html +++ b/www/binary-releases.html @@ -174,16 +174,16 @@ - ImageMagick-6.6.2-0.i386.rpm - download - download + ImageMagick-6.6.2-1.i386.rpm + download + download CentOS 5.4 i386 RPM - ImageMagick-6.6.2-0.x86_64.rpm - download - download + ImageMagick-6.6.2-1.x86_64.rpm + download + download CentOS 5.4 x86_64 RPM @@ -213,7 +213,7 @@

ImageMagick RPM's are self-installing. Simply type the following command and you're ready to start using ImageMagick:

-

$magick> rpm -Uvh ImageMagick-6.6.2-0.i386.rpm

+

$magick> rpm -Uvh ImageMagick-6.6.2-1.i386.rpm

For other systems, create (or choose) a directory to install the package into and change to that directory, for example:

$magick> cd $HOME

@@ -295,7 +295,7 @@

ImageMagick runs on all recent Windows releases except Windows 95 / 98. We recommend its use on an NT-based version of Windows (NT4, 2000, 2003, XP, or Vista). Starting with ImageMagick 5.5.7, older versions such as Windows 95 / 98 are not supported anymore. The amount of memory can be an important factor, especially if you intend to work on large images. A minimum of 256 MB of RAM is recommended, but the more RAM the better. Although ImageMagick runs fine on a single core computer, it automagically runs in parallel on dual and quad-core systems reducing run times considerably.

The Windows version of ImageMagick is self-installing. Simply click on the appropriate version below and it will launch itself and ask you a few installation questions. Versions with Q8 in the name are 8 bits-per-pixel component (e.g. 8-bit red, 8-bit green, etc.), whereas, Q16 in the filename are 16 bits-per-pixel component. A Q16 version permits you to read or write 16-bit images without losing precision but requires twice as much resources as the Q8 version. Versions with dll in the filename include ImageMagick libraries as dynamic link libraries. If you are not sure which version is appropriate, choose -ImageMagick-6.6.2-0-Q16-windows-dll.exe.

+ImageMagick-6.6.2-1-Q16-windows-dll.exe.

@@ -307,44 +307,44 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -373,7 +373,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/changelog.html b/www/changelog.html index df80fbe46..b5d138827 100644 --- a/www/changelog.html +++ b/www/changelog.html @@ -152,7 +152,9 @@
-
    2010-05-25 6.6.2.1 Anthony Thyssen <A.Thyssen@griffith...>
    +
      2010-05-28 6.6.2.1 Glenn Randers-Pehrson <glennrp@image...>
      +
    • Prevent coders/png.c from attempting to write an empty tRNS chunk.

      • +
      2010-05-25 6.6.2.1 Anthony Thyssen <A.Thyssen@griffith...>
    • Finish for Square Array Rotates (off center origin rotate)
    • Added HitAndMiss kernel Ridges2 to find 2 pixel thick ridges
    • Added FreiChen:0,{angle} FreiChen:{angle} and FreiChen:-1 variations to complete this kernels definition

      • @@ -161,7 +163,8 @@
    • Set AVI handler to the MPEG coder.
    • Compute the proper DPX user data field size.
    • Do not interpret a format specifier when enclosed in brackets (e.g. rose_tile_%[filename:tile].gif.
      • -
    • Use 64-bit types when compiling with the 64-bit Visual C++ compiler under Windows.

      • +
    • Use 64-bit types when compiling with the 64-bit Visual C++ compiler under Windows.
      • +
    • Prevent MNG divide by zero (refererce http://www.imagemagick.org/discourse-server/viewtopic.html?f=3&t=16320).

      • 2010-05-23 6.6.2.0 Anthony Thyssen <A.Thyssen@griffith...>
    • Third Re-write of MorphologyApply() to better handle compound methods.
    • Implemented -set option:morphology:compose for merging results of multiple kernels. "None" means re-iterate results with next kernel. While "Undefined" means to use the internal default for a method. Thinning, Thickening, HitAndMiss, Convolve, Correlate defaults to "None" while HitAndMiss defaults to "Lighten" (union of all kernel results). Other morphology methods defaults still to be decided.
      • @@ -1548,7 +1551,7 @@ Discourse Server • - Studio + Studio  
diff --git a/www/cipher.html b/www/cipher.html index 2b1dff0e9..dc95ceaf0 100644 --- a/www/cipher.html +++ b/www/cipher.html @@ -143,7 +143,7 @@ Druckerei Online diff --git a/www/color.html b/www/color.html index 7fe632ae9..be3ea7484 100644 --- a/www/color.html +++ b/www/color.html @@ -5018,7 +5018,7 @@ color swatch of that color and to convert to all the other color models. Discourse Server • - Studio + Studio   diff --git a/www/command-line-options.html b/www/command-line-options.html index 74f682a76..42b417d02 100644 --- a/www/command-line-options.html +++ b/www/command-line-options.html @@ -146,7 +146,7 @@ Druckerei Online @@ -5946,7 +5946,7 @@ percentage, which defaults to 100 percent (no color change).

Discourse Server • - Studio + Studio   diff --git a/www/command-line-processing.html b/www/command-line-processing.html index 40d970434..6f6939e51 100644 --- a/www/command-line-processing.html +++ b/www/command-line-processing.html @@ -142,7 +142,7 @@ Druckerei Online @@ -635,7 +635,7 @@ above.

Discourse Server • - Studio + Studio   diff --git a/www/command-line-tools.html b/www/command-line-tools.html index bce2c2f85..f651124a3 100644 --- a/www/command-line-tools.html +++ b/www/command-line-tools.html @@ -142,7 +142,7 @@ Druckerei Online @@ -154,11 +154,11 @@

[animate • compare • composite • conjure • convert • display • identify • import • mogrify • montage • stream]

-

ImageMagick includes a number of command-line utilities for manipulating images. Most of you are probably accustomed to editing images one at a time with a graphical user interface (GUI) with such programs as gimp or Photoshop. However, a GUI is not always convenient. Suppose you want to process an image dynamically from a web script or you want to apply the same operations to many images or repeat a specific operation at different times to the same or different image. For these types of operations, the command-line image processing utility is appropriate.

+

ImageMagick includes a number of command-line utilities for manipulating images. Most of you are probably accustomed to editing images one at a time with a graphical user interface (GUI) with such programs as gimp or Photoshop. However, a GUI is not always convenient. Suppose you want to process an image dynamically from a web script or you want to apply the same operations to many images or repeat a specific operation at different times to the same or different image. For these types of operations, the command-line image processing utility is appropriate.

The ImageMagick command-line tools exit with a status of 0 if the command line arguments have a proper syntax and no problems are encountered. Expect a descriptive message and an exit status of 1 if any exception occurs such as improper syntax, a problem reading or writing an image, or any other problem that prevents the command from completing successfully.

-

In the paragraphs below, find a short description for each command-line tool. Click on the program name to get details about the program usage and a list of command-line options that alters how the program behaves. If you are just getting acquainted with ImageMagick, start with the convert program. Be sure to peruse Anthony Thyssen's tutorial on how to use ImageMagick utilities to convert, compose, or edit images from the command-line.

+

In the paragraphs below, find a short description for each command-line tool. Click on the program name to get details about the program usage and a list of command-line options that alters how the program behaves. If you are just getting acquainted with ImageMagick, start with the convert program. Be sure to peruse Anthony Thyssen's tutorial on how to use ImageMagick utilities to convert, compose, or edit images from the command-line.

animate

@@ -232,7 +232,7 @@ Discourse Server • - Studio + Studio  
diff --git a/www/compare.html b/www/compare.html index 0a66e10f5..5bb39c8cb 100644 --- a/www/compare.html +++ b/www/compare.html @@ -143,7 +143,7 @@ Druckerei Online diff --git a/www/composite.html b/www/composite.html index 42c3adab5..5be21885a 100644 --- a/www/composite.html +++ b/www/composite.html @@ -142,9 +142,6 @@ - diff --git a/www/conjure.html b/www/conjure.html index a52a679fc..469950667 100644 --- a/www/conjure.html +++ b/www/conjure.html @@ -143,7 +143,7 @@ Druckerei Online diff --git a/www/contact.html b/www/contact.html index 54d5f0213..a2de44711 100644 --- a/www/contact.html +++ b/www/contact.html @@ -142,7 +142,7 @@ Druckerei Online @@ -160,7 +160,7 @@

Contact the Development Team

-

Use this form to contact the ImageMagick Wizards for any of the issues listed below. You can expect a reply within 24-48 hours if your message is a sponsorshp, license, or security issue. The bug and documentation issues are for reporting only. For any other issue, post your message to the discourse server.

+

Use this form to contact the ImageMagick Wizards for any of the issues listed below. You can expect a reply within 24-48 hours if your message is a sponsorshp, license, or security issue. The bug and documentation issues are for reporting only. For any other issue, post your message to the discourse server.

Contact the Wizards

Enter this code, diff --git a/www/convert.html b/www/convert.html index 5e59aacb7..f0c8a4baa 100644 --- a/www/convert.html +++ b/www/convert.html @@ -1280,7 +1280,7 @@ transparent, extract, background, or shape the alpha channel Discourse Server • - Studio + Studio   diff --git a/www/display.html b/www/display.html index c8b9c0781..60af57ce8 100644 --- a/www/display.html +++ b/www/display.html @@ -143,7 +143,7 @@ Druckerei Online

diff --git a/www/download.html b/www/download.html index 57480922e..50425dd63 100644 --- a/www/download.html +++ b/www/download.html @@ -154,7 +154,7 @@

ImageMagick source and binary distributions are available from a variety of FTP and Web mirrors around the world listed below. ImageMagick stable and development source releases are also available from Subversion. Before you download, you may want to review recent changes to the ImageMagick distribution.

-

The latest release of ImageMagick is version 6.6.2-0.

+

The latest release of ImageMagick is version 6.6.2-1.

Australia
ftp://mirror.aarnet.edu.au/pub/ImageMagick/
@@ -204,7 +204,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/escape.html b/www/escape.html index 902a50b5b..9c33606f9 100644 --- a/www/escape.html +++ b/www/escape.html @@ -143,7 +143,7 @@ Druckerei Online @@ -441,7 +441,7 @@ for an image with filename bird.miff and whose width is 512 and heigh Discourse Server • - Studio + Studio   diff --git a/www/examples.html b/www/examples.html index 311b8753e..f560cf0a2 100644 --- a/www/examples.html +++ b/www/examples.html @@ -142,7 +142,7 @@ Druckerei Online @@ -152,7 +152,7 @@
-

Here are a few examples of what you can do with an image using ImageMagick from the command line, a program interface, or script. You can generate this image yourself with this PerlMagick script, examples.pl.


+

Here are a few examples of what you can do with an image using ImageMagick from the command line, a program interface, or script. You can generate this image yourself with this PerlMagick script, examples.pl.


[ImageMagick] @@ -164,7 +164,7 @@ Discourse Server • - Studio + Studio  
diff --git a/www/exception.html b/www/exception.html index f865e67b1..38bbe0d46 100644 --- a/www/exception.html +++ b/www/exception.html @@ -354,7 +354,7 @@ Discourse Server • - Studio + Studio  
diff --git a/www/formats.html b/www/formats.html index 08e5f04b0..7cf785818 100644 --- a/www/formats.html +++ b/www/formats.html @@ -143,7 +143,7 @@ Druckerei Online @@ -1761,7 +1761,7 @@ convert \( -size 15x15 xc:black xc:white -append \) \ Discourse Server • - Studio + Studio   diff --git a/www/fx.html b/www/fx.html index b41f7bffb..b5b6fd5c9 100644 --- a/www/fx.html +++ b/www/fx.html @@ -143,7 +143,7 @@ Druckerei Online diff --git a/www/high-dynamic-range.html b/www/high-dynamic-range.html index 7efa58184..8f23acc60 100644 --- a/www/high-dynamic-range.html +++ b/www/high-dynamic-range.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/history.html b/www/history.html index 9d5431b4c..378db31c7 100644 --- a/www/history.html +++ b/www/history.html @@ -142,7 +142,7 @@ Druckerei Online @@ -164,7 +164,7 @@ I swear by my life and my love of it that I will never live for the sake of anot

The next generation of ImageMagick, version 5, started when Bob Friesenhahn contacted me and suggested I improve the application programming interface so users could leverage the image-processing algorithms from other languages or scripts. Bob also wrote a C++ wrapper for ImageMagick called Magick++, and began contributing enhancements such as the module loader facility, automatic file identification, and test suites. In the mean-time, the project picked up a few other notable contributors: Glenn Randers-Pehrson, William Radcliffe, and Leonard Rosenthol. By now, ImageMagick was being utilized by tens of thousands of users, who reacted gruffly when a new release broke an existing API call or script. The other members of the group wanted to freeze the API and command line but I was not quite ready, since ImageMagick was not quite what I had envisioned it could be. Bob and the others created a fork of ImageMagick while I continued to develop ImageMagick.

-

I did not work alone for long. Anthony Thyssen contacted me about deficiencies in the ImageMagick command line programs. He pointed out that the command line was confusing when dealing with more than one image. He suggested an orderly, well-defined method for dealing with the command line, and this became ImageMagick version 6 (the current release). His efforts are detailed on his web pages, Examples of ImageMagick Usage. I highly recommend that you peruse his site. He has illustrated the power of ImageMagick in ways that even I did not know were possible.

+

I did not work alone for long. Anthony Thyssen contacted me about deficiencies in the ImageMagick command line programs. He pointed out that the command line was confusing when dealing with more than one image. He suggested an orderly, well-defined method for dealing with the command line, and this became ImageMagick version 6 (the current release). His efforts are detailed on his web pages, Examples of ImageMagick Usage. I highly recommend that you peruse his site. He has illustrated the power of ImageMagick in ways that even I did not know were possible.

Another notable contributer, Fred Weinhaus, makes available a plethora of command-line scripts that perform geometric transforms, blurs, sharpens, edging, noise removal, and color manipulations.

@@ -178,7 +178,7 @@ I swear by my life and my love of it that I will never live for the sake of anot Discourse Server • - Studio + Studio   diff --git a/www/identify.html b/www/identify.html index c688039d4..47f15c40f 100644 --- a/www/identify.html +++ b/www/identify.html @@ -222,7 +222,7 @@ Tainted: False
Filesize: 3.97266kb
Number pixels: 3.14453kb
- Version: ImageMagick 6.6.2-0 2010-04-15 Q16 http://www.imagemagick.org

+ Version: ImageMagick 6.6.2-1 2010-14-15 Q16 http://www.imagemagick.org

To get the print size in inches of an image at 72 DPI, use:

$magick> identify -format "%[fx:w/72] by %[fx:h/72] inches" document.png8.5 x 11 inches

@@ -430,7 +430,7 @@ transparent, extract, background, or shape the alpha channel Discourse Server • - Studio + Studio   diff --git a/www/index.html b/www/index.html index 7134291b2..0fb68d937 100644 --- a/www/index.html +++ b/www/index.html @@ -223,7 +223,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/install-source.html b/www/install-source.html index fc82cfe22..483966141 100644 --- a/www/install-source.html +++ b/www/install-source.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/jp2.html b/www/jp2.html index 8e0def141..babcc53fc 100644 --- a/www/jp2.html +++ b/www/jp2.html @@ -143,7 +143,7 @@ Druckerei Online diff --git a/www/license.html b/www/license.html index d345d04ce..dd23daf21 100644 --- a/www/license.html +++ b/www/license.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/links.html b/www/links.html index 8ce9d8947..3a1862fe4 100644 --- a/www/links.html +++ b/www/links.html @@ -160,23 +160,23 @@

Command-line Tutorials

@@ -184,18 +184,18 @@
@@ -203,10 +203,10 @@
@@ -214,24 +214,24 @@

ImageMagick Book Review

Mailing List Archives

@@ -239,13 +239,13 @@
Denmark
-
http://imagemagick.europnews.de

+
http://imagemagick.europnews.de

Germany
-
http://imagemagick.linux-mirror.org

+
http://imagemagick.linux-mirror.org

Ireland
-
http://imagemagick.oss-mirror.org

+
http://imagemagick.oss-mirror.org

United States
-
http://www.imagemagick.org
+
http://www.imagemagick.org
@@ -253,16 +253,16 @@
    -
    G'MIC: convert, manipulate and visualize generic 1D/2D/3D multi-spectral image files
    -
    Image Commander: bulk picture processing with a GUI
    +
    G'MIC: convert, manipulate and visualize generic 1D/2D/3D multi-spectral image files
    +
    Image Commander: bulk picture processing with a GUI

Other Projects Hosted by ImageMagick Studio

@@ -272,7 +272,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/magick-core.html b/www/magick-core.html index 14c95fbc5..e0a6f6617 100644 --- a/www/magick-core.html +++ b/www/magick-core.html @@ -143,7 +143,7 @@ Druckerei Online diff --git a/www/magick-vector-graphics.html b/www/magick-vector-graphics.html index b625776e3..979585e27 100644 --- a/www/magick-vector-graphics.html +++ b/www/magick-vector-graphics.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/magick-wand.html b/www/magick-wand.html index 96d3c6cfe..b90c98d34 100644 --- a/www/magick-wand.html +++ b/www/magick-wand.html @@ -143,7 +143,7 @@ Druckerei Online @@ -455,7 +455,7 @@ int main(int argc,char **argv) Discourse Server • - Studio + Studio   diff --git a/www/mirrors.html b/www/mirrors.html index f2495e572..a53a7ee04 100644 --- a/www/mirrors.html +++ b/www/mirrors.html @@ -155,9 +155,9 @@

The ImageMagick web site is available from a variety of web mirrors around the world listed below.

France
-
http://imagemagick.europnews.de/

+
http://imagemagick.europnews.de/

Unites States
-
http://www.imagemagick.org/
+
http://www.imagemagick.org/

If you want to add a new web-site mirror, please contact us.

@@ -167,7 +167,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/mogrify.html b/www/mogrify.html index 2342a7c78..b86adbc8a 100644 --- a/www/mogrify.html +++ b/www/mogrify.html @@ -143,7 +143,7 @@ Druckerei Online diff --git a/www/montage.html b/www/montage.html index 564da20b4..5fca5ddf9 100644 --- a/www/montage.html +++ b/www/montage.html @@ -698,7 +698,7 @@ transparent, extract, background, or shape the alpha channel Discourse Server • - Studio + Studio   diff --git a/www/motion-picture.html b/www/motion-picture.html index 68f6fdd62..ae73c7963 100644 --- a/www/motion-picture.html +++ b/www/motion-picture.html @@ -285,7 +285,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/perl-magick.html b/www/perl-magick.html index 99d8cd5e6..6d9258ed0 100644 --- a/www/perl-magick.html +++ b/www/perl-magick.html @@ -142,7 +142,7 @@ Druckerei Online @@ -2558,7 +2558,7 @@ blobs in any of these image formats and provid Discourse Server • - Studio + Studio   diff --git a/www/quantize.html b/www/quantize.html index 69b813b1c..36db723eb 100644 --- a/www/quantize.html +++ b/www/quantize.html @@ -142,7 +142,7 @@ Druckerei Online @@ -285,7 +285,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/search.html b/www/search.html index 8c1b6d52b..50bc4d82a 100644 --- a/www/search.html +++ b/www/search.html @@ -142,7 +142,7 @@ Druckerei Online @@ -166,7 +166,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/sitemap.html b/www/sitemap.html index 892372297..9589feea3 100644 --- a/www/sitemap.html +++ b/www/sitemap.html @@ -142,7 +142,7 @@ Druckerei Online @@ -163,7 +163,7 @@
Introduction: convert, edit, and compose images from the command-line or program interface.
Examples of ImageMagick usage: a few examples that show what you can do with an image using ImageMagick.
-
Anthony Thyssen's examples of ImageMagick usage: a comprehensive tutorial of using ImageMagick from the command line.
+
Anthony Thyssen's examples of ImageMagick usage: a comprehensive tutorial of using ImageMagick from the command line.
Color names: how to specify a color name, a hex color, or a numerical RGB, RGBA, HSL, HSLA, CMYK, or CMYKA color.
Resources: ImageMagick depends on external resources including configuration files, loadable modules, fonts, and environment variables.
Architecture: get to know more about the software and algorithms behind ImageMagick.
@@ -177,12 +177,12 @@
Download ImageMagick: ImageMagick source and binary distributions are available from a variety of FTP and Web mirrors.
@@ -221,7 +221,7 @@
Command line processing: the anatomy of the command line.
Command line options: annotated list of all options that can appear on the command-line.
Fx: apply a mathematical expression to an image or image channels.
-
Fred's ImageMagick Scripts: a plethora of command-line scripts that perform geometric transforms, blurs, sharpens, edging, noise removal, and color manipulations.
+
Fred's ImageMagick Scripts: a plethora of command-line scripts that perform geometric transforms, blurs, sharpens, edging, noise removal, and color manipulations.
@@ -231,21 +231,21 @@
Program interfaces: application programming interfaces.
    -
    ChMagick: is a Ch an embeddable MagickCore C/C++ interpreter for cross-platform scripting.
    -
    CL-Magick: provides a Common Lisp interface to the ImageMagick library.
    -
    G2F: implements an Ada 95 binding to a subset of the low-level MagickCore library.
    -
    Magick++: provides an object-oriented C++ interface to ImageMagick.
    -
    IMagick: is a native PHP extension to create and modify images using the ImageMagick API.
    -
    JMagick: provides an object-oriented Java interface to ImageMagick.
    +
    ChMagick: is a Ch an embeddable MagickCore C/C++ interpreter for cross-platform scripting.
    +
    CL-Magick: provides a Common Lisp interface to the ImageMagick library.
    +
    G2F: implements an Ada 95 binding to a subset of the low-level MagickCore library.
    +
    Magick++: provides an object-oriented C++ interface to ImageMagick.
    +
    IMagick: is a native PHP extension to create and modify images using the ImageMagick API.
    +
    JMagick: provides an object-oriented Java interface to ImageMagick.
    MagickCore: C API, recommended for wizard-level developers.
    MagickWand: convert, compose, and edit images from the C language.
    -
    MagickWand for PHP: a native PHP-extension to the ImageMagick MagickWand API.
    -
    nMagick: is a port of the ImageMagick library to the haXe and Neko platforms.
    -
    PascalMagick: a Pascal binding for the MagickWand API and also the low-level MagickCore library.
    +
    MagickWand for PHP: a native PHP-extension to the ImageMagick MagickWand API.
    +
    nMagick: is a port of the ImageMagick library to the haXe and Neko platforms.
    +
    PascalMagick: a Pascal binding for the MagickWand API and also the low-level MagickCore library.
    PerlMagick: convert, compose, and edit images from the Perl language.
    -
    PythonMagick: an object-oriented Python interface to ImageMagick.
    -
    RMagick: is an interface between the Ruby programming language and ImageMagick.
    -
    TclMagick: a native Tcl-extension to the ImageMagick MagickWand API.
    +
    PythonMagick: an object-oriented Python interface to ImageMagick.
    +
    RMagick: is an interface between the Ruby programming language and ImageMagick.
    +
    TclMagick: a native Tcl-extension to the ImageMagick MagickWand API.
@@ -265,8 +265,8 @@
-
Definitive Guide to ImageMagick: this book explains ImageMagick in a practical, learn-by-example fashion.
-
ImageMagick Tricks: this book is packed with examples of photo manipulations, logo creation, animations, and complete web projects.
+
Definitive Guide to ImageMagick: this book explains ImageMagick in a practical, learn-by-example fashion.
+
ImageMagick Tricks: this book is packed with examples of photo manipulations, logo creation, animations, and complete web projects.
Discourse server: get help from fellow ImageMagick users and developers, post to these forums.
Contact the Wizards: for bug reports (only if you do not want to sign up to the discourse server), a source or documentation patch, a security or license issue, or if you want to be a sponsor of the ImageMagick project.
@@ -276,7 +276,7 @@
-
Report bugs and vulnerabilities: our highest priority is to fix security defects and bug reports, usually within 48 hours of your report. The bug discourse server requires that you register. If you do not want to register, you can contact the ImageMagick developers with a convenient web form.
+
Report bugs and vulnerabilities: our highest priority is to fix security defects and bug reports, usually within 48 hours of your report. The bug discourse server requires that you register. If you do not want to register, you can contact the ImageMagick developers with a convenient web form.
Sponsor ImageMagick: contribute bug fixes, enhancements, hardware, funds, etc. to ensure the ImageMagick project thrives.
ImageMagick t-shirt: donate $25 USD and we acknowledge your gift with a logoed t-shirt.
@@ -302,8 +302,8 @@

Technology Sandbox

-
Fourier Transform Processing With ImageMagick
-
ImageMagick v6 Examples -- Fourier Transforms
+
Fourier Transform Processing With ImageMagick
+
ImageMagick v6 Examples -- Fourier Transforms
diff --git a/www/stream.html b/www/stream.html index ad55ca6e7..463821146 100644 --- a/www/stream.html +++ b/www/stream.html @@ -143,7 +143,7 @@ Druckerei Online diff --git a/www/subversion.html b/www/subversion.html index 81def2900..1e159f8ef 100644 --- a/www/subversion.html +++ b/www/subversion.html @@ -142,7 +142,7 @@ Druckerei Online @@ -176,7 +176,7 @@ ImageMagick-6.6.2

Discourse Server • - Studio + Studio   diff --git a/www/t-shirt.html b/www/t-shirt.html index fb5559327..b6a0ebbf3 100644 --- a/www/t-shirt.html +++ b/www/t-shirt.html @@ -142,7 +142,7 @@ Druckerei Online @@ -191,7 +191,7 @@ Discourse Server • - Studio + Studio  
ImageMagick-6.6.2-0-Q16-windows-dll.exedownloaddownloadImageMagick-6.6.2-1-Q16-windows-dll.exedownloaddownload Win32 dynamic at 16 bits-per-pixel
ImageMagick-6.6.2-0-Q16-windows-static.exedownloaddownloadImageMagick-6.6.2-1-Q16-windows-static.exedownloaddownload Win32 static at 16 bits-per-pixel
ImageMagick-6.6.2-0-Q16-windows-x64-dll.exedownloaddownloadImageMagick-6.6.2-1-Q16-windows-x64-dll.exedownloaddownload x64 dynamic at 16 bits-per-pixel
ImageMagick-6.6.2-0-Q16-windows-x64-static.exedownloaddownloadImageMagick-6.6.2-1-Q16-windows-x64-static.exedownloaddownload x64 static at 16 bits-per-pixel
ImageMagick-6.6.2-0-Q8-windows-dll.exedownloaddownloadImageMagick-6.6.2-1-Q8-windows-dll.exedownloaddownload Win32 dynamic at 8 bits-per-pixel
ImageMagick-6.6.2-0-Q8-windows-static.exedownloaddownloadImageMagick-6.6.2-1-Q8-windows-static.exedownloaddownload Win32 static at 8 bits-per-pixel