(no commit message)

diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am
index 21759c2fa3f57e4ad62a327188825f275ff21639..cc6371661d877e2ccbeb307757316e58e153cd48 100644 (file)
--- a/MagickCore/Makefile.am
+++ b/MagickCore/Makefile.am
@@ -198,6 +198,9 @@ MAGICKCORE_BASE_SRCS = \
        MagickCore/nt-base.h \
   MagickCore/nt-base-private.h \
        MagickCore/nt-feature.h \
+       MagickCore/opencl.c \
+       MagickCore/opencl.h \
+       MagickCore/opencl-private.h \
        MagickCore/option.c \
        MagickCore/option.h \
        MagickCore/paint.c \
@@ -370,6 +373,7 @@ MAGICKCORE_INCLUDE_HDRS = \
        MagickCore/montage.h \
        MagickCore/morphology.h \
        MagickCore/nt-base.h \
+       MagickCore/opencl.h \
        MagickCore/option.h \
        MagickCore/paint.h \
        MagickCore/pixel.h \
@@ -443,6 +447,7 @@ MAGICKCORE_NOINST_HDRS = \
        MagickCore/morphology-private.h \
        MagickCore/nt-base.h \
        MagickCore/nt-feature.h \
+       MagickCore/opencl-private.h \
        MagickCore/pixel-private.h \
        MagickCore/policy-private.h \
        MagickCore/profile-private.h \

diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h
index 01b4fb01f1fbd2564ec39f7e563660a8cb0f8eaf..b6439efa55775c32cf3a2867bbb814b7e0471b28 100644 (file)
--- a/MagickCore/magick-baseconfig.h
+++ b/MagickCore/magick-baseconfig.h
@@ -37,7 +37,7 @@
 
 /* Directory where architecture-dependent configuration files live. */
 #ifndef MAGICKCORE_CONFIGURE_PATH
-#define MAGICKCORE_CONFIGURE_PATH "/usr/local/etc/ImageMagick-7/"
+#define MAGICKCORE_CONFIGURE_PATH "/usr/etc/ImageMagick-7/"
 #endif
 
 /* Subdirectory of lib where architecture-dependent configuration files live.
@@ -53,7 +53,7 @@
 
 /* Directory where ImageMagick documents live. */
 #ifndef MAGICKCORE_DOCUMENTATION_PATH
-#define MAGICKCORE_DOCUMENTATION_PATH "/usr/local/share/doc/ImageMagick-7/"
+#define MAGICKCORE_DOCUMENTATION_PATH "/usr/share/doc/ImageMagick-7/"
 #endif
 
 /* Define if you have Display Postscript */
@@ -64,7 +64,7 @@
 
 /* Directory where executables are installed. */
 #ifndef MAGICKCORE_EXECUTABLE_PATH
-#define MAGICKCORE_EXECUTABLE_PATH "/usr/local/bin/"
+#define MAGICKCORE_EXECUTABLE_PATH "/usr/bin/"
 #endif
 
 /* Define if you have FFTW library */
@@ -467,7 +467,9 @@
 #endif
 
 /* Define to 1 if you have a working `mmap' system call. */
-/* #undef HAVE_MMAP_FILEIO */
+#ifndef MAGICKCORE_HAVE_MMAP_FILEIO
+#define MAGICKCORE_HAVE_MMAP_FILEIO 1
+#endif
 
 /* Define to 1 if you have the `munmap' function. */
 #ifndef MAGICKCORE_HAVE_MUNMAP
@@ -1048,7 +1050,9 @@
 /* #undef HAVE__ALIGNED_MALLOC */
 
 /* Define to 1 if the system has the type `_Bool'. */
-/* #undef HAVE__BOOL */
+#ifndef MAGICKCORE_HAVE__BOOL
+#define MAGICKCORE_HAVE__BOOL 1
+#endif
 
 /* Define to 1 if you have the `_exit' function. */
 #ifndef MAGICKCORE_HAVE__EXIT
@@ -1085,12 +1089,12 @@
 
 /* Directory where ImageMagick architecture headers live. */
 #ifndef MAGICKCORE_INCLUDEARCH_PATH
