diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index f79a1d2..5706ffc 100644
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -432,11 +432,6 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- double
- brightness,
- hue,
- saturation;
-
MagickBooleanType
sync;
@@ -455,15 +450,15 @@
status=MagickFalse;
continue;
}
- hue=0.0;
- saturation=0.0;
- brightness=0.0;
for (x=0; x < (ssize_t) image->columns; x++)
{
double
blue,
+ brightness,
green,
- red;
+ hue,
+ red,
+ saturation;
red=QuantumRange*DecompandsRGB(QuantumScale*GetPixelRed(image,q));
green=QuantumRange*DecompandsRGB(QuantumScale*GetPixelGreen(image,q));
@@ -505,11 +500,6 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- double
- hue,
- lightness,
- saturation;
-
MagickBooleanType
sync;
@@ -528,15 +518,15 @@
status=MagickFalse;
continue;
}
- hue=0.0;
- saturation=0.0;
- lightness=0.0;
for (x=0; x < (ssize_t) image->columns; x++)
{
double
blue,
green,
- red;
+ hue,
+ lightness,
+ red,
+ saturation;
red=QuantumRange*DecompandsRGB(QuantumScale*GetPixelRed(image,q));
green=QuantumRange*DecompandsRGB(QuantumScale*GetPixelGreen(image,q));
@@ -578,11 +568,6 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- double
- blackness,
- hue,
- whiteness;
-
MagickBooleanType
sync;
@@ -601,15 +586,15 @@
status=MagickFalse;
continue;
}
- hue=0.0;
- whiteness=0.0;
- blackness=0.0;
for (x=0; x < (ssize_t) image->columns; x++)
{
double
+ blackness,
blue,
green,
- red;
+ hue,
+ red,
+ whiteness;
red=QuantumRange*DecompandsRGB(QuantumScale*GetPixelRed(image,q));
green=QuantumRange*DecompandsRGB(QuantumScale*GetPixelGreen(image,q));
@@ -651,14 +636,6 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- double
- a,
- b,
- L,
- X,
- Y,
- Z;
-
MagickBooleanType
sync;
@@ -677,18 +654,18 @@
status=MagickFalse;
continue;
}
- L=0.0;
- a=0.0;
- b=0.0;
- X=0.0;
- Y=0.0;
- Z=0.0;
for (x=0; x < (ssize_t) image->columns; x++)
{
double
+ a,
+ b,
blue,
green,
- red;
+ L,
+ red,
+ X,
+ Y,
+ Z;
red=QuantumRange*DecompandsRGB(QuantumScale*GetPixelRed(image,q));
green=QuantumRange*DecompandsRGB(QuantumScale*GetPixelGreen(image,q));
@@ -963,11 +940,6 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- double
- X,
- Y,
- Z;
-
MagickBooleanType
sync;
@@ -986,15 +958,15 @@
status=MagickFalse;
continue;
}
- X=0.0;
- Y=0.0;
- Z=0.0;
for (x=0; x < (ssize_t) image->columns; x++)
{
double
blue,
green,
- red;
+ red,
+ X,
+ Y,
+ Z;
red=QuantumRange*DecompandsRGB(QuantumScale*GetPixelRed(image,q));
green=QuantumRange*DecompandsRGB(QuantumScale*GetPixelGreen(image,q));
@@ -2121,11 +2093,6 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- double
- blue,
- green,
- red;
-
MagickBooleanType
sync;
@@ -2144,14 +2111,14 @@
status=MagickFalse;
continue;
}
- red=0.0;
- green=0.0;
- blue=0.0;
for (x=0; x < (ssize_t) image->columns; x++)
{
double
+ blue,
brightness,
+ green,
hue,
+ red,
saturation;
hue=(double) (QuantumScale*GetPixelRed(image,q));
@@ -2194,11 +2161,6 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- double
- blue,
- green,
- red;
-
MagickBooleanType
sync;
@@ -2217,14 +2179,14 @@
status=MagickFalse;
continue;
}
- red=0.0;
- green=0.0;
- blue=0.0;
for (x=0; x < (ssize_t) image->columns; x++)
{
double
+ blue,
+ green,
hue,
lightness,
+ red,
saturation;
hue=(double) (QuantumScale*GetPixelRed(image,q));
@@ -2267,11 +2229,6 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- double
- blue,
- green,
- red;
-
MagickBooleanType
sync;
@@ -2290,14 +2247,14 @@
status=MagickFalse;
continue;
}
- red=0.0;
- green=0.0;
- blue=0.0;
for (x=0; x < (ssize_t) image->columns; x++)
{
double
blackness,
+ blue,
+ green,
hue,
+ red,
whiteness;
hue=(double) (QuantumScale*GetPixelRed(image,q));
@@ -2340,17 +2297,6 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- double
- X,
- Y,
- Z;
-
- double
- blue,
- green,
- red;
-
-
MagickBooleanType
sync;
@@ -2369,18 +2315,18 @@
status=MagickFalse;
continue;
}
- X=0.0;
- Y=0.0;
- Z=0.0;
- red=0.0;
- green=0.0;
- blue=0.0;
for (x=0; x < (ssize_t) image->columns; x++)
{
double
a,
b,
- L;
+ blue,
+ green,
+ L,
+ red,
+ X,
+ Y,
+ Z;
L=QuantumScale*GetPixelRed(image,q);
a=QuantumScale*GetPixelGreen(image,q);
@@ -2595,11 +2541,6 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- double
- blue,
- green,
- red;
-
MagickBooleanType
sync;
@@ -2618,12 +2559,12 @@
status=MagickFalse;
continue;
}
- red=0.0;
- green=0.0;
- blue=0.0;
for (x=0; x < (ssize_t) image->columns; x++)
{
double
+ blue,
+ green,
+ red,
X,
Y,
Z;
diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index b0eaf6b..595e023 100644
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -2853,12 +2853,9 @@
*artifact;
double
- blue,
- green,
percent_brightness,
percent_hue,
- percent_saturation,
- red;
+ percent_saturation;
GeometryInfo
geometry_info;
@@ -2913,6 +2910,11 @@
#endif
for (i=0; i < (ssize_t) image->colors; i++)
{
+ double
+ blue,
+ green,
+ red;
+
red=image->colormap[i].red;
green=image->colormap[i].green;
blue=image->colormap[i].blue;
@@ -2968,6 +2970,11 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
+ double
+ blue,
+ green,
+ red;
+
red=(double) GetPixelRed(image,q);
green=(double) GetPixelGreen(image,q);
blue=(double) GetPixelBlue(image,q);
diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 17948d5..db7b2c9 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/R/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/openmotif:/usr/lib64/qt-3.3/lib:/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/lib64/freetype-freeworld:/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 */
@@ -1357,9 +1355,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
@@ -1517,9 +1513,7 @@
#endif
/* Define if you have WEBP library */
-#ifndef MAGICKCORE_WEBP_DELEGATE
-#define MAGICKCORE_WEBP_DELEGATE 1
-#endif
+/* #undef WEBP_DELEGATE */
/* Define to use the Windows GDI32 library */
/* #undef WINGDI32_DELEGATE */
@@ -1592,9 +1586,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 2a98f8d..a4d56c7 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@
*/
#define MagickPackageName "ImageMagick"
#define MagickCopyright "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision ""
+#define MagickSVNRevision "8354"
#define MagickLibVersion 0x700
#define MagickLibVersionText "7.0.0"
#define MagickLibVersionNumber 7,0,0
diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf
index d9d79dd..1fd05a3 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-06-20</created>
+ <created>2012-06-27</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-06-20</created>
+ <created>2012-06-27</created>
<revision>7.0.0</revision>
<patch-level>-0</patch-level>
</Version>
diff --git a/config/configure.xml b/config/configure.xml
index ad6b5a2..4ef67c7 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="8354" />
- <configure name="RELEASE_DATE" value="2012-06-20"/>
+ <configure name="RELEASE_DATE" value="2012-06-27"/>
<configure name="CONFIGURE" value="./configure "/>
<configure name="PREFIX" value="/usr/local"/>
<configure name="EXEC-PREFIX" value="/usr/local"/>
diff --git a/config/delegates.xml b/config/delegates.xml
index db48529..7a44235 100644
--- a/config/delegates.xml
+++ b/config/delegates.xml
@@ -75,6 +75,7 @@
<delegate decode="cgm" thread-support="False" command=""ralcgm" -d ps -oC < "%i" > "%o" 2> "%Z""/>
<delegate decode="dvi" command=""dvips" -q -o "%o" "%i""/>
<delegate decode="dng:decode" command=""ufraw-batch" --silent --create-id=also --out-type=png --out-depth=16 "--output=%u.png" "%i""/>
+ <delegate decode="dot" command='"dot" -Tsvg "%i" -o "%o"' />
<delegate decode="edit" stealth="True" command=""xterm" -title "Edit Image Comment" -e vi "%o""/>
<delegate decode="eps" encode="pdf" mode="bi" command=""gs" -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 "-sDEVICE=pdfwrite" "-sOutputFile=%o" "-f%i""/>
<delegate decode="eps" encode="ps" mode="bi" command=""gs" -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=pswrite" "-sOutputFile=%o" "-f%i""/>
diff --git a/utilities/display.1 b/utilities/display.1
index 6834472..4b74af4 100644
--- a/utilities/display.1
+++ b/utilities/display.1
@@ -120,6 +120,10 @@
1 press to map or unmap the Command widget
2 press and drag to magnify a region of an image
3 press to load an image from a visual image directory
+.SH NOTE
+The display program defaults to the X screen resolution. To display vector formats at their intended size, override the default resolution:
+
+ display -density 72 drawing.svg
.SH SEE ALSO
ImageMagick(1)
diff --git a/utilities/identify.1 b/utilities/identify.1
index aa4214e..6147f15 100644
--- a/utilities/identify.1
+++ b/utilities/identify.1
@@ -56,6 +56,8 @@
\-version print version information
By default, the image format of `file' is determined by its magic number. To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps). Specify 'file' as '-' for standard input or output.
+.SH NOTE
+Although some options appear to modify the file to be identified, the identify command is strictly \fBread only\fP. For instance, the crop option crops the in-memory image and then describes the result.
.SH SEE ALSO
ImageMagick(1)