diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.14.recipe b/media-gfx/imagemagick/imagemagick-6.9.11.14.recipe
deleted file mode 100644
index 494f8ca9e..000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.11.14.recipe
+++ /dev/null
@@ -1,169 +0,0 @@
-SUMMARY="Convert, edit, or compose bitmap images"
-DESCRIPTION="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, 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."
-HOMEPAGE="https://www.imagemagick.org/"
-COPYRIGHT="1999-2017 ImageMagick Studio LLC"
-LICENSE="IMAGEMAGICK"
-REVISION="3"
-imageMagickVersion="${portVersion%.*}-${portVersion##*.}"
-SOURCE_URI="https://www.imagemagick.org/download/releases/ImageMagick-$imageMagickVersion.tar.xz
-	https://mirror.sobukus.de/files/src/imagemagick/ImageMagick-$imageMagickVersion.tar.xz"
-CHECKSUM_SHA256="7afcef9ea45ca5a9bf799278284579653d308e3ef8b7f8ab81cd63b448cb1cc1"
-SOURCE_DIR="ImageMagick-$imageMagickVersion"
-PATCHES="imagemagick-$portVersion.patchset"
-
-ARCHITECTURES="all"
-SECONDARY_ARCHITECTURES="x86"
-
-GLOBAL_WRITABLE_FILES="
-	settings/ImageMagick-6/coder.xml keep-old
-	settings/ImageMagick-6/colors.xml keep-old
-	settings/ImageMagick-6/delegates.xml keep-old
-	settings/ImageMagick-6/log.xml keep-old
-	settings/ImageMagick-6/magic.xml keep-old
-	settings/ImageMagick-6/mime.xml keep-old
-	settings/ImageMagick-6/policy.xml keep-old
-	settings/ImageMagick-6/quantization-table.xml keep-old
-	settings/ImageMagick-6/thresholds.xml keep-old
-	settings/ImageMagick-6/type-dejavu.xml keep-old
-	settings/ImageMagick-6/type-ghostscript.xml keep-old
-	settings/ImageMagick-6/type-windows.xml keep-old
-	settings/ImageMagick-6/type-apple.xml keep-old
-	settings/ImageMagick-6/type.xml keep-old
-	settings/ImageMagick-6/type-urw-base35.xml keep-old
-	"
-
-libMagickVersion="8.0.0"
-libMagickCoreVersion="6.0.0"
-libMagickWandVersion="6.0.0"
-libMagickVersionCompat="$libMagickVersion compat >= ${libMagickVersion%%.*}"
-libMagickCoreVersionCompat="$libMagickCoreVersion compat >= ${libMagickCoreVersion%%.*}"
-libMagickWandVersionCompat="$libMagickWandVersion compat >= ${libMagickWandVersion%%.*}"
-
-PROVIDES="
-	imagemagick$secondaryArchSuffix = $portVersion
-	cmd:animate$secondaryArchSuffix
-	cmd:compare$secondaryArchSuffix
-	cmd:composite$secondaryArchSuffix
-	cmd:conjure$secondaryArchSuffix
-	cmd:convert$secondaryArchSuffix
-	cmd:display$secondaryArchSuffix
-	cmd:identify$secondaryArchSuffix
-	cmd:import$secondaryArchSuffix
-	cmd:mogrify$secondaryArchSuffix
-	cmd:montage$secondaryArchSuffix
-	cmd:stream$secondaryArchSuffix
-	lib:libMagick++_6.Q16$secondaryArchSuffix = $libMagickVersionCompat
-	lib:libMagickCore_6.Q16$secondaryArchSuffix = $libMagickCoreVersionCompat
-	lib:libMagickWand_6.Q16$secondaryArchSuffix = $libMagickWandVersionCompat
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libbz2$secondaryArchSuffix
-	lib:libfreetype$secondaryArchSuffix
-	lib:libjpeg$secondaryArchSuffix
-	lib:libltdl$secondaryArchSuffix
-	lib:libpng16$secondaryArchSuffix
-	lib:libtiff$secondaryArchSuffix
-	lib:libwebp$secondaryArchSuffix
-	lib:libxml2$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
-if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
-	REQUIRES="$REQUIRES
-		lib:libgomp$secondaryArchSuffix
-		"
-fi
-
-PROVIDES_devel="
-	imagemagick${secondaryArchSuffix}_devel = $portVersion
-	cmd:Magick++_config$secondaryArchSuffix
-	cmd:Magick_config$secondaryArchSuffix
-	cmd:MagickCore_config$secondaryArchSuffix
-	cmd:MagickWand_config$secondaryArchSuffix
-	cmd:Wand_config$secondaryArchSuffix
-	devel:libMagick++_6.Q16$secondaryArchSuffix = $libMagickVersionCompat
-	devel:libMagickCore_6.Q16$secondaryArchSuffix = $libMagickCoreVersionCompat
-	devel:libMagickWand_6.Q16$secondaryArchSuffix = $libMagickWandVersionCompat
-	"
-REQUIRES_devel="
-	imagemagick$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libbz2$secondaryArchSuffix
-	devel:libfreetype$secondaryArchSuffix
-	devel:libjpeg$secondaryArchSuffix
-	devel:libltdl$secondaryArchSuffix
-	devel:libpng16$secondaryArchSuffix
-	devel:libtiff$secondaryArchSuffix
-	devel:libwebp$secondaryArchSuffix
-	devel:libxml2$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:gcc$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:make
-	cmd:perl
-	cmd:pkg_config$secondaryArchSuffix
-	cmd:sed
-	"
-
-defineDebugInfoPackage imagemagick$secondaryArchSuffix \
-	$binDir/animate \
-	$binDir/compare \
-	$binDir/composite \
-	$binDir/conjure \
-	$binDir/convert \
-	$binDir/display \
-	$binDir/identify \
-	$binDir/import \
-	$binDir/mogrify \
-	$binDir/montage \
-	$binDir/stream \
-	$libDir/libMagick++-6.Q16.so.$libMagickVersion \
-	$libDir/libMagickCore-6.Q16.so.$libMagickCoreVersion \
-	$libDir/libMagickWand-6.Q16.so.$libMagickWandVersion
-
-BUILD()
-{
-	export LDFLAGS="-lnetwork"
-	autoreconf -fi
-	runConfigure ./configure \
-		--enable-shared \
-		--disable-static \
-		--without-modules
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	# remove libtool files
-	rm -f $libDir/libMagick*.la
-
-	prepareInstalledDevelLibs libMagick++-6.Q16 libMagickCore-6.Q16 \
-		libMagickWand-6.Q16
-	fixPkgconfig
-
-	packageEntries devel \
-		$developDir \
-		$binDir/*-config \
-		$manDir/man1/*-config.1 \
-		$dataDir/doc/ImageMagick-6/www/api
-}
-
-TEST()
-{
-	make check
-}
diff --git a/media-gfx/imagemagick/imagemagick7-7.1.1.8.recipe b/media-gfx/imagemagick/imagemagick-7.1.1.8.recipe
similarity index 94%
rename from media-gfx/imagemagick/imagemagick7-7.1.1.8.recipe
rename to media-gfx/imagemagick/imagemagick-7.1.1.8.recipe
index 06f3656bd..5c7334266 100644
--- a/media-gfx/imagemagick/imagemagick7-7.1.1.8.recipe
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.8.recipe
@@ -45,7 +45,7 @@ libMagickCoreVersionCompat="$libMagickCoreVersion compat >= ${libMagickCoreVersi
 libMagickWandVersionCompat="$libMagickWandVersion compat >= ${libMagickWandVersion%%.*}"
 
 PROVIDES="
-	imagemagick7$secondaryArchSuffix = $portVersion
+	imagemagick$secondaryArchSuffix = $portVersion
 	cmd:animate$secondaryArchSuffix
 	cmd:compare$secondaryArchSuffix
 	cmd:composite$secondaryArchSuffix
@@ -80,9 +80,12 @@ if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
 		lib:libgomp$secondaryArchSuffix
 		"
 fi
+REPLACES="
+	imagemagick7$secondaryArchSuffix
+	"
 
 PROVIDES_devel="
-	imagemagick7${secondaryArchSuffix}_devel = $portVersion
+	imagemagick${secondaryArchSuffix}_devel = $portVersion
 	cmd:Magick++_config$secondaryArchSuffix
 	cmd:Magick_config$secondaryArchSuffix
 	cmd:MagickCore_config$secondaryArchSuffix
@@ -93,9 +96,11 @@ PROVIDES_devel="
 	devel:libMagickWand_7.Q16HDRI$secondaryArchSuffix = $libMagickWandVersionCompat
 	"
 REQUIRES_devel="
-	imagemagick7$secondaryArchSuffix == $portVersion base
+	imagemagick$secondaryArchSuffix == $portVersion base
+	"
+REPLACES="
+	imagemagick7${secondaryArchSuffix}_devel
 	"
-
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
@@ -131,7 +136,7 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-defineDebugInfoPackage imagemagick7$secondaryArchSuffix \
+defineDebugInfoPackage imagemagick$secondaryArchSuffix \
 	$binDir/animate \
 	$binDir/compare \
 	$binDir/composite \
diff --git a/media-gfx/imagemagick/patches/imagemagick-6.9.11.14.patchset b/media-gfx/imagemagick/patches/imagemagick-6.9.11.14.patchset
deleted file mode 100644
index fd1a5cc3c..000000000
--- a/media-gfx/imagemagick/patches/imagemagick-6.9.11.14.patchset
+++ /dev/null
@@ -1,1176 +0,0 @@
-From 5e594a88fc6f18cc98b0ecdabe3ad636af97aec1 Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@gmail.com>
-Date: Sun, 26 Oct 2014 17:46:46 +0100
-Subject: Make gcc2 happy.
-
-
-diff --git a/Magick++/lib/Blob.cpp b/Magick++/lib/Blob.cpp
-index 2e5e5a2..71448c5 100644
---- a/Magick++/lib/Blob.cpp
-+++ b/Magick++/lib/Blob.cpp
-@@ -112,7 +112,7 @@ std::string Magick::Blob::base64(void)
-       return result;
-     }
- 
--  return(std::string());
-+  return std::string();
- }
- 
- const void* Magick::Blob::data(void) const
-diff --git a/Magick++/lib/ChannelMoments.cpp b/Magick++/lib/ChannelMoments.cpp
-index 5289c62..b4029d5 100644
---- a/Magick++/lib/ChannelMoments.cpp
-+++ b/Magick++/lib/ChannelMoments.cpp
-@@ -109,7 +109,7 @@ double Magick::ChannelMoments::huInvariants(const size_t index_) const
-   if (index_ > 7)
-     throw ErrorOption("Valid range for index is 0-7");
- 
--  return(_huInvariants.at(index_));
-+  return _huInvariants.at(index_);
- }
- 
- Magick::ImageMoments::ImageMoments(void)
-@@ -135,7 +135,7 @@ Magick::ChannelMoments Magick::ImageMoments::channel(
-     if (it->channel() == channel_)
-       return(*it);
-   }
--  return(ChannelMoments());
-+  return ChannelMoments();
- }
- 
- Magick::ImageMoments::ImageMoments(const Image &image_)
-diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
-index 021d171..089cb54 100644
---- a/Magick++/lib/Image.cpp
-+++ b/Magick++/lib/Image.cpp
-@@ -509,9 +509,9 @@ Magick::Image Magick::Image::clipMask(void) const
-   ThrowImageException;
- 
-   if (image == (MagickCore::Image *) NULL)
--    return(Magick::Image());
-+    return Magick::Image();
-   else
--    return(Magick::Image(image));
-+    return Magick::Image(image);
- }
- 
- void Magick::Image::colorFuzz(const double fuzz_)
-@@ -589,9 +589,9 @@ std::string Magick::Image::comment(void) const
-   value=GetImageProperty(constImage(),"Comment");
- 
-   if (value)
--    return(std::string(value));
-+    return std::string(value);
- 
--  return(std::string()); // Intentionally no exception
-+  return std::string(); // Intentionally no exception
- }
- 
- void Magick::Image::compose(const CompositeOperator compose_)
-@@ -601,7 +601,7 @@ void Magick::Image::compose(const CompositeOperator compose_)
- 
- Magick::CompositeOperator Magick::Image::compose(void) const
- {
--  return(constImage()->compose);
-+  return constImage()->compose;
- }
- 
- void Magick::Image::compressType(const CompressionType compressType_)
-@@ -613,7 +613,7 @@ void Magick::Image::compressType(const CompressionType compressType_)
- 
- Magick::CompressionType Magick::Image::compressType(void) const
- {
--  return(constImage()->compression);
-+  return constImage()->compression;
- }
- 
- void Magick::Image::debug(const bool flag_)
-@@ -687,7 +687,7 @@ std::string Magick::Image::directory(void) const
-   throwExceptionExplicit(CorruptImageWarning,
-     "Image does not contain a directory");
- 
--  return(std::string());
-+  return std::string();
- }
- 
- void Magick::Image::endian(const Magick::EndianType endian_)
-@@ -699,7 +699,7 @@ void Magick::Image::endian(const Magick::EndianType endian_)
- 
- Magick::EndianType Magick::Image::endian(void) const
- {
--  return(constImage()->endian);
-+  return constImage()->endian;
- }
- 
- void Magick::Image::exifProfile(const Magick::Blob &exifProfile_)
-@@ -724,10 +724,10 @@ Magick::Blob Magick::Image::exifProfile(void) const
- 
-   exif_profile=GetImageProfile(constImage(),"exif");
-   if (exif_profile == (StringInfo *) NULL)
--    return(Blob());
-+    return Blob();
- 
--  return(Blob(GetStringInfoDatum(exif_profile),GetStringInfoLength(
--    exif_profile)));
-+  return Blob(GetStringInfoDatum(exif_profile),GetStringInfoLength(
-+    exif_profile));
- } 
- 
- void Magick::Image::fileName(const std::string &fileName_)
-@@ -749,12 +749,12 @@ void Magick::Image::fileName(const std::string &fileName_)
- 
- std::string Magick::Image::fileName(void) const
- {
--  return(constOptions()->fileName());
-+  return constOptions()->fileName();
- }
- 
- off_t Magick::Image::fileSize(void) const
- {
--  return((off_t) GetBlobSize(constImage()));
-+  return (off_t) GetBlobSize(constImage());
- }
- 
- void Magick::Image::fillColor(const Magick::Color &fillColor_)
-@@ -765,7 +765,7 @@ void Magick::Image::fillColor(const Magick::Color &fillColor_)
- 
- Magick::Color Magick::Image::fillColor(void) const
- {
--  return(constOptions()->fillColor());
-+  return constOptions()->fillColor();
- }
- 
- void Magick::Image::fillRule(const Magick::FillRule &fillRule_)
-@@ -776,7 +776,7 @@ void Magick::Image::fillRule(const Magick::FillRule &fillRule_)
- 
- Magick::FillRule Magick::Image::fillRule(void) const
- {
--  return(constOptions()->fillRule());
-+  return constOptions()->fillRule();
- }
- 
- void Magick::Image::fillPattern(const Image &fillPattern_)
-@@ -810,7 +810,7 @@ Magick::Image Magick::Image::fillPattern(void) const
-       ThrowImageException;
-     }
- 
--  return(texture);
-+  return texture;
- }
- 
- void Magick::Image::filterType(const Magick::FilterTypes filterType_)
-@@ -821,7 +821,7 @@ void Magick::Image::filterType(const Magick::FilterTypes filterType_)
- 
- Magick::FilterTypes Magick::Image::filterType(void) const
- {
--  return(constImage()->filter);
-+  return constImage()->filter;
- }
- 
- void Magick::Image::font(const std::string &font_)
-@@ -832,7 +832,7 @@ void Magick::Image::font(const std::string &font_)
- 
- std::string Magick::Image::font(void) const
- {
--  return(constOptions()->font());
-+  return constOptions()->font();
- }
- 
- void Magick::Image::fontFamily(const std::string &family_)
-@@ -868,10 +868,10 @@ std::string Magick::Image::format(void) const
-   ThrowImageException;
- 
-   if ((magick_info != 0) && (*magick_info->description != '\0'))
--    return(std::string(magick_info->description));
-+    return std::string(magick_info->description);
- 
-   throwExceptionExplicit(CorruptImageWarning,"Unrecognized image magick type");
--  return(std::string());
-+  return std::string();
- }
- 
- void Magick::Image::fontStyle(const StyleType pointSize_)
-@@ -893,7 +893,7 @@ void Magick::Image::fontWeight(const size_t weight_)
- 
- size_t Magick::Image::fontWeight(void) const
- {
--  return(constOptions()->fontWeight());
-+  return constOptions()->fontWeight();
- }
- 
- 
-@@ -913,12 +913,12 @@ std::string Magick::Image::formatExpression(const std::string expression)
-       text=DestroyString(text);
-     }
-   throwImageException();
--  return(text_string);
-+  return text_string;
- }
- 
- double Magick::Image::gamma(void) const
- {
--  return(constImage()->gamma);
-+  return constImage()->gamma;
- }
- 
- Magick::Geometry Magick::Image::geometry(void) const
-@@ -928,7 +928,7 @@ Magick::Geometry Magick::Image::geometry(void) const
- 
-   throwExceptionExplicit(OptionWarning,"Image does not contain a geometry");
- 
--  return(Geometry());
-+  return Geometry();
- }
- 
- void Magick::Image::gifDisposeMethod(const size_t disposeMethod_)
-@@ -940,7 +940,7 @@ void Magick::Image::gifDisposeMethod(const size_t disposeMethod_)
- size_t Magick::Image::gifDisposeMethod(void) const
- {
-   // FIXME: It would be better to return an enumeration
--  return ((size_t) constImage()->dispose);
-+  return (size_t) constImage()->dispose;
- }
- 
- void Magick::Image::highlightColor(const Color color_)
-@@ -1015,9 +1015,9 @@ Magick::Blob Magick::Image::iptcProfile(void) const
- 
-   iptc_profile=GetImageProfile(constImage(),"iptc");
-   if (iptc_profile == (StringInfo *) NULL)
--    return(Blob());
--  return(Blob(GetStringInfoDatum(iptc_profile),GetStringInfoLength(
--    iptc_profile)));
-+    return Blob();
-+  return Blob(GetStringInfoDatum(iptc_profile),GetStringInfoLength(
-+    iptc_profile));
- }
- 
- bool Magick::Image::isOpaque(void) const
-@@ -1049,7 +1049,7 @@ void Magick::Image::isValid(const bool isValid_)
- 
- bool Magick::Image::isValid(void) const
- {
--  return(rows() && columns());
-+  return rows() && columns();
- }
- 
- void Magick::Image::label(const std::string &label_)
-@@ -1069,9 +1069,9 @@ std::string Magick::Image::label(void) const
-   value=GetImageProperty(constImage(),"Label");
- 
-   if (value)
--    return(std::string(value));
-+    return std::string(value);
- 
--  return(std::string());
-+  return std::string();
- }
- 
- void Magick::Image::lowlightColor(const Color color_)
-@@ -1104,9 +1104,9 @@ void Magick::Image::magick(const std::string &magick_)
- std::string Magick::Image::magick(void) const
- {
-   if (*(constImage()->magick) != '\0')
--    return(std::string(constImage()->magick));
-+    return std::string(constImage()->magick);
- 
--  return(constOptions()->magick());
-+  return constOptions()->magick();
- }
- 
- void Magick::Image::mask(const Magick::Image &mask_)
-@@ -1129,9 +1129,9 @@ Magick::Image Magick::Image::mask(void) const
-   ThrowImageException;
- 
-   if (image == (MagickCore::Image *) NULL)
--    return(Magick::Image());
-+    return Magick::Image();
-   else
--    return(Magick::Image(image));
-+    return Magick::Image(image);
- }
- 
- void Magick::Image::matte(const bool matteFlag_)
-@@ -1178,13 +1178,13 @@ void Magick::Image::matteColor(const Color &matteColor_)
- 
- Magick::Color Magick::Image::matteColor(void) const
- {
--  return(Color(constImage()->matte_color.red,constImage()->matte_color.green,
--    constImage()->matte_color.blue));
-+  return Color(constImage()->matte_color.red,constImage()->matte_color.green,
-+    constImage()->matte_color.blue);
- }
- 
- double Magick::Image::meanErrorPerPixel(void) const
- {
--  return(constImage()->error.mean_error_per_pixel);
-+  return constImage()->error.mean_error_per_pixel;
- }
- 
- void Magick::Image::modulusDepth(const size_t depth_)
-@@ -1213,28 +1213,28 @@ void Magick::Image::monochrome(const bool monochromeFlag_)
- 
- bool Magick::Image::monochrome(void) const
- {
--  return(constOptions()->monochrome());
-+  return constOptions()->monochrome();
- }
- 
- Magick::Geometry Magick::Image::montageGeometry(void) const
- {
-   if (constImage()->montage)
--    return(Magick::Geometry(constImage()->montage));
-+    return Magick::Geometry(constImage()->montage);
- 
-   throwExceptionExplicit(CorruptImageWarning,
-     "Image does not contain a montage");
- 
--  return(Magick::Geometry());
-+  return Magick::Geometry();
- }
- 
- double Magick::Image::normalizedMaxError(void) const
- {
--  return(constImage()->error.normalized_maximum_error);
-+  return constImage()->error.normalized_maximum_error;
- }
- 
- double Magick::Image::normalizedMeanError(void) const
- {
--  return (constImage()->error.normalized_mean_error);
-+  return constImage()->error.normalized_mean_error;
- }
- 
- void Magick::Image::orientation(const Magick::OrientationType orientation_)
-@@ -1245,7 +1245,7 @@ void Magick::Image::orientation(const Magick::OrientationType orientation_)
- 
- Magick::OrientationType Magick::Image::orientation(void) const
- {
--  return(constImage()->orientation);
-+  return constImage()->orientation;
- }
- 
- void Magick::Image::page(const Magick::Geometry &pageSize_)
-@@ -1257,10 +1257,10 @@ void Magick::Image::page(const Magick::Geometry &pageSize_)
- 
- Magick::Geometry Magick::Image::page(void) const
- {
--  return(Geometry(constImage()->page.width,constImage()->page.height,
-+  return Geometry(constImage()->page.width,constImage()->page.height,
-     AbsoluteValue(constImage()->page.x),AbsoluteValue(constImage()->page.y),
-     constImage()->page.x < 0 ? true : false,
--    constImage()->page.y < 0 ? true : false));
-+    constImage()->page.y < 0 ? true : false);
- }
- 
- void Magick::Image::penColor(const Color &penColor_)
-@@ -1272,7 +1272,7 @@ void Magick::Image::penColor(const Color &penColor_)
- 
- Magick::Color Magick::Image::penColor(void) const
- {
--  return(constOptions()->fillColor());
-+  return constOptions()->fillColor();
- }
- 
- void Magick::Image::penTexture(const Image &penTexture_)
-@@ -1305,7 +1305,7 @@ Magick::Image Magick::Image::penTexture(void) const
-       texture.replaceImage(image);
-       ThrowImageException;
-     }
--  return(texture);
-+  return texture;
- }
- 
- void Magick::Image::quality(const size_t quality_)
-@@ -1317,7 +1317,7 @@ void Magick::Image::quality(const size_t quality_)
- 
- size_t Magick::Image::quality(void) const
- {
--  return(constImage()->quality);
-+  return constImage()->quality;
- }
- 
- void Magick::Image::quantizeColors(const size_t colors_)
-@@ -1328,7 +1328,7 @@ void Magick::Image::quantizeColors(const size_t colors_)
- 
- size_t Magick::Image::quantizeColors(void) const
- {
--  return(constOptions()->quantizeColors());
-+  return constOptions()->quantizeColors();
- }
- 
- void Magick::Image::quantizeColorSpace(
-@@ -1340,7 +1340,7 @@ void Magick::Image::quantizeColorSpace(
- 
- Magick::ColorspaceType Magick::Image::quantizeColorSpace(void) const
- {
--  return(constOptions()->quantizeColorSpace());
-+  return constOptions()->quantizeColorSpace();
- }
- 
- void Magick::Image::quantizeDither(const bool ditherFlag_)
-@@ -1351,7 +1351,7 @@ void Magick::Image::quantizeDither(const bool ditherFlag_)
- 
- bool Magick::Image::quantizeDither(void) const
- {
--  return(constOptions()->quantizeDither());
-+  return constOptions()->quantizeDither();
- }
- 
- void Magick::Image::quantizeDitherMethod(const DitherMethod ditherMethod_)
-@@ -1362,7 +1362,7 @@ void Magick::Image::quantizeDitherMethod(const DitherMethod ditherMethod_)
- 
- MagickCore::DitherMethod Magick::Image::quantizeDitherMethod(void) const
- {
--  return(constOptions()->quantizeDitherMethod());
-+  return constOptions()->quantizeDitherMethod();
- }
- 
- void Magick::Image::quantizeTreeDepth(const size_t treeDepth_)
-@@ -1373,7 +1373,7 @@ void Magick::Image::quantizeTreeDepth(const size_t treeDepth_)
- 
- size_t Magick::Image::quantizeTreeDepth(void) const
- {
--  return(constOptions()->quantizeTreeDepth());
-+  return constOptions()->quantizeTreeDepth();
- }
- 
- void Magick::Image::quiet(const bool quiet_)
-@@ -1396,8 +1396,8 @@ void Magick::Image::renderingIntent(
- 
- Magick::RenderingIntent Magick::Image::renderingIntent(void) const
- {
--  return(static_cast<Magick::RenderingIntent>(
--    constImage()->rendering_intent));
-+  return static_cast<Magick::RenderingIntent>(
-+    constImage()->rendering_intent);
- }
- 
- void Magick::Image::resolutionUnits(
-@@ -1421,7 +1421,7 @@ void Magick::Image::scene(const size_t scene_)
- 
- size_t Magick::Image::scene(void) const
- {
--  return(constImage()->scene);
-+  return constImage()->scene;
- }
- 
- void Magick::Image::size(const Geometry &geometry_)
-@@ -1434,7 +1434,7 @@ void Magick::Image::size(const Geometry &geometry_)
- 
- Magick::Geometry Magick::Image::size(void) const
- {
--  return(Magick::Geometry(constImage()->columns,constImage()->rows));
-+  return Magick::Geometry(constImage()->columns,constImage()->rows);
- }
- 
- void Magick::Image::strokeAntiAlias(const bool flag_)
-@@ -1445,7 +1445,7 @@ void Magick::Image::strokeAntiAlias(const bool flag_)
- 
- bool Magick::Image::strokeAntiAlias(void) const
- {
--  return(constOptions()->strokeAntiAlias());
-+  return constOptions()->strokeAntiAlias();
- }
- 
- void Magick::Image::strokeColor(const Magick::Color &strokeColor_)
-@@ -1461,7 +1461,7 @@ void Magick::Image::strokeColor(const Magick::Color &strokeColor_)
- 
- Magick::Color Magick::Image::strokeColor(void) const
- {
--  return(constOptions()->strokeColor());
-+  return constOptions()->strokeColor();
- }
- 
- void Magick::Image::strokeDashArray(const double *strokeDashArray_)
-@@ -1472,7 +1472,7 @@ void Magick::Image::strokeDashArray(const double *strokeDashArray_)
- 
- const double *Magick::Image::strokeDashArray(void) const
- {
--  return(constOptions()->strokeDashArray());
-+  return constOptions()->strokeDashArray();
- }
- 
- void Magick::Image::strokeDashOffset(const double strokeDashOffset_)
-@@ -1483,7 +1483,7 @@ void Magick::Image::strokeDashOffset(const double strokeDashOffset_)
- 
- double Magick::Image::strokeDashOffset(void) const
- {
--  return(constOptions()->strokeDashOffset());
-+  return constOptions()->strokeDashOffset();
- }
- 
- void Magick::Image::strokeLineCap(const Magick::LineCap lineCap_)
-@@ -1494,7 +1494,7 @@ void Magick::Image::strokeLineCap(const Magick::LineCap lineCap_)
- 
- Magick::LineCap Magick::Image::strokeLineCap(void) const
- {
--  return(constOptions()->strokeLineCap());
-+  return constOptions()->strokeLineCap();
- }
- 
- void Magick::Image::strokeLineJoin(const Magick::LineJoin lineJoin_)
-@@ -1505,7 +1505,7 @@ void Magick::Image::strokeLineJoin(const Magick::LineJoin lineJoin_)
- 
- Magick::LineJoin Magick::Image::strokeLineJoin(void) const
- {
--  return(constOptions()->strokeLineJoin());
-+  return constOptions()->strokeLineJoin();
- }
- 
- void Magick::Image::strokeMiterLimit(const size_t strokeMiterLimit_)
-@@ -1548,7 +1548,7 @@ Magick::Image Magick::Image::strokePattern(void) const
-       texture.replaceImage(image);
-       ThrowImageException;
-     }
--  return(texture);
-+  return texture;
- }
- 
- void Magick::Image::strokeWidth(const double strokeWidth_)
-@@ -1564,7 +1564,7 @@ void Magick::Image::strokeWidth(const double strokeWidth_)
- 
- double Magick::Image::strokeWidth(void) const
- {
--  return(constOptions()->strokeWidth());
-+  return constOptions()->strokeWidth();
- }
- 
- void Magick::Image::subImage(const size_t subImage_)
-@@ -1575,7 +1575,7 @@ void Magick::Image::subImage(const size_t subImage_)
- 
- size_t Magick::Image::subImage(void) const
- {
--  return(constOptions()->subImage());
-+  return constOptions()->subImage();
- }
- 
- void Magick::Image::subRange(const size_t subRange_)
-@@ -1586,7 +1586,7 @@ void Magick::Image::subRange(const size_t subRange_)
- 
- size_t Magick::Image::subRange(void) const
- {
--  return(constOptions()->subRange());
-+  return constOptions()->subRange();
- }
- 
- void Magick::Image::textDirection(DirectionType direction_)
-@@ -1597,7 +1597,7 @@ void Magick::Image::textDirection(DirectionType direction_)
- 
- Magick::DirectionType Magick::Image::textDirection(void) const
- {
--  return(constOptions()->textDirection());
-+  return constOptions()->textDirection();
- }
- 
- void Magick::Image::textEncoding(const std::string &encoding_)
-@@ -1608,7 +1608,7 @@ void Magick::Image::textEncoding(const std::string &encoding_)
- 
- std::string Magick::Image::textEncoding(void) const
- {
--  return(constOptions()->textEncoding());
-+  return constOptions()->textEncoding();
- }
- 
- void Magick::Image::textGravity(GravityType gravity_)
-@@ -1619,7 +1619,7 @@ void Magick::Image::textGravity(GravityType gravity_)
- 
- Magick::GravityType Magick::Image::textGravity(void) const
- {
--  return(constOptions()->textGravity());
-+  return constOptions()->textGravity();
- }
- 
- void Magick::Image::textInterlineSpacing(double spacing_)
-@@ -1630,7 +1630,7 @@ void Magick::Image::textInterlineSpacing(double spacing_)
- 
- double Magick::Image::textInterlineSpacing(void) const
- {
--  return(constOptions()->textInterlineSpacing());
-+  return constOptions()->textInterlineSpacing();
- }
- 
- void Magick::Image::textInterwordSpacing(double spacing_)
-@@ -1641,7 +1641,7 @@ void Magick::Image::textInterwordSpacing(double spacing_)
- 
- double Magick::Image::textInterwordSpacing(void) const
- {
--  return(constOptions()->textInterwordSpacing());
-+  return constOptions()->textInterwordSpacing();
- }
- 
- void Magick::Image::textKerning(double kerning_)
-@@ -1652,7 +1652,7 @@ void Magick::Image::textKerning(double kerning_)
- 
- double Magick::Image::textKerning(void) const
- {
--  return(constOptions()->textKerning());
-+  return constOptions()->textKerning();
- }
- 
- void Magick::Image::textUnderColor(const Color &underColor_)
-@@ -1674,7 +1674,7 @@ void Magick::Image::tileName(const std::string &tileName_)
- 
- std::string Magick::Image::tileName(void) const
- {
--  return(constOptions()->tileName());
-+  return constOptions()->tileName();
- }
- 
- size_t Magick::Image::totalColors(void) const
-@@ -1716,11 +1716,11 @@ void Magick::Image::type(const Magick::ImageType type_)
- Magick::ImageType Magick::Image::type(void) const
- {
-   if (constOptions()->type() != UndefinedType)
--    return(constOptions()->type());
-+    return constOptions()->type();
-   else if (constImage()->type != UndefinedType)
--    return(constImage()->type);
-+    return constImage()->type;
-   else
--    return(determineType());
-+    return determineType();
- }
- 
- void Magick::Image::verbose(const bool verboseFlag_)
-@@ -1731,7 +1731,7 @@ void Magick::Image::verbose(const bool verboseFlag_)
- 
- bool Magick::Image::verbose(void) const
- {
--  return(constOptions()->verbose());
-+  return constOptions()->verbose();
- }
- 
- void Magick::Image::view(const std::string &view_)
-@@ -1742,7 +1742,7 @@ void Magick::Image::view(const std::string &view_)
- 
- std::string Magick::Image::view(void) const
- {
--  return(constOptions()->view());
-+  return constOptions()->view();
- }
- 
- void Magick::Image::virtualPixelMethod(
-@@ -1755,7 +1755,7 @@ void Magick::Image::virtualPixelMethod(
- 
- Magick::VirtualPixelMethod Magick::Image::virtualPixelMethod(void) const
- {
--  return(GetImageVirtualPixelMethod(constImage()));
-+  return GetImageVirtualPixelMethod(constImage());
- }
- 
- void Magick::Image::x11Display(const std::string &display_)
-@@ -1766,17 +1766,17 @@ void Magick::Image::x11Display(const std::string &display_)
- 
- std::string Magick::Image::x11Display(void) const
- {
--  return(constOptions()->x11Display());
-+  return constOptions()->x11Display();
- }
- 
- double Magick::Image::xResolution(void) const
- {
--  return(constImage()->x_resolution);
-+  return constImage()->x_resolution;
- }
- 
- double Magick::Image::yResolution(void) const
- {
--  return(constImage()->y_resolution);
-+  return constImage()->y_resolution;
- }
- 
- void Magick::Image::adaptiveBlur(const double radius_,const double sigma_)
-@@ -2023,8 +2023,8 @@ std::string Magick::Image::artifact(const std::string &name_) const
- 
-   value=GetImageArtifact(constImage(),name_.c_str());
-   if (value)
--    return(std::string(value));
--  return(std::string());
-+    return std::string(value);
-+  return std::string();
- }
- 
- void Magick::Image::attribute(const std::string name_,const char *value_)
-@@ -2047,9 +2047,9 @@ std::string Magick::Image::attribute(const std::string name_) const
-   value=GetImageProperty(constImage(),name_.c_str());
- 
-   if (value)
--    return(std::string(value));
-+    return std::string(value);
- 
--  return(std::string()); // Intentionally no exception
-+  return std::string(); // Intentionally no exception
- }
- 
- void Magick::Image::autoGamma(void)
-@@ -2397,13 +2397,13 @@ Magick::Color Magick::Image::colorMap(const size_t index_) const
-   if (!constImage()->colormap)
-     {
-       throwExceptionExplicit(OptionError,"Image does not contain a colormap");
--      return(Color());
-+      return Color();
-     }
- 
-   if (index_ > constImage()->colors-1)
-     throwExceptionExplicit(OptionError,"Index out of range");
- 
--  return(Color((constImage()->colormap)[index_]));
-+  return Color((constImage()->colormap)[index_]);
- }
- 
- void Magick::Image::colorMatrix(const size_t order_,
-@@ -2443,7 +2443,7 @@ bool Magick::Image::compare(const Image &reference_)
-   ref.modifyImage();
-   status=static_cast<bool>(IsImagesEqual(image(),ref.constImage()));
-   throwImageException();
--  return(status);
-+  return status;
- }
- 
- double Magick::Image::compare(const Image &reference_,const MetricType metric_)
-@@ -2482,9 +2482,9 @@ Magick::Image Magick::Image::compare(const Image &reference_,
-     exceptionInfo);
-   ThrowImageException;
-   if (newImage == (MagickCore::Image *) NULL)
--    return(Magick::Image());
-+    return Magick::Image();
-   else
--    return(Magick::Image(newImage));
-+    return Magick::Image(newImage);
- }
- 
- Magick::Image Magick::Image::compareChannel(const ChannelType channel_,
-@@ -2498,9 +2498,9 @@ Magick::Image Magick::Image::compareChannel(const ChannelType channel_,
-     metric_,distortion,exceptionInfo);
-   ThrowImageException;
-   if (newImage == (MagickCore::Image *) NULL)
--    return(Magick::Image());
-+    return Magick::Image();
-   else
--    return(Magick::Image(newImage));
-+    return Magick::Image(newImage);
- }
- 
- void Magick::Image::composite(const Image &compositeImage_,
-@@ -2668,8 +2668,8 @@ bool Magick::Image::defineSet(const std::string &magick_,
-   key=magick_ + ":" + key_;
-   option=GetImageOption(constImageInfo(),key.c_str());
-   if (option)
--    return(true);
--  return(false);
-+    return true;
-+  return false;
- }
- 
- void Magick::Image::defineValue(const std::string &magick_,
-@@ -2695,8 +2695,8 @@ std::string Magick::Image::defineValue(const std::string &magick_,
-   definition=magick_ + ":" + key_;
-   option=GetImageOption(constImageInfo(),definition.c_str());
-   if (option)
--    return(std::string(option));
--  return(std::string());
-+    return std::string(option);
-+  return std::string();
- }
- 
- void Magick::Image::deskew(const double threshold_)
-@@ -3249,7 +3249,7 @@ const Magick::IndexPacket* Magick::Image::getConstIndexes(void) const
-   if (!result)
-     throwImageException();
- 
--  return(result);
-+  return result;
- }
- 
- const Magick::PixelPacket* Magick::Image::getConstPixels(const ssize_t x_,
-@@ -3274,7 +3274,7 @@ Magick::IndexPacket *Magick::Image::getIndexes(void)
-   if(!result)
-     throwImageException();
- 
--  return(result);
-+  return result;
- }
- 
- Magick::PixelPacket *Magick::Image::getPixels(const ssize_t x_,
-@@ -3849,7 +3849,7 @@ Magick::Color Magick::Image::pixelColor(const ssize_t x_,
- 
-       pixel=getConstPixels(x_,y_,1,1);
-       if (pixel)
--        return(Color(*pixel));
-+        return Color(*pixel);
-     }
-   else if (storage_class == PseudoClass)
-     {
-@@ -3858,10 +3858,10 @@ Magick::Color Magick::Image::pixelColor(const ssize_t x_,
- 
-       indexes=getConstIndexes();
-       if(indexes)
--        return(colorMap((size_t) *indexes));
-+        return colorMap((size_t) *indexes);
-     }
- 
--  return(Color()); // invalid
-+  return Color(); // invalid
- }
- 
- void Magick::Image::polaroid(const std::string &caption_,const double angle_)
-@@ -3930,9 +3930,9 @@ Magick::Blob Magick::Image::profile(const std::string name_) const
-   profile=GetImageProfile(constImage(),name_.c_str());
- 
-   if (profile == (StringInfo *) NULL)
--    return(Blob());
--  return(Blob((void*) GetStringInfoDatum(profile),GetStringInfoLength(
--    profile)));
-+    return Blob();
-+  return Blob((void*) GetStringInfoDatum(profile),GetStringInfoLength(
-+    profile));
- }
- 
- void Magick::Image::quantize(const bool measureError_)
-@@ -4338,9 +4338,9 @@ Magick::Image Magick::Image::separate(const ChannelType channel_) const
-   image=SeparateImage(constImage(),channel_,exceptionInfo);
-   ThrowImageException;
-   if (image == (MagickCore::Image *) NULL)
--    return(Magick::Image());
-+    return Magick::Image();
-   else
--    return(Magick::Image(image));
-+    return Magick::Image(image);
- }
- 
- void Magick::Image::sepiaTone(const double threshold_)
-@@ -4464,7 +4464,7 @@ std::string Magick::Image::signature(const bool force_) const
- 
-   property=GetImageProperty(constImage(),"Signature");
- 
--  return(std::string(property));
-+  return std::string(property);
- }
- 
- void Magick::Image::sketch(const double radius_,const double sigma_,
-@@ -4637,9 +4637,9 @@ Magick::Image Magick::Image::subImageSearch(const Image &reference_,
-   if (offset_ != (Geometry *) NULL)
-     *offset_=offset;
-   if (newImage == (MagickCore::Image *) NULL)
--    return(Magick::Image());
-+    return Magick::Image();
-   else
--    return(Magick::Image(newImage));
-+    return Magick::Image(newImage);
- }
- 
- void Magick::Image::swirl(const double degrees_)
-@@ -4829,9 +4829,9 @@ Magick::Image Magick::Image::uniqueColors(void) const
-   image=UniqueImageColors(constImage(),exceptionInfo);
-   ThrowImageException;
-   if (image == (MagickCore::Image *) NULL)
--    return(Magick::Image());
-+    return Magick::Image();
-   else
--    return(Magick::Image(image));
-+    return Magick::Image(image);
- }
- 
- void Magick::Image::unsharpmask(const double radius_,const double sigma_,
-@@ -5037,42 +5037,42 @@ Magick::Image::Image(MagickCore::Image *image_)
- 
- MagickCore::Image *&Magick::Image::image(void)
- {
--  return(_imgRef->image());
-+  return _imgRef->image();
- }
- 
- const MagickCore::Image *Magick::Image::constImage(void) const
- {
--  return(_imgRef->image());
-+  return _imgRef->image();
- }
- 
- MagickCore::ImageInfo *Magick::Image::imageInfo(void)
- {
--  return(_imgRef->options()->imageInfo());
-+  return _imgRef->options()->imageInfo();
- }
- 
- const MagickCore::ImageInfo *Magick::Image::constImageInfo(void) const
- {
--  return(_imgRef->options()->imageInfo());
-+  return _imgRef->options()->imageInfo();
- }
- 
- Magick::Options *Magick::Image::options(void)
- {
--  return(_imgRef->options());
-+  return _imgRef->options();
- }
- 
- const Magick::Options *Magick::Image::constOptions(void) const
- {
--  return(_imgRef->options());
-+  return _imgRef->options();
- }
- 
- MagickCore::QuantizeInfo *Magick::Image::quantizeInfo(void)
- {
--  return(_imgRef->options()->quantizeInfo());
-+  return _imgRef->options()->quantizeInfo();
- }
- 
- const MagickCore::QuantizeInfo *Magick::Image::constQuantizeInfo(void) const
- {
--  return(_imgRef->options()->quantizeInfo());
-+  return _imgRef->options()->quantizeInfo();
- }
- 
- void Magick::Image::modifyImage(void)
-@@ -5115,7 +5115,7 @@ MagickCore::Image *Magick::Image::replaceImage(MagickCore::Image *replacement_)
-       }
-   }
- 
--  return(_imgRef->_image);
-+  return _imgRef->_image;
- }
- 
- void Magick::Image::throwImageException(void) const
-diff --git a/Magick++/lib/Options.cpp b/Magick++/lib/Options.cpp
-index 3d943e4..9b5bda5 100644
---- a/Magick++/lib/Options.cpp
-+++ b/Magick++/lib/Options.cpp
-@@ -105,9 +105,9 @@ void Magick::Options::backgroundTexture(const std::string &backgroundTexture_)
- std::string Magick::Options::backgroundTexture(void) const
- {
-   if (_imageInfo->texture)
--    return(std::string(_imageInfo->texture));
-+    return std::string(_imageInfo->texture);
-   else
--    return(std::string());
-+    return std::string();
- }
- 
- void Magick::Options::borderColor(const Color &color_)
-@@ -190,7 +190,7 @@ Magick::Geometry Magick::Options::density(void) const
-   if (_imageInfo->density)
-     return(Geometry(_imageInfo->density));
- 
--  return(Geometry());
-+  return Geometry();
- }
- 
- void Magick::Options::depth(size_t depth_)
-@@ -305,7 +305,7 @@ std::string Magick::Options::font(void) const
-   if (_imageInfo->font)
-     return(std::string(_imageInfo->font));
- 
--  return(std::string());
-+  return std::string();
- }
- 
- void Magick::Options::fontFamily(const std::string &family_)
-@@ -327,7 +327,7 @@ std::string Magick::Options::fontFamily(void) const
-   if (_drawInfo->family)
-     return(std::string(_drawInfo->family));
-   
--  return(std::string());
-+  return std::string();
- }
- 
- void Magick::Options::fontPointsize(double pointSize_)
-@@ -378,7 +378,7 @@ std::string Magick::Options::format(void) const
-   if ((magick_info != 0) && (*magick_info->description != '\0'))
-     return(std::string(magick_info->description));
-   
--  return(std::string());
-+  return std::string();
- }
- 
- void Magick::Options::interlaceType(Magick::InterlaceType interlace_)
-@@ -414,7 +414,7 @@ std::string Magick::Options::magick(void) const
-   if ( _imageInfo->magick[0] != '\0' )
-     return(std::string(_imageInfo->magick));
-  
--  return(std::string());
-+  return std::string();
- }
- 
- void Magick::Options::matteColor(const Magick::Color &matteColor_)
-@@ -450,7 +450,7 @@ Magick::Geometry Magick::Options::page(void) const
-   if (_imageInfo->page)
-     return(Geometry(_imageInfo->page));
- 
--  return(Geometry());
-+  return Geometry();
- }
- 
- void Magick::Options::quality(size_t quality_)
-@@ -548,7 +548,7 @@ std::string Magick::Options::samplingFactor(void) const
-   if (_imageInfo->sampling_factor)
-     return(std::string(_imageInfo->sampling_factor));
- 
--  return(std::string());
-+  return std::string();
- }
- 
- void Magick::Options::size(const Geometry &geometry_)
-@@ -564,7 +564,7 @@ Magick::Geometry Magick::Options::size(void) const
-   if (_imageInfo->size)
-     return(Geometry(_imageInfo->size));
- 
--  return(Geometry());
-+  return Geometry();
- }
- 
- void Magick::Options::strokeAntiAlias(bool flag_)
-@@ -732,7 +732,7 @@ std::string Magick::Options::textEncoding(void) const
-   if (_drawInfo->encoding && *_drawInfo->encoding)
-     return(std::string(_drawInfo->encoding));
-   
--  return(std::string());
-+  return std::string();
- }
- 
- void Magick::Options::textGravity(GravityType gravity_)
-@@ -804,7 +804,7 @@ std::string Magick::Options::tileName(void) const
- {
-   if (_imageInfo->tile)
-     return(std::string(_imageInfo->tile));
--  return(std::string());
-+  return std::string();
- }
- 
- void Magick::Options::transformOrigin(double tx_,double ty_)
-@@ -986,7 +986,7 @@ std::string Magick::Options::view(void) const
-   if (_imageInfo->view)
-     return(std::string(_imageInfo->view));
- 
--  return(std::string());
-+  return std::string();
- }
- 
- void Magick::Options::x11Display(const std::string &display_)
-@@ -1003,7 +1003,7 @@ std::string Magick::Options::x11Display(void) const
-   if (_imageInfo->server_name)
-     return(std::string(_imageInfo->server_name));
- 
--  return(std::string());
-+  return std::string();
- }
- 
- MagickCore::DrawInfo *Magick::Options::drawInfo(void)
-diff --git a/Magick++/lib/STL.cpp b/Magick++/lib/STL.cpp
-index 08ae27f..5428bc9 100644
---- a/Magick++/lib/STL.cpp
-+++ b/Magick++/lib/STL.cpp
-@@ -853,7 +853,7 @@ Magick::Geometry Magick::ReadOptions::density(void) const
-   if (_imageInfo->density)
-     return(Geometry(_imageInfo->density));
- 
--  return(Geometry());
-+  return Geometry();
- }
- 
- void Magick::ReadOptions::depth(size_t depth_)
-@@ -889,7 +889,7 @@ Magick::Geometry Magick::ReadOptions::size(void) const
-   if (_imageInfo->size)
-     return(Geometry(_imageInfo->size));
- 
--  return(Geometry());
-+  return Geometry();
- }
- 
- MagickCore::ImageInfo *Magick::ReadOptions::imageInfo(void)
--- 
-2.24.1
-
-
-From 1927fcb2d7c21414408969d7bdeb89cc246de56f Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@gmail.com>
-Date: Sun, 26 Oct 2014 17:47:29 +0100
-Subject: Don't reset LIBRARY_PATH.
-
-Using a variable named LIBRARY_PATH is not a good idea on Haiku. Just
-rename it.
-
-diff --git a/configure.ac b/configure.ac
-index f0c4775..35ac81c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2945,15 +2945,15 @@ AC_DEFINE_UNQUOTED(EXECUTABLE_PATH,"$DEFINE_EXECUTABLE_PATH",[Directory where ex
- AC_SUBST(EXECUTABLE_PATH)
- 
- # Path to ImageMagick lib
--LIBRARY_PATH="${LIB_DIR}/${LIBRARY_RELATIVE_PATH}"
--DEFINE_LIBRARY_PATH="${LIB_DIR}/${LIBRARY_RELATIVE_PATH}/"
-+XLIBRARY_PATH="${LIB_DIR}/${LIBRARY_RELATIVE_PATH}"
-+DEFINE_XLIBRARY_PATH="${LIB_DIR}/${LIBRARY_RELATIVE_PATH}/"
- case "${build_os}" in
-   mingw* )
--    DEFINE_LIBRARY_PATH=`$WinPathScript "$DEFINE_LIBRARY_PATH" 1`
-+    DEFINE_XLIBRARY_PATH=`$WinPathScript "$DEFINE_XLIBRARY_PATH" 1`
-     ;;
- esac
--AC_DEFINE_UNQUOTED(LIBRARY_PATH,"$DEFINE_LIBRARY_PATH",[Directory where architecture-dependent files live.])
--AC_SUBST(LIBRARY_PATH)
-+AC_DEFINE_UNQUOTED(LIBRARY_PATH,"$DEFINE_XLIBRARY_PATH",[Directory where architecture-dependent files live.])
-+AC_SUBST(XLIBRARY_PATH)
- 
- #
- # path to local binaries
-@@ -2970,7 +2970,7 @@ AC_SUBST(LIB_BIN_DIR)
- 
- LIB_BIN_DIR_RELATIVE_PATH=$LIB_BIN_DIR
- AC_SUBST(LIB_BIN_DIR_RELATIVE_PATH)
--LIB_BIN_DIR_PATH="${LIBRARY_PATH}/${LIB_BIN_DIR_RELATIVE_PATH}"
-+LIB_BIN_DIR_PATH="${XLIBRARY_PATH}/${LIB_BIN_DIR_RELATIVE_PATH}"
- AC_SUBST(LIB_BIN_DIR_PATH)
- 
- #
-@@ -2990,7 +2990,7 @@ AC_SUBST(MODULES_DIRNAME)
- 
- MODULES_RELATIVE_PATH="${MODULES_DIRNAME}"
- AC_SUBST(MODULES_RELATIVE_PATH)
--MODULES_PATH="${LIBRARY_PATH}/${MODULES_RELATIVE_PATH}"
-+MODULES_PATH="${XLIBRARY_PATH}/${MODULES_RELATIVE_PATH}"
- AC_SUBST(MODULES_PATH)
- 
- #
-@@ -3083,7 +3083,7 @@ AC_SUBST(SHAREARCH_DIRNAME)
- 
- SHAREARCH_RELATIVE_PATH="${SHAREARCH_DIRNAME}"
- AC_SUBST(SHAREARCH_RELATIVE_PATH)
--SHAREARCH_PATH="${LIBRARY_PATH}/${SHAREARCH_RELATIVE_PATH}"
-+SHAREARCH_PATH="${XLIBRARY_PATH}/${SHAREARCH_RELATIVE_PATH}"
- AC_SUBST(SHAREARCH_PATH)
- 
- #
--- 
-2.24.1
-
-
-From 597cbf7ca9ed713e0786d1d8d260803404269f2d Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Sun, 8 Mar 2020 15:07:33 +0000
-Subject: Make gcc2 happy
-
-
-diff --git a/magick/utility.c b/magick/utility.c
-index 05b84d5..c3c469f 100644
---- a/magick/utility.c
-+++ b/magick/utility.c
-@@ -665,12 +665,14 @@ MagickExport void ExpandFilename(char *path)
- #if !defined(MAGICKCORE_HAVE_GETPWNAM_R)
-       entry=getpwnam(username);
- #else
-+      {
-       struct passwd
-         pwd;
- 
-       entry=(struct passwd *) NULL;
-       if (getpwnam_r(username,&pwd,buffer,sizeof(buffer),&entry) < 0)
-         return;
-+      }
- #endif
-       if (entry == (struct passwd *) NULL)
-         return;
--- 
-2.24.1
-