-#define MAGICKCORE_INCLUDEARCH_PATH "/usr/local/include/ImageMagick-7/"
+#define MAGICKCORE_INCLUDEARCH_PATH "/usr/include/ImageMagick-7/"
 #endif
 
 /* Directory where ImageMagick headers live. */
 #ifndef MAGICKCORE_INCLUDE_PATH
-#define MAGICKCORE_INCLUDE_PATH "/usr/local/include/ImageMagick-7/"
+#define MAGICKCORE_INCLUDE_PATH "/usr/include/ImageMagick-7/"
 #endif
 
 /* ImageMagick is formally installed under prefix */
@@ -1118,7 +1122,7 @@
 
 /* Directory where architecture-dependent files live. */
 #ifndef MAGICKCORE_LIBRARY_PATH
-#define MAGICKCORE_LIBRARY_PATH "/usr/local/lib/ImageMagick-7.0.0/"
+#define MAGICKCORE_LIBRARY_PATH "/usr/lib/ImageMagick-7.0.0/"
 #endif
 
 /* Subdirectory of lib where ImageMagick architecture dependent files are
@@ -1285,7 +1289,7 @@
 
 /* Directory where architecture-independent configuration files live. */
 #ifndef MAGICKCORE_SHARE_PATH
-#define MAGICKCORE_SHARE_PATH "/usr/local/share/ImageMagick-7/"
+#define MAGICKCORE_SHARE_PATH "/usr/share/ImageMagick-7/"
 #endif
 
 /* Subdirectory of lib where architecture-independent configuration files

diff --git a/MagickCore/opencl-private.h b/MagickCore/opencl-private.h
new file mode 100644 (file)
index 0000000..38c505b
--- /dev/null
+++ b/MagickCore/opencl-private.h
@@ -0,0 +1,29 @@
+/*
+  Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization
+  dedicated to making software imaging solutions freely available.
+  
+  You may not use this file except in compliance with the License.
+  obtain a copy of the License at
+  
+    http://www.imagemagick.org/script/license.php
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  MagickCore OpenCL private methods.
+*/
+#ifndef _MAGICKCORE_OPENCL_PRIVATE_H
+#define _MAGICKCORE_OPENCL_PRIVATE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif

diff --git a/MagickCore/opencl.c b/MagickCore/opencl.c
new file mode 100644 (file)
index 0000000..61454b9
--- /dev/null
+++ b/MagickCore/opencl.c
@@ -0,0 +1,76 @@
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%                   OOO   PPPP   EEEEE  N   N   CCCC  L                       %
+%                  O   O  P   P  E      NN  N  C      L                       %
+%                  O   O  PPPP   EEE    N N N  C      L                       %
+%                  O   O  P      E      N  NN  C      L                       %
+%                   OOO   P      EEEEE  N   N   CCCC  LLLLL                   %
+%                                                                             %
+%                                                                             %
+%                         MagickCore OpenCL Methods                           %
+%                                                                             %
+%                              Software Design                                %
+%                                John Cristy                                  %
+%                                 March 2000                                  %
+%                                                                             %
+%                                                                             %
+%  Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization      %
+%  dedicated to making software imaging solutions freely available.           %
+%                                                                             %
+%  You may not use this file except in compliance with the License.  You may  %
+%  obtain a copy of the License at                                            %
+%                                                                             %
+%    http://www.imagemagick.org/script/license.php                            %
+%                                                                             %
+%  Unless required by applicable law or agreed to in writing, software        %
+%  distributed under the License is distributed on an "AS IS" BASIS,          %
+%  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   %
+%  See the License for the specific language governing permissions and        %
+%  limitations under the License.                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%
+%
+*/
+\f
+/*
+  Include declarations.
+*/
+#include "MagickCore/studio.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/compare.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/distort.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/effect.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/fx.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/layer.h"
+#include "MagickCore/mime-private.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/montage.h"
+#include "MagickCore/morphology.h"
+#include "MagickCore/option.h"
+#include "MagickCore/policy.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/resample.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/token.h"
+#include "MagickCore/utility.h"

diff --git a/MagickCore/opencl.h b/MagickCore/opencl.h
new file mode 100644 (file)
index 0000000..5f21fc2
--- /dev/null
+++ b/MagickCore/opencl.h
@@ -0,0 +1,29 @@
+/*
+  Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization
+  dedicated to making software imaging solutions freely available.
+  
+  You may not use this file except in compliance with the License.
+  obtain a copy of the License at
+  
+    http://www.imagemagick.org/script/license.php
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  MagickCore OpenCL public methods.
+*/
+#ifndef _MAGICKCORE_OPENCL_H
+#define _MAGICKCORE_OPENCL_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif

diff --git a/MagickCore/version.h b/MagickCore/version.h
index c9722ccdc4c8435644ea6f943212d08844e096ab..b4f6d6ff8afcc72c7d614848c37101a5f24bfd8d 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2013 ImageMagick Studio LLC"
-#define MagickSVNRevision  "12671:12693M"
+#define MagickSVNRevision  "12714:12732M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0
@@ -39,12 +39,12 @@ extern "C" {
 #define MagickppLibAddendum  "-0"
 #define MagickppLibInterface  2
 #define MagickppLibMinInterface  2
-#define MagickReleaseDate  "2013-07-16"
+#define MagickReleaseDate  "2013-07-19"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"
 #define MagickDelegates "bzlib djvu fftw fontconfig freetype jng jp2 jpeg lcms lzma openexr pango png ps tiff x xml zlib"
-#define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-7/index.html"
+#define MagickHomeURL  "file:///usr/share/doc/ImageMagick-7/index.html"
 #if (MAGICKCORE_QUANTUM_DEPTH == 8)
 #define MagickQuantumDepth  "Q8"
 #define MagickQuantumRange  "255"

diff --git a/Makefile.in b/Makefile.in
index 1620943cdf92bae859e8f52b793874ae6bbf6561..594bb28b2861a2f8bf68a2cb8f8bd1b15fa338bf 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -496,9 +496,10 @@ am__MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURC
        MagickCore/montage.h MagickCore/morphology.c \
        MagickCore/morphology.h MagickCore/morphology-private.h \
        MagickCore/nt-base.h MagickCore/nt-base-private.h \
-       MagickCore/nt-feature.h MagickCore/option.c \
-       MagickCore/option.h MagickCore/paint.c MagickCore/paint.h \
-       MagickCore/pixel.c MagickCore/pixel.h \
+       MagickCore/nt-feature.h MagickCore/opencl.c \
+       MagickCore/opencl.h MagickCore/opencl-private.h \
+       MagickCore/option.c MagickCore/option.h MagickCore/paint.c \
+       MagickCore/paint.h MagickCore/pixel.c MagickCore/pixel.h \
        MagickCore/pixel-accessor.h MagickCore/pixel-private.h \
        MagickCore/policy.c MagickCore/policy.h \
        MagickCore/PreRvIcccm.c MagickCore/PreRvIcccm.h \
@@ -624,6 +625,7 @@ am__objects_1 = MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGI
        MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-monitor.lo \
        MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-montage.lo \
        MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-morphology.lo \
+       MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-opencl.lo \
        MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-option.lo \
        MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-paint.lo \
        MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pixel.lo \
@@ -4245,6 +4247,9 @@ MAGICKCORE_BASE_SRCS = \
        MagickCore/nt-base.h \
   MagickCore/nt-base-private.h \
        MagickCore/nt-feature.h \
+       MagickCore/opencl.c \
+       MagickCore/opencl.h \
+       MagickCore/opencl-private.h \
        MagickCore/option.c \
        MagickCore/option.h \
        MagickCore/paint.c \
@@ -4412,6 +4417,7 @@ MAGICKCORE_INCLUDE_HDRS = \
        MagickCore/montage.h \
        MagickCore/morphology.h \
        MagickCore/nt-base.h \
+       MagickCore/opencl.h \
        MagickCore/option.h \
        MagickCore/paint.h \
        MagickCore/pixel.h \
@@ -4485,6 +4491,7 @@ MAGICKCORE_NOINST_HDRS = \
        MagickCore/morphology-private.h \
        MagickCore/nt-base.h \
        MagickCore/nt-feature.h \
+       MagickCore/opencl-private.h \
        MagickCore/pixel-private.h \
        MagickCore/policy-private.h \
        MagickCore/profile-private.h \
@@ -5539,6 +5546,9 @@ MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_l
 MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-morphology.lo:  \
        MagickCore/$(am__dirstamp) \
        MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-opencl.lo:  \
+       MagickCore/$(am__dirstamp) \
+       MagickCore/$(DEPDIR)/$(am__dirstamp)
 MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-option.lo:  \
        MagickCore/$(am__dirstamp) \
        MagickCore/$(DEPDIR)/$(am__dirstamp)
@@ -7053,6 +7063,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-morphology.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-nt-base.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-nt-feature.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-opencl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-option.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-paint.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pixel.Plo@am__quote@
@@ -7767,6 +7778,13 @@ MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_l
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-morphology.lo `test -f 'MagickCore/morphology.c' || echo '$(srcdir)/'`MagickCore/morphology.c
 
+MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-opencl.lo: MagickCore/opencl.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-opencl.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-opencl.Tpo -c -o MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-opencl.lo `test -f 'MagickCore/opencl.c' || echo '$(srcdir)/'`MagickCore/opencl.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-opencl.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-opencl.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='MagickCore/opencl.c' object='MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-opencl.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-opencl.lo `test -f 'MagickCore/opencl.c' || echo '$(srcdir)/'`MagickCore/opencl.c
+
 MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-option.lo: MagickCore/option.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-option.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-option.Tpo -c -o MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-option.lo `test -f 'MagickCore/option.c' || echo '$(srcdir)/'`MagickCore/option.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-option.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-option.Plo

diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL
index 8a8cd91ceaa25360ebde54ed47e4310801e5efdf..5e4b89d364a8468e6ef5d1bc3447aad14eedc113 100644 (file)
--- a/PerlMagick/Makefile.PL
+++ b/PerlMagick/Makefile.PL
@@ -206,7 +206,7 @@ WriteMakefile
    'INC'       => $INC_magick,
 
    # C compiler
-   #'CC' => 'c++',
+   #'CC' => 'gcc -std=gnu99 -std=gnu99',
 
    # C pre-processor flags (e.g. -I & -D options)
    # 'CPPFLAGS' => "$Config{'cppflags'} -pthread -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15 -I/usr/include/libdrm -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -I/usr/include/libxml2",
@@ -215,7 +215,7 @@ WriteMakefile
    'CCFLAGS' => $CCFLAGS_magick,
 
    # Linker
-   #'LD' => $Config{'ld'} == $Config{'cc'} ? 'c++' : $Config{'ld'},
+   #'LD' => $Config{'ld'} == $Config{'cc'} ? 'gcc -std=gnu99 -std=gnu99' : $Config{'ld'},
 
    # Linker flags for building an executable
    'LDFLAGS' =>  $LDFLAGS_magick,
@@ -224,7 +224,7 @@ WriteMakefile
    'LDDLFLAGS' => $LDDLFLAGS_magick,
 
    # Install PerlMagick binary into ImageMagick bin directory
-   'INSTALLBIN'        => '/usr/local/bin',
+   'INSTALLBIN'        => '/usr/bin',
 
    # Library specification
    'LIBS' => [ $LIBS_magick ],
@@ -236,12 +236,12 @@ WriteMakefile
    # 'OPTIMIZE'        => '',
 
    # Use same compiler as ImageMagick
-   'PERLMAINCC'        => 'c++ -fopenmp',
+   'PERLMAINCC'        => ' -fopenmp',
    'AR' => 'ar',
-   'LD' => 'c++',
+   'LD' => '',
 
    # Set Perl installation prefix to ImageMagick installation prefix
-#   'PREFIX'   => '/usr/local',
+#   'PREFIX'   => '/usr',
 
    # Include delegate directories in tests
    test        => { TESTS      =>      $delegate_tests},
@@ -266,6 +266,6 @@ sub MY::makeaperl {
      # tries to insert our library path first. Also, use the same compiler used
      # to build perlmain.c to link so that a C++ compiler may be used if
      # necessary.
-     $inherited =~ s:MAP_LINKCMD\s.*\s*\$\(CC\):MAP_LINKCMD   = \$(PERLMAINCC) -L/usr/local/lib: ;
+     $inherited =~ s:MAP_LINKCMD\s.*\s*\$\(CC\):MAP_LINKCMD   = \$(PERLMAINCC) -L/usr/lib: ;
      $inherited;
  }

diff --git a/PerlMagick/check.sh b/PerlMagick/check.sh
index 49926a71816b27886766b61993a67ea15796ddd2..f7f8cba924aa448f052b026a27cfb7f3564c74e8 100755 (executable)
--- a/PerlMagick/check.sh
+++ b/PerlMagick/check.sh
@@ -42,10 +42,10 @@ fi
 
 if test -x PerlMagick -a -f Makefile.aperl ; then
   # Static build test incantation
-  ${MAKE} -f Makefile.aperl CC='c++' TEST_VERBOSE=1 test
+  ${MAKE} -f Makefile.aperl CC='gcc -std=gnu99 -std=gnu99' TEST_VERBOSE=1 test
 elif test -f Makefile -a -f Magick.o; then
   # Shared build test incantation
-  ${MAKE} CC='c++' TEST_VERBOSE=1 test
+  ${MAKE} CC='gcc -std=gnu99 -std=gnu99' TEST_VERBOSE=1 test
 else
   echo 'PerlMagick has not been built!'
   exit 1

diff --git a/PerlMagick/quantum/Makefile.PL b/PerlMagick/quantum/Makefile.PL
index 24fc6768cff0cd46feaa7851978172d3e3938de7..2eeca24e01bd60e7bcd46cebf177c997e7b1ecaa 100644 (file)
--- a/PerlMagick/quantum/Makefile.PL
+++ b/PerlMagick/quantum/Makefile.PL
@@ -203,7 +203,7 @@ WriteMakefile
    'INC'       => $INC_magick,
 
    # C compiler
-   #'CC' => 'c++',
+   #'CC' => 'gcc -std=gnu99 -std=gnu99',
 
    # C pre-processor flags (e.g. -I & -D options)
    # 'CPPFLAGS' => "$Config{'cppflags'} -pthread -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15 -I/usr/include/libdrm -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -I/usr/include/libxml2",
@@ -212,7 +212,7 @@ WriteMakefile
    'CCFLAGS' => $CCFLAGS_magick,
 
    # Linker
-   #'LD' => $Config{'ld'} == $Config{'cc'} ? 'c++' : $Config{'ld'},
+   #'LD' => $Config{'ld'} == $Config{'cc'} ? 'gcc -std=gnu99 -std=gnu99' : $Config{'ld'},
 
    # Linker flags for building an executable
    'LDFLAGS' =>  $LDFLAGS_magick,
@@ -221,7 +221,7 @@ WriteMakefile
    'LDDLFLAGS' => $LDDLFLAGS_magick,
 
    # Install PerlMagick binary into ImageMagick bin directory
-   'INSTALLBIN'        => '/usr/local/bin',
+   'INSTALLBIN'        => '/usr/bin',
 
    # Library specification
    'LIBS' => [ $LIBS_magick ],
@@ -233,14 +233,14 @@ WriteMakefile
    # 'OPTIMIZE'        => '',
 
    # Use same compiler as ImageMagick
-   'PERLMAINCC'        => 'c++ -fopenmp',
+   'PERLMAINCC'        => ' -fopenmp',
    'PM' => { 'Q16HDRI.pm' => '$(INST_LIBDIR)/Q16HDRI.pm' },
    'XS' => { 'Q16HDRI.xs' => 'Q16HDRI.xs' },
    'AR' => 'ar',
-   'LD' => 'c++',
+   'LD' => '',
 
    # Set Perl installation prefix to ImageMagick installation prefix
-#   'PREFIX'   => '/usr/local',
+#   'PREFIX'   => '/usr',
 
    # Include delegate directories in tests
    test        => { TESTS      =>      $delegate_tests},
@@ -265,6 +265,6 @@ sub MY::makeaperl {
      # tries to insert our library path first. Also, use the same compiler used
      # to build perlmain.c to link so that a C++ compiler may be used if
      # necessary.
-     $inherited =~ s:MAP_LINKCMD\s.*\s*\$\(CC\):MAP_LINKCMD   = \$(PERLMAINCC) -L/usr/local/lib: ;
+     $inherited =~ s:MAP_LINKCMD\s.*\s*\$\(CC\):MAP_LINKCMD   = \$(PERLMAINCC) -L/usr/lib: ;
      $inherited;
  }

diff --git a/PerlMagick/quantum/quantum.pm b/PerlMagick/quantum/quantum.pm
index 071fd1d2ea60dbb258d5372d720281e8839b5ece..6df5cc5f3b312772f110534c29e38138bbeadc6d 100644 (file)
--- a/PerlMagick/quantum/quantum.pm
+++ b/PerlMagick/quantum/quantum.pm
@@ -122,7 +122,7 @@ It was originally developed to be used by CGI scripts for Web pages.
 
 A web page has been set up for this extension. See:
 
-        file:///usr/local/share/doc/ImageMagick-7/www/perl-magick.html
+        file:///usr/share/doc/ImageMagick-7/www/perl-magick.html
         http://www.imagemagick.org/script/perl-magick.php
 
 If you have problems, go to

diff --git a/configure b/configure
index 94ef5ed298f25e74d8b7e60a401d0c55aa6965a6..4001a54a688e9769f99ec718888e3041e97fdef9 100755 (executable)
--- a/configure
+++ b/configure
@@ -3686,7 +3686,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=12671:12693M
+MAGICK_SVN_REVISION=12714:12732M
 
 
 # Substitute library versioning

diff --git a/utilities/ImageMagick.1 b/utilities/ImageMagick.1
index 7e4cf073a869212eee664b94bf491ce3ae41750e..05f946e9432c3439bc7857d139195067da9e32ec 100644 (file)
--- a/utilities/ImageMagick.1
+++ b/utilities/ImageMagick.1
@@ -86,9 +86,9 @@ saves any visible window on an X server and outputs it as an image file. You can
 
 interprets and executes scripts written in the Magick Scripting Language (MSL).
 .PP
-For more information about the ImageMagick, point your browser to file:///usr/local/share/doc/ImageMagick-7/index.html or http://www.imagemagick.org/.
+For more information about the ImageMagick, point your browser to file:///usr/share/doc/ImageMagick-7/index.html or http://www.imagemagick.org/.
 .SH SEE ALSO
 convert(1), identify(1), composite(1), montage(1), compare(1), display(1), animate(1), import(1), conjure(1), quantize(5), miff(4)
 
 .SH COPYRIGHT
-\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/animate.1 b/utilities/animate.1
index 4800181c782a1ca3216ee1edd9c0a1fb51d05c53..a5be969903930ce9f3c2c1bed8f5ce304f306f3d 100644 (file)
--- a/utilities/animate.1
+++ b/utilities/animate.1
@@ -7,7 +7,7 @@ animate \- animates an image or image sequence on any X server.
 .SH OVERVIEW
 The \fBanimate\fP program is a member of the ImageMagick(1) suite of tools.  Use it to animate an image or image sequence on any X server.
 
-For more information about the animate command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/animate.html or http://www.imagemagick.org/script/animate.php.
+For more information about the animate command, point your browser to file:///usr/share/doc/ImageMagick-7/www/animate.html or http://www.imagemagick.org/script/animate.php.
 .SH DESCRIPTION
 Image Settings:
   \-authenticate value  decrypt image with this password
@@ -93,4 +93,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/compare.1 b/utilities/compare.1
index 4bbede1e1289fcb7c289a6a6cff92adedfb0ff83..10687f3131e68d16664a5554a0d6786c47afd952 100644 (file)
--- a/utilities/compare.1
+++ b/utilities/compare.1
@@ -7,7 +7,7 @@ compare \- mathematically and visually annotate the difference between an image
 .SH OVERVIEW
 The \fBcompare\fP program is a member of the ImageMagick(1) suite of tools.  Use it to mathematically and visually annotate the difference between an image and its reconstruction.
 
-For more information about the compare command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/compare.html or http://www.imagemagick.org/script/compare.php.
+For more information about the compare command, point your browser to file:///usr/share/doc/ImageMagick-7/www/compare.html or http://www.imagemagick.org/script/compare.php.
 .SH DESCRIPTION
 Image Settings:
   \-authenticate value  decrypt image with this password
@@ -70,4 +70,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/composite.1 b/utilities/composite.1
index 254722c00b25c92071b1d9d65b004741f4f257fc..68bbbe9e201b4d8e4f49a6834646282691b88732 100644 (file)
--- a/utilities/composite.1
+++ b/utilities/composite.1
@@ -7,7 +7,7 @@ composite \-  overlaps one image over another.
 .SH OVERVIEW
 The \fBcomposite\fP program is a member of the ImageMagick(1) suite of tools.  Use it to overlap one image over another.
 
-For more information about the composite command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/composite.html or http://www.imagemagick.org/script/composite.php.
+For more information about the composite command, point your browser to file:///usr/share/doc/ImageMagick-7/www/composite.html or http://www.imagemagick.org/script/composite.php.
 .SH DESCRIPTION
 Image Settings:
   \-affine matrix       affine transform matrix
@@ -103,4 +103,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/conjure.1 b/utilities/conjure.1
index d1fa0c63f7f8e465fecbee807725389fdfbc9c9a..1c5064dea9f8a57f7c07ea85b77a76014ee86eb4 100644 (file)
--- a/utilities/conjure.1
+++ b/utilities/conjure.1
@@ -7,7 +7,7 @@ conjure \- interprets and executes scripts written in the Magick Scripting Langu
 .SH OVERVIEW
 The \fBconjure\fP program is a member of the ImageMagick(1) suite of tools.  Use it to process a Magick Scripting Language (MSL) script. The Magick scripting language (MSL) will primarily benefit those that want to accomplish custom image processing tasks but do not wish to program, or those that do not have access to a Perl interpreter or a compiler.
 
-For more information about the conjure command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/conjure.html or http://www.imagemagick.org/script/conjure.php.
+For more information about the conjure command, point your browser to file:///usr/share/doc/ImageMagick-7/www/conjure.html or http://www.imagemagick.org/script/conjure.php.
 .SH DESCRIPTION
 Image Settings:
   \-monitor             monitor progress
@@ -31,4 +31,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/convert.1 b/utilities/convert.1
index 93916ee00b8bb11740bcf9d1a1f26b8cd0982a19..1259714709fb222413124f5d1c76813026c2973f 100644 (file)
--- a/utilities/convert.1
+++ b/utilities/convert.1
@@ -7,7 +7,7 @@ convert \- convert between image formats as well as resize an image, blur, crop,
 .SH OVERVIEW
 The \fBconvert\fP program is a member of the ImageMagick(1) suite of tools.  Use it to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more.  
 
-For more information about the convert command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/convert.html or http://www.imagemagick.org/script/convert.php.
+For more information about the convert command, point your browser to file:///usr/share/doc/ImageMagick-7/www/convert.html or http://www.imagemagick.org/script/convert.php.
 .SH DESCRIPTION
 Image Settings:
   \-adjoin              join images into a single multi-image file
@@ -284,4 +284,4 @@ By default, the image format of `file' is determined by its magic number.  To sp
 ImageMagick(1)
 
 .SH COPYRIGHT
-\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/display.1 b/utilities/display.1
index 9c2f239d440dd7a84f61291930dd985b9bc53001..f44c0216c24cab7189fe378e512b74ecc8301582 100644 (file)
--- a/utilities/display.1
+++ b/utilities/display.1
@@ -7,7 +7,7 @@ display \- displays an image or image sequence on any X server.
 .SH OVERVIEW
 The \fBdisplay\fP program is a member of the ImageMagick(1) suite of tools.  Use it to display an image or image sequence on any X server.
 
-For more information about the display command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/display.html or http://www.imagemagick.org/script/display.php.
+For more information about the display command, point your browser to file:///usr/share/doc/ImageMagick-7/www/display.html or http://www.imagemagick.org/script/display.php.
 .SH DESCRIPTION
 Image Settings:
   \-antialias           remove pixel-aliasing
@@ -129,4 +129,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/identify.1 b/utilities/identify.1
index abac62114bdb9137dd2fcfcfc031b2f3ffea2d67..8abe29006a65ea70b5f11b191b5127424c3cdd02 100644 (file)
--- a/utilities/identify.1
+++ b/utilities/identify.1
@@ -7,7 +7,7 @@ identify \- describes the format and characteristics of one or more image files.
 .SH OVERVIEW
 The \fBidentify\fP program is a member of the ImageMagick(1) suite of tools.  It describes the format and characteristics of one or more image files. It also reports if an image is incomplete or corrupt. The information returned includes the image number, the file name, the width and height of the image, whether the image is colormapped or not, the number of colors in the image (by default off use \fI-define unique=true\fP option), the number of bytes in the image, the format of the image (JPEG, PNM, etc.), and finally the number of seconds it took to read and process the image. Many more attributes are available with the verbose option.
 
-For more information about the identify command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/identify.html or http://www.imagemagick.org/script/identify.php.
+For more information about the identify command, point your browser to file:///usr/share/doc/ImageMagick-7/www/identify.html or http://www.imagemagick.org/script/identify.php.
 .SH DESCRIPTION
 Image Settings:
   \-antialias           remove pixel-aliasing
@@ -68,4 +68,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/import.1 b/utilities/import.1
index 5e27f5f43234d9db5be7641688a973a0d4e418d5..11426cae03c0826f5e208bb62173a4e499aa18bd 100644 (file)
--- a/utilities/import.1
+++ b/utilities/import.1
@@ -7,7 +7,7 @@ import \- saves any visible window on an X server and outputs it as an image fil
 .SH OVERVIEW
 The \fBimport\fP program is a member of the ImageMagick(1) suite of tools.  Use it to capture some or all of an X server screen and save the image to a file.
 
-For more information about the import command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/import.html or http://www.imagemagick.org/script/import.php.
+For more information about the import command, point your browser to file:///usr/share/doc/ImageMagick-7/www/import.html or http://www.imagemagick.org/script/import.php.
 .SH DESCRIPTION
 Image Settings:
   \-adjoin              join images into a single multi-image file
@@ -94,4 +94,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/mogrify.1 b/utilities/mogrify.1
index 7c2681c9fa1ec407b029bbab1180e13528065c52..04ba4434a0ade3aae1f182223a392b0c6dc7ebb6 100644 (file)
--- a/utilities/mogrify.1
+++ b/utilities/mogrify.1
@@ -7,7 +7,7 @@ mogrify \- resize an image, blur, crop, despeckle, dither, draw on, flip, join,
 .SH OVERVIEW
 The \fBmogrify\fP program is a member of the ImageMagick(1) suite of tools.  Use it to resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. This tool is similar to convert(1) except the original image file is overwritten with any changes you request.
 
-For more information about the mogrify command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/mogrify.html or http://www.imagemagick.org/script/mogrify.php.
+For more information about the mogrify command, point your browser to file:///usr/share/doc/ImageMagick-7/www/mogrify.html or http://www.imagemagick.org/script/mogrify.php.
 .SH DESCRIPTION
 Image Settings:
   \-adjoin              join images into a single multi-image file
@@ -283,4 +283,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/montage.1 b/utilities/montage.1
index d85a08950eaa3a920e307175c160cf074d8b34f7..1bc7ce1f5041286790c1bfba46aba5a4db0cb8a0 100644 (file)
--- a/utilities/montage.1
+++ b/utilities/montage.1
@@ -7,7 +7,7 @@ montage \- create a composite image by combining several separate images. The im
 .SH OVERVIEW
 The \fBmontage\fP program is a member of the ImageMagick(1) suite of tools.  Use it to create a composite image by combining several separate images. The images are tiled on the composite image optionally adorned with a border, frame, image name, and more.
 
-For more information about the montage command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/montage.html or http://www.imagemagick.org/script/montage.php.
+For more information about the montage command, point your browser to file:///usr/share/doc/ImageMagick-7/www/montage.html or http://www.imagemagick.org/script/montage.php.
 .SH DESCRIPTION
 Image Settings:
   \-adjoin              join images into a single multi-image file
@@ -131,4 +131,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/stream.1 b/utilities/stream.1
index b99d7f487512a022bd2be72ff1f31df5110b1899..3b8bc2a4b1aa014fcec44b7bfc8f693dc51cd2f3 100644 (file)
--- a/utilities/stream.1
+++ b/utilities/stream.1
@@ -7,7 +7,7 @@ stream \- a lightweight tool to stream one or more pixel components of the image
 .SH OVERVIEW
 \fBStream\fP is a lightweight tool to stream one or more pixel components of the image or portion of the image to your choice of storage formats.  It writes the pixel components as they are read from the input image a row at a time making \fBstream\fP desirable when working with large images or when you require raw pixel components.
 
-For more information about the stream command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/stream.html or http://www.imagemagick.org/script/stream.php.
+For more information about the stream command, point your browser to file:///usr/share/doc/ImageMagick-7/www/stream.html or http://www.imagemagick.org/script/stream.php.
 .SH DESCRIPTION
 Image Settings:
   \-authenticate value  decrypt image with this password
@@ -54,4 +54,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP