diff --git a/MagickCore/ImageMagick.pc b/MagickCore/ImageMagick.pc
index 7ca1fc7..7af081e 100644
--- a/MagickCore/ImageMagick.pc
+++ b/MagickCore/ImageMagick.pc
@@ -7,4 +7,4 @@
Description: ImageMagick - Convert, Edit, and Compose Images
Version: 7.0.0
Libs: -L${libdir} -lMagickCore
-Cflags: -I${includedir}
+Cflags: -I${includedir} -fopenmp
diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 3adda1d..c527ee8 100644
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -12,9 +12,7 @@
/* #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
@@ -108,7 +106,9 @@
/* #undef GS_DELEGATE */
/* Define if you have GVC library */
-/* #undef GVC_DELEGATE */
+#ifndef MAGICKCORE_GVC_DELEGATE
+#define MAGICKCORE_GVC_DELEGATE 1
+#endif
/* Define to 1 if you have the `acosh' function. */
#ifndef MAGICKCORE_HAVE_ACOSH
@@ -219,9 +219,7 @@
#endif
/* Define to 1 if you have the <CL/cl.h> 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 <complex.h> header file. */
#ifndef MAGICKCORE_HAVE_COMPLEX_H
@@ -1190,9 +1188,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
@@ -1233,7 +1229,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/atlas:/usr/local/cuda/lib64:/usr/local/cuda/lib:/usr/lib/llvm:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/nvidia:/usr/lib64/tracker-0.14:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2"
+#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib/llvm:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/nvidia:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib64/tracker-0.14:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2"
#endif
/* The archive extension */
@@ -1267,7 +1263,9 @@
/* #undef LT_SHARED_EXT */
/* Define if you have LZMA library */
-/* #undef LZMA_DELEGATE */
+#ifndef MAGICKCORE_LZMA_DELEGATE
+#define MAGICKCORE_LZMA_DELEGATE 1
+#endif
/* Define to prepend to default font search path. */
/* #undef MAGICK_FONT_PATH */
@@ -1285,9 +1283,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 */
/* Name of package */
#ifndef MAGICKCORE_PACKAGE
@@ -1357,9 +1353,7 @@
#endif
/* Define if you have RSVG library */
-#ifndef MAGICKCORE_RSVG_DELEGATE
-#define MAGICKCORE_RSVG_DELEGATE 1
-#endif
+/* #undef RSVG_DELEGATE */
/* Define to the type of arg 1 for `select'. */
#ifndef MAGICKCORE_SELECT_TYPE_ARG1
@@ -1585,9 +1579,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/MagickCore/version.h b/MagickCore/version.h
index 8b0b0dc..edeaebf 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@
*/
#define MagickPackageName "ImageMagick"
#define MagickCopyright "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision ""
+#define MagickSVNRevision "7561"
#define MagickLibVersion 0x700
#define MagickLibVersionText "7.0.0"
#define MagickLibVersionNumber 7,0,0
#define MagickLibAddendum "-0"
#define MagickLibInterface 7
#define MagickLibMinInterface 7
-#define MagickReleaseDate "2012-04-20"
+#define MagickReleaseDate "2012-04-25"
#define MagickChangeDate "20110801"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
#if defined(MAGICKCORE_OPENMP_SUPPORT)
diff --git a/MagickWand/pixel-iterator.c b/MagickWand/pixel-iterator.c
index d276961..096c94e 100644
--- a/MagickWand/pixel-iterator.c
+++ b/MagickWand/pixel-iterator.c
@@ -112,7 +112,7 @@
%
% The format of the ClearPixelIterator method is:
%
-% PixelIterator *ClearPixelIterator(PixelIterator *iterator)
+% void ClearPixelIterator(PixelIterator *iterator)
%
% A description of each parameter follows:
%
@@ -364,11 +364,11 @@
%
% The format of the PixelClearIteratorException method is:
%
-% MagickBooleanType PixelClearIteratorException(PixelIterator *wand)
+% MagickBooleanType PixelClearIteratorException(PixelIterator *iterator)
%
% A description of each parameter follows:
%
-% o wand: the pixel wand.
+% o iterator: the pixel iterator.
%
*/
WandExport MagickBooleanType PixelClearIteratorException(
@@ -538,7 +538,7 @@
%
% The format of the PixelGetIteratorException method is:
%
-% char *PixelGetIteratorException(const Pixeliterator *iterator,
+% char *PixelGetIteratorException(const PixelIterator *iterator,
% ExceptionType *severity)
%
% A description of each parameter follows:
@@ -591,26 +591,27 @@
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% PixelGetIteratorExceptionType() the exception type associated with the wand.
-% If no exception has occurred, UndefinedExceptionType is returned.
+% PixelGetIteratorExceptionType() the exception type associated with the
+% iterator. If no exception has occurred, UndefinedExceptionType is returned.
%
% The format of the PixelGetIteratorExceptionType method is:
%
-% ExceptionType PixelGetIteratorExceptionType(const PixelWand *wand)
+% ExceptionType PixelGetIteratorExceptionType(
+% const PixelIterator *iterator)
%
% A description of each parameter follows:
%
-% o wand: the magick wand.
+% o iterator: the pixel iterator.
%
*/
WandExport ExceptionType PixelGetIteratorExceptionType(
- const PixelIterator *wand)
+ const PixelIterator *iterator)
{
- assert(wand != (const PixelIterator *) NULL);
- assert(wand->signature == WandSignature);
- if (wand->debug != MagickFalse)
- (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- return(wand->exception->severity);
+ assert(iterator != (const PixelIterator *) NULL);
+ assert(iterator->signature == WandSignature);
+ if (iterator->debug != MagickFalse)
+ (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",iterator->name);
+ return(iterator->exception->severity);
}
/*
diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf
index 040415b..4741b65 100644
--- a/config/ImageMagick.rdf
+++ b/config/ImageMagick.rdf
@@ -5,7 +5,7 @@
<name>ImageMagick</name>
<shortdesc xml:lang="en">ImageMagick: convert, edit, and compose images.</shortdesc>
<homepage rdf:resource="http://www.imagemagick.org/"/>
- <created>2012-04-19</created>
+ <created>2012-04-25</created>
<description xml:lang="en">
ImageMagick® is a software suite to create, edit, compose, or convert bitmap images. It can read and write images in a variety of formats (over 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves.
@@ -57,7 +57,7 @@
<release>
<Version>
<name>stable</name>
- <created>2012-04-19</created>
+ <created>2012-04-25</created>
<revision>7.0.0</revision>
<patch-level>-0</patch-level>
</Version>
diff --git a/config/configure.xml b/config/configure.xml
index d04e9a4..9ba5afc 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -11,7 +11,7 @@
<configure name="LIB_VERSION" value="0x700"/>
<configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
<configure name="SVN_REVISION" value="7561" />
- <configure name="RELEASE_DATE" value="2012-04-19"/>
+ <configure name="RELEASE_DATE" value="2012-04-25"/>
<configure name="CONFIGURE" value="./configure "/>
<configure name="PREFIX" value="/usr/local"/>
<configure name="EXEC-PREFIX" value="/usr/local"/>