From 5aec9f998f47ef819c371f6a2957421944188d37 Mon Sep 17 00:00:00 2001
From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 14 Feb 2013 01:48:51 +0000
Subject: [PATCH]
---
MagickCore/version.h | 2 +-
Makefile.in | 19 ++----
PerlMagick/Magick.pm | 88 ++------------------------
PerlMagick/Magick.pm.in | 88 ++------------------------
PerlMagick/Magick.xs | 102 +++++++++++++++---------------
PerlMagick/Makefile.PL | 16 ++---
PerlMagick/Makefile.PL.in | 16 ++---
PerlMagick/Makefile.am | 17 ++---
PerlMagick/README.txt | 6 +-
PerlMagick/quantum/Makefile.PL | 8 +--
PerlMagick/quantum/Makefile.PL.in | 8 +--
PerlMagick/t/filter.t | 2 +-
PerlMagick/t/subroutines.pl | 42 ++++++------
PerlMagick/typemap | 2 +-
configure | 2 +-
15 files changed, 124 insertions(+), 294 deletions(-)
diff --git a/MagickCore/version.h b/MagickCore/version.h
index 82cbc06c1..e3f8031d4 100644
--- 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 "11008:11032"
+#define MagickSVNRevision "11008:11034M"
#define MagickLibVersion 0x700
#define MagickLibVersionText "7.0.0"
#define MagickLibVersionNumber 1,0,0
diff --git a/Makefile.in b/Makefile.in
index 346c156ef..748cd2636 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -187,8 +187,6 @@
#
# Makefile for building PerlMagick.
-# If source files missing, see if they can be obtained via VPATH
-
@@ -10685,20 +10683,13 @@ uninstall-local-utilities:
rm -f $$target ; \
done
-$(PERLMAGICK)/@MAGICK_ABI_SUFFIX@.xs: $(PERLMAGICK)/Magick.xs
- $(AM_V_GEN) $(LN_S) $(notdir $^) $@
-
-$(PERLMAGICK)/@MAGICK_ABI_SUFFIX@.pm: $(PERLMAGICK)/Magick.pm
- $(AM_V_GEN) $(LN_S) $(notdir $^) $@
-
-perl-quantum-sources: $(PERLMAGICK)/@MAGICK_ABI_SUFFIX@.xs $(PERLMAGICK)/@MAGICK_ABI_SUFFIX@.pm
-
-perl-sources: perl-quantum-sources
+# If source files missing, see if they can be obtained via VPATH
+perl-sources:
@if test -n "$(VPATH)" ; then \
echo "Linking PerlMagick Sources ..." ; \
imagemagick=`(cd $(VPATH) ; pwd)` && \
( cd $(PERLMAGICK) && \
- sh $$imagemagick/config/lndir.sh $$imagemagick/$(PERLMAGICK) ; ) \
+ sh $$imagemagick/config/lndir.sh $$imagemagick/$(PERLMAGICK) ) \
fi ; \
touch perl-sources
@@ -10757,8 +10748,8 @@ perl-sources: perl-quantum-sources
@WITH_PERL_TRUE@ ( if test -f Makefile ; then $(MAKE) CC='@CC@' clean ; fi ) ; \
@WITH_PERL_TRUE@ rm -f Makefile.old PerlMagick ; \
@WITH_PERL_TRUE@ rm -f t/output* t/jng/*_tmp.jng t/*/output* ; \
-@WITH_PERL_TRUE@ rm -f @MAGICK_ABI_SUFFIX@.xs;\
-@WITH_PERL_TRUE@ rm -f @MAGICK_ABI_SUFFIX@.pm;\
+@WITH_PERL_TRUE@ rm -f QUANTUM/@MAGICK_ABI_SUFFIX@.xs;\
+@WITH_PERL_TRUE@ rm -f QUANTUM/@MAGICK_ABI_SUFFIX@.pm;\
@WITH_PERL_TRUE@ rm -f Magick.pm;)
@WITH_PERL_TRUE@ rm -f perl-sources
diff --git a/PerlMagick/Magick.pm b/PerlMagick/Magick.pm
index 509c74ea5..72c3c1079 100644
--- a/PerlMagick/Magick.pm
+++ b/PerlMagick/Magick.pm
@@ -1,4 +1,4 @@
-package Image::Magick::Q16HDRI;
+package Image::Magick;
# Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization
# dedicated to making software imaging solutions freely available.
@@ -16,97 +16,23 @@ package Image::Magick::Q16HDRI;
#
# Initial version, written by Kyle Shorter.
+
use strict;
use Carp;
-use vars qw($VERSION @ISA @EXPORT $AUTOLOAD);
-
-require 5.002;
-require Exporter;
-require DynaLoader;
-require AutoLoader;
-
-@ISA = qw(Exporter DynaLoader);
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-@EXPORT =
- qw(
- Success Transparent Opaque QuantumDepth QuantumRange MaxRGB
- WarningException ResourceLimitWarning TypeWarning OptionWarning
- DelegateWarning MissingDelegateWarning CorruptImageWarning
- FileOpenWarning BlobWarning StreamWarning CacheWarning CoderWarning
- ModuleWarning DrawWarning ImageWarning XServerWarning RegistryWarning
- ConfigureWarning ErrorException ResourceLimitError TypeError
- OptionError DelegateError MissingDelegateError CorruptImageError
- FileOpenError BlobError StreamError CacheError CoderError
- ModuleError DrawError ImageError XServerError RegistryError
- ConfigureError FatalErrorException
- );
-
-$VERSION = '7.00';
-
-sub AUTOLOAD {
- # This AUTOLOAD is used to 'autoload' constants from the constant()
- # XS function. If a constant is not found then control is passed
- # to the AUTOLOAD in AutoLoader.
-
- my $constname;
- ($constname = $AUTOLOAD) =~ s/.*:://;
- die "&${AUTOLOAD} not defined. The required ImageMagick libraries are not installed or not installed properly.\n" if $constname eq 'constant';
- my $val = constant($constname, @_ ? $_[0] : 0);
- if ($! != 0) {
- if ($! =~ /Invalid/) {
- $AutoLoader::AUTOLOAD = $AUTOLOAD;
- goto &AutoLoader::AUTOLOAD;
- }
- else {
- my($pack,$file,$line) = caller;
- die "Your vendor has not defined PerlMagick macro $pack\:\:$constname, used at $file line $line.\n";
- }
- }
- eval "sub $AUTOLOAD { $val }";
- goto &$AUTOLOAD;
-}
-
-bootstrap Image::Magick::Q16HDRI $VERSION;
-
-# Preloaded methods go here.
-
-sub new
-{
- my $this = shift;
- my $class = ref($this) || $this || "Image::Magick::Q16HDRI";
- my $self = [ ];
- bless $self, $class;
- $self->set(@_) if @_;
- return $self;
-}
-
-sub New
-{
- my $this = shift;
- my $class = ref($this) || $this || "Image::Magick::Q16HDRI";
- my $self = [ ];
- bless $self, $class;
- $self->set(@_) if @_;
- return $self;
-}
-
-# Autoload methods go after =cut, and are processed by the autosplit program.
-
-END { UNLOAD () };
+
+use parent qw/Image::Magick::Q16HDRI/;
1;
__END__
=head1 NAME
-Image::Magick::Q16HDRI - objected-oriented Perl interface to ImageMagick (Q16HDRI). Use it to read, manipulate, or write an image or image sequence from within a Perl script.
+Image::Magick - objected-oriented Perl interface to ImageMagick for default quantum (Q16HDRI). Use it to read, manipulate, or write an image or image sequence from within a Perl script.
=head1 SYNOPSIS
- use Image::Magick::Q16HDRI;
- $p = new Image::Magick::Q16HDRI;
+ use Image::Magick;
+ $p = new Image::Magick;
$p->Read("imagefile");
$p->Set(attribute => value, ...)
($a, ...) = $p->Get("attribute", ...)
diff --git a/PerlMagick/Magick.pm.in b/PerlMagick/Magick.pm.in
index ea5caac57..a2da8dbe1 100644
--- a/PerlMagick/Magick.pm.in
+++ b/PerlMagick/Magick.pm.in
@@ -1,4 +1,4 @@
-package Image::Magick::@MAGICK_ABI_SUFFIX@;
+package Image::Magick;
# Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization
# dedicated to making software imaging solutions freely available.
@@ -16,97 +16,23 @@ package Image::Magick::@MAGICK_ABI_SUFFIX@;
#
# Initial version, written by Kyle Shorter.
+
use strict;
use Carp;
-use vars qw($VERSION @ISA @EXPORT $AUTOLOAD);
-
-require 5.002;
-require Exporter;
-require DynaLoader;
-require AutoLoader;
-
-@ISA = qw(Exporter DynaLoader);
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-@EXPORT =
- qw(
- Success Transparent Opaque QuantumDepth QuantumRange MaxRGB
- WarningException ResourceLimitWarning TypeWarning OptionWarning
- DelegateWarning MissingDelegateWarning CorruptImageWarning
- FileOpenWarning BlobWarning StreamWarning CacheWarning CoderWarning
- ModuleWarning DrawWarning ImageWarning XServerWarning RegistryWarning
- ConfigureWarning ErrorException ResourceLimitError TypeError
- OptionError DelegateError MissingDelegateError CorruptImageError
- FileOpenError BlobError StreamError CacheError CoderError
- ModuleError DrawError ImageError XServerError RegistryError
- ConfigureError FatalErrorException
- );
-
-$VERSION = '@PACKAGE_PERL_VERSION@';
-
-sub AUTOLOAD {
- # This AUTOLOAD is used to 'autoload' constants from the constant()
- # XS function. If a constant is not found then control is passed
- # to the AUTOLOAD in AutoLoader.
-
- my $constname;
- ($constname = $AUTOLOAD) =~ s/.*:://;
- die "&${AUTOLOAD} not defined. The required ImageMagick libraries are not installed or not installed properly.\n" if $constname eq 'constant';
- my $val = constant($constname, @_ ? $_[0] : 0);
- if ($! != 0) {
- if ($! =~ /Invalid/) {
- $AutoLoader::AUTOLOAD = $AUTOLOAD;
- goto &AutoLoader::AUTOLOAD;
- }
- else {
- my($pack,$file,$line) = caller;
- die "Your vendor has not defined PerlMagick macro $pack\:\:$constname, used at $file line $line.\n";
- }
- }
- eval "sub $AUTOLOAD { $val }";
- goto &$AUTOLOAD;
-}
-
-bootstrap Image::Magick::@MAGICK_ABI_SUFFIX@ $VERSION;
-
-# Preloaded methods go here.
-
-sub new
-{
- my $this = shift;
- my $class = ref($this) || $this || "Image::Magick::@MAGICK_ABI_SUFFIX@";
- my $self = [ ];
- bless $self, $class;
- $self->set(@_) if @_;
- return $self;
-}
-
-sub New
-{
- my $this = shift;
- my $class = ref($this) || $this || "Image::Magick::@MAGICK_ABI_SUFFIX@";
- my $self = [ ];
- bless $self, $class;
- $self->set(@_) if @_;
- return $self;
-}
-
-# Autoload methods go after =cut, and are processed by the autosplit program.
-
-END { UNLOAD () };
+
+use parent qw/Image::Magick::@MAGICK_ABI_SUFFIX@/;
1;
__END__
=head1 NAME
-Image::Magick::@MAGICK_ABI_SUFFIX@ - objected-oriented Perl interface to ImageMagick (@MAGICK_ABI_SUFFIX@). Use it to read, manipulate, or write an image or image sequence from within a Perl script.
+Image::Magick - objected-oriented Perl interface to ImageMagick for default quantum (@MAGICK_ABI_SUFFIX@). Use it to read, manipulate, or write an image or image sequence from within a Perl script.
=head1 SYNOPSIS
- use Image::Magick::@MAGICK_ABI_SUFFIX@;
- $p = new Image::Magick::@MAGICK_ABI_SUFFIX@;
+ use Image::Magick;
+ $p = new Image::Magick;
$p->Read("imagefile");
$p->Set(attribute => value, ...)
($a, ...) = $p->Get("attribute", ...)
diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index ca9c6f553..2148e7203 100644
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -79,7 +79,7 @@ extern "C" {
#define na PL_na
#endif
#define NumberOf(array) (sizeof(array)/sizeof(*array))
-#define PackageName "Image::Magick::@MAGICK_ABI_NAME@"
+#define PackageName "Image::Magick"
#if PERL_VERSION <= 6
#define PerlIO FILE
#define PerlIO_importFILE(f, fl) (f)
@@ -189,7 +189,7 @@ struct PackageInfo
};
typedef void
- *Image__Magick__Q16HDRI; /* data type for the Image::Magick::@MAGICK_ABI_NAME@ package */
+ *Image__Magick; /* data type for the Image::Magick package */
/*
Static declarations.
@@ -2340,7 +2340,7 @@ static ssize_t strEQcase(const char *p,const char *q)
%
%
*/
-MODULE = Image::Magick::Q16HDRI PACKAGE = Image::Magick::Q16HDRI
+MODULE = Image::Magick PACKAGE = Image::Magick
PROTOTYPES: ENABLE
@@ -2379,7 +2379,7 @@ constant(name,argument)
#
void
Animate(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
AnimateImage = 1
animate = 2
@@ -2458,7 +2458,7 @@ Animate(ref,...)
#
void
Append(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
AppendImage = 1
append = 2
@@ -2596,7 +2596,7 @@ Append(ref,...)
#
void
Average(ref)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
AverageImage = 1
average = 2
@@ -2694,7 +2694,7 @@ Average(ref)
#
void
BlobToImage(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
BlobToImage = 1
blobtoimage = 2
@@ -2850,7 +2850,7 @@ BlobToImage(ref,...)
#
void
ChannelFx(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
ChannelFxImage = 1
channelfx = 2
@@ -3013,7 +3013,7 @@ ChannelFx(ref,...)
#
void
Clone(ref)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
CopyImage = 1
copy = 2
@@ -3142,7 +3142,7 @@ CLONE(ref,...)
#
void
Coalesce(ref)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
CoalesceImage = 1
coalesce = 2
@@ -3232,7 +3232,7 @@ Coalesce(ref)
#
void
Compare(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
CompareImages = 1
compare = 2
@@ -3427,7 +3427,7 @@ Compare(ref,...)
#
void
CompareLayers(ref)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
CompareImagesLayers = 1
comparelayers = 2
@@ -3563,7 +3563,7 @@ CompareLayers(ref)
#
void
DESTROY(ref)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
PPCODE:
{
SV
@@ -3648,7 +3648,7 @@ DESTROY(ref)
#
void
Display(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
DisplayImage = 1
display = 2
@@ -3727,7 +3727,7 @@ Display(ref,...)
#
void
EvaluateImages(ref)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
EvaluateImages = 1
evaluateimages = 2
@@ -3884,7 +3884,7 @@ EvaluateImages(ref)
#
void
Features(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
FeaturesImage = 1
features = 2
@@ -4059,7 +4059,7 @@ Features(ref,...)
#
void
Flatten(ref)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
FlattenImage = 1
flatten = 2
@@ -4196,7 +4196,7 @@ Flatten(ref)
#
void
Fx(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
FxImage = 1
fx = 2
@@ -4359,7 +4359,7 @@ Fx(ref,...)
#
void
Get(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
GetAttributes = 1
GetAttribute = 2
@@ -5645,7 +5645,7 @@ Get(ref,...)
#
void *
GetAuthenticPixels(ref,...)
- Image::Magick::Q16HDRI ref = NO_INIT
+ Image::Magick ref = NO_INIT
ALIAS:
getauthenticpixels = 1
GetImagePixels = 2
@@ -5800,7 +5800,7 @@ GetAuthenticPixels(ref,...)
#
void *
GetVirtualPixels(ref,...)
- Image::Magick::Q16HDRI ref = NO_INIT
+ Image::Magick ref = NO_INIT
ALIAS:
getvirtualpixels = 1
AcquireImagePixels = 2
@@ -5955,7 +5955,7 @@ GetVirtualPixels(ref,...)
#
void *
GetAuthenticMetacontent(ref,...)
- Image::Magick::Q16HDRI ref = NO_INIT
+ Image::Magick ref = NO_INIT
ALIAS:
getauthenticmetacontent = 1
GetMetacontent = 2
@@ -6027,7 +6027,7 @@ GetAuthenticMetacontent(ref,...)
#
void *
GetVirtualMetacontent(ref,...)
- Image::Magick::Q16HDRI ref = NO_INIT
+ Image::Magick ref = NO_INIT
ALIAS:
getvirtualmetacontent = 1
CODE:
@@ -6097,7 +6097,7 @@ GetVirtualMetacontent(ref,...)
#
void
Histogram(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
HistogramImage = 1
histogram = 2
@@ -6212,7 +6212,7 @@ Histogram(ref,...)
#
void
GetPixel(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
getpixel = 1
getPixel = 2
@@ -6409,7 +6409,7 @@ GetPixel(ref,...)
#
void
GetPixels(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
getpixels = 1
getPixels = 2
@@ -6657,7 +6657,7 @@ GetPixels(ref,...)
#
void
ImageToBlob(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
ImageToBlob = 1
imagetoblob = 2
@@ -6763,7 +6763,7 @@ ImageToBlob(ref,...)
#
void
Layers(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
Layers = 1
layers = 2
@@ -7056,7 +7056,7 @@ Layers(ref,...)
#
SV *
MagickToMime(ref,name)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
char *name
ALIAS:
magicktomime = 1
@@ -7088,7 +7088,7 @@ MagickToMime(ref,name)
#
void
Mogrify(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
Comment = 1
CommentImage = 2
@@ -10981,7 +10981,7 @@ Mogrify(ref,...)
#
void
Montage(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
MontageImage = 1
montage = 2
@@ -11393,7 +11393,7 @@ Montage(ref,...)
#
void
Morph(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
MorphImage = 1
morph = 2
@@ -11524,7 +11524,7 @@ Morph(ref,...)
#
void
Mosaic(ref)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
MosaicImage = 1
mosaic = 2
@@ -11614,7 +11614,7 @@ Mosaic(ref)
#
void
Ping(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
PingImage = 1
ping = 2
@@ -11823,7 +11823,7 @@ Ping(ref,...)
#
void
Preview(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
PreviewImage = 1
preview = 2
@@ -11923,7 +11923,7 @@ Preview(ref,...)
#
void
QueryColor(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
querycolor = 1
PPCODE:
@@ -12003,7 +12003,7 @@ QueryColor(ref,...)
#
void
QueryColorname(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
querycolorname = 1
PPCODE:
@@ -12078,7 +12078,7 @@ QueryColorname(ref,...)
#
void
QueryFont(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
queryfont = 1
PPCODE:
@@ -12198,7 +12198,7 @@ QueryFont(ref,...)
#
void
QueryFontMetrics(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
queryfontmetrics = 1
PPCODE:
@@ -12609,7 +12609,7 @@ QueryFontMetrics(ref,...)
#
void
QueryMultilineFontMetrics(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
querymultilinefontmetrics = 1
PPCODE:
@@ -12982,7 +12982,7 @@ QueryMultilineFontMetrics(ref,...)
#
void
QueryFormat(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
queryformat = 1
PPCODE:
@@ -13074,7 +13074,7 @@ QueryFormat(ref,...)
#
void
QueryOption(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
queryoption = 1
PPCODE:
@@ -13134,7 +13134,7 @@ QueryOption(ref,...)
#
void
Read(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
ReadImage = 1
read = 2
@@ -13352,7 +13352,7 @@ Read(ref,...)
#
void
Remote(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
RemoteCommand = 1
remote = 2
@@ -13405,7 +13405,7 @@ Remote(ref,...)
#
void
Set(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
SetAttributes = 1
SetAttribute = 2
@@ -13471,7 +13471,7 @@ Set(ref,...)
#
void
SetPixel(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
setpixel = 1
setPixel = 2
@@ -13722,7 +13722,7 @@ SetPixel(ref,...)
#
void
Smush(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
SmushImage = 1
smush = 2
@@ -13875,7 +13875,7 @@ Smush(ref,...)
#
void
Statistics(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
StatisticsImage = 1
statistics = 2
@@ -13997,7 +13997,7 @@ Statistics(ref,...)
#
void
SyncAuthenticPixels(ref,...)
- Image::Magick::Q16HDRI ref = NO_INIT
+ Image::Magick ref = NO_INIT
ALIAS:
Syncauthenticpixels = 1
SyncImagePixels = 2
@@ -14064,7 +14064,7 @@ SyncAuthenticPixels(ref,...)
#
void
Transform(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
TransformImage = 1
transform = 2
@@ -14212,7 +14212,7 @@ Transform(ref,...)
#
void
Write(ref,...)
- Image::Magick::Q16HDRI ref=NO_INIT
+ Image::Magick ref=NO_INIT
ALIAS:
WriteImage = 1
write = 2
diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL
index 29a83bfd4..e11fe60ca 100644
--- a/PerlMagick/Makefile.PL
+++ b/PerlMagick/Makefile.PL
@@ -162,10 +162,10 @@ foreach my $delegate (@tested_delegates) {
# defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile
my $INC_magick = '-I../ -I.. -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 -I"' . $Config{'usrinc'} . '/ImageMagick"';
-my $LIBS_magick = '-L../MagickCore/.libs -lMagickCore-7.Q16HDRI -lperl -lm';
+my $LIBS_magick = '-L../MagickCore/.libs -lMagickCore-Q16HDRI -lperl -lm';
my $CCFLAGS_magick = "$Config{'ccflags'} -I/usr/include/freetype2 -fopenmp -g -O2 -Wall -pthread -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16";
-my $LDFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-7.Q16HDRI $Config{'ldflags'} ";
-my $LDDLFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-7.Q16HDRI $Config{'lddlflags'} ";
+my $LDFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-Q16HDRI $Config{'ldflags'} ";
+my $LDDLFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-Q16HDRI $Config{'lddlflags'} ";
if (($^O eq 'MSWin32') && ($Config{cc} =~ /gcc/)) {
my($Ipaths, $Lpaths) = AutodetectWin32gcc();
@@ -174,7 +174,7 @@ if (($^O eq 'MSWin32') && ($Config{cc} =~ /gcc/)) {
# Setup for strawberry perl.
#
$INC_magick = "$Ipaths";
- $LIBS_magick = "-lMagickCore-7.Q16HDRI";
+ $LIBS_magick = "-lMagickCore-Q16HDRI";
$CCFLAGS_magick = "$Config{'ccflags'}";
$LDFLAGS_magick = "$Config{'ldflags'} $Lpaths ";
$LDDLFLAGS_magick = "$Config{'lddlflags'} $Lpaths ";
@@ -185,10 +185,10 @@ if (($^O eq 'MSWin32') && ($Config{cc} =~ /gcc/)) {
WriteMakefile
(
# Module description
- 'ABSTRACT' => 'ImageMagick PERL Extension (Q16HDRI)',
+ 'ABSTRACT' => 'ImageMagick PERL Extension',
# Perl module name is Image::Magick
- 'NAME' => 'Image::Magick::Q16HDRI',
+ 'NAME' => 'Image::Magick',
# Module author
'AUTHOR' => 'ImageMagick Studio LLC',
@@ -234,8 +234,6 @@ WriteMakefile
# Use same compiler as ImageMagick
'PERLMAINCC' => ' -fopenmp',
- 'PM' => { 'Q16HDRI.pm' => '$(INST_LIBDIR)/Q16HDRI.pm' },
- 'XS' => { 'Q16HDRI.xs' => 'Q16HDRI.xs' },
'AR' => 'ar',
'LD' => '',
@@ -247,7 +245,7 @@ WriteMakefile
($Config{'archname'} =~ /-object$/i ? ('CAPI' => 'TRUE') : ()),
-# sane vesion
+ # sane version
depend => { '$(FIRST_MAKEFILE)' => '$(VERSION_FROM)' }
);
diff --git a/PerlMagick/Makefile.PL.in b/PerlMagick/Makefile.PL.in
index 157e67b52..3538d2fbc 100644
--- a/PerlMagick/Makefile.PL.in
+++ b/PerlMagick/Makefile.PL.in
@@ -162,10 +162,10 @@ foreach my $delegate (@tested_delegates) {
# defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile
my $INC_magick = '-I../ -I@top_srcdir@ @CPPFLAGS@ -I"' . $Config{'usrinc'} . '/ImageMagick"';
-my $LIBS_magick = '-L../MagickCore/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ -lperl @MATH_LIBS@';
+my $LIBS_magick = '-L../MagickCore/.libs -lMagickCore-@MAGICK_ABI_SUFFIX@ -lperl @MATH_LIBS@';
my $CCFLAGS_magick = "$Config{'ccflags'} @CFLAGS@";
-my $LDFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ $Config{'ldflags'} @LDFLAGS@";
-my $LDDLFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ $Config{'lddlflags'} @LDFLAGS@";
+my $LDFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-@MAGICK_ABI_SUFFIX@ $Config{'ldflags'} @LDFLAGS@";
+my $LDDLFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-@MAGICK_ABI_SUFFIX@ $Config{'lddlflags'} @LDFLAGS@";
if (($^O eq 'MSWin32') && ($Config{cc} =~ /gcc/)) {
my($Ipaths, $Lpaths) = AutodetectWin32gcc();
@@ -174,7 +174,7 @@ if (($^O eq 'MSWin32') && ($Config{cc} =~ /gcc/)) {
# Setup for strawberry perl.
#
$INC_magick = "$Ipaths";
- $LIBS_magick = "-lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@";
+ $LIBS_magick = "-lMagickCore-@MAGICK_ABI_SUFFIX@";
$CCFLAGS_magick = "$Config{'ccflags'}";
$LDFLAGS_magick = "$Config{'ldflags'} $Lpaths ";
$LDDLFLAGS_magick = "$Config{'lddlflags'} $Lpaths ";
@@ -185,10 +185,10 @@ if (($^O eq 'MSWin32') && ($Config{cc} =~ /gcc/)) {
WriteMakefile
(
# Module description
- 'ABSTRACT' => 'ImageMagick PERL Extension (@MAGICK_ABI_SUFFIX@)',
+ 'ABSTRACT' => 'ImageMagick PERL Extension',
# Perl module name is Image::Magick
- 'NAME' => 'Image::Magick::@MAGICK_ABI_SUFFIX@',
+ 'NAME' => 'Image::Magick',
# Module author
'AUTHOR' => 'ImageMagick Studio LLC',
@@ -234,8 +234,6 @@ WriteMakefile
# Use same compiler as ImageMagick
'PERLMAINCC' => '@PERLMAINCC@ @OPENMP_CFLAGS@',
- 'PM' => { '@MAGICK_ABI_SUFFIX@.pm' => '$(INST_LIBDIR)/@MAGICK_ABI_SUFFIX@.pm' },
- 'XS' => { '@MAGICK_ABI_SUFFIX@.xs' => '@MAGICK_ABI_SUFFIX@.xs' },
'AR' => '@AR@',
'LD' => '@PERLMAINCC@',
@@ -247,7 +245,7 @@ WriteMakefile
($Config{'archname'} =~ /-object$/i ? ('CAPI' => 'TRUE') : ()),
-# sane vesion
+ # sane version
depend => { '$(FIRST_MAKEFILE)' => '$(VERSION_FROM)' }
);
diff --git a/PerlMagick/Makefile.am b/PerlMagick/Makefile.am
index 26c1de11a..c23795d10 100644
--- a/PerlMagick/Makefile.am
+++ b/PerlMagick/Makefile.am
@@ -17,21 +17,12 @@
# Makefile for building PerlMagick.
# If source files missing, see if they can be obtained via VPATH
-
-$(PERLMAGICK)/@MAGICK_ABI_SUFFIX@.xs: $(PERLMAGICK)/Magick.xs
- $(AM_V_GEN) $(LN_S) $(notdir $^) $@
-
-$(PERLMAGICK)/@MAGICK_ABI_SUFFIX@.pm: $(PERLMAGICK)/Magick.pm
- $(AM_V_GEN) $(LN_S) $(notdir $^) $@
-
-perl-quantum-sources: $(PERLMAGICK)/@MAGICK_ABI_SUFFIX@.xs $(PERLMAGICK)/@MAGICK_ABI_SUFFIX@.pm
-
-perl-sources: perl-quantum-sources
+perl-sources:
@if test -n "$(VPATH)" ; then \
echo "Linking PerlMagick Sources ..." ; \
imagemagick=`(cd $(VPATH) ; pwd)` && \
( cd $(PERLMAGICK) && \
- sh $$imagemagick/config/lndir.sh $$imagemagick/$(PERLMAGICK) ; ) \
+ sh $$imagemagick/config/lndir.sh $$imagemagick/$(PERLMAGICK) ) \
fi ; \
touch perl-sources
@@ -120,8 +111,8 @@ clean-perl:
( if test -f Makefile ; then $(MAKE) CC='@CC@' clean ; fi ) ; \
rm -f Makefile.old PerlMagick ; \
rm -f t/output* t/jng/*_tmp.jng t/*/output* ; \
- rm -f @MAGICK_ABI_SUFFIX@.xs;\
- rm -f @MAGICK_ABI_SUFFIX@.pm;\
+ rm -f QUANTUM/@MAGICK_ABI_SUFFIX@.xs;\
+ rm -f QUANTUM/@MAGICK_ABI_SUFFIX@.pm;\
rm -f Magick.pm;)
rm -f perl-sources
diff --git a/PerlMagick/README.txt b/PerlMagick/README.txt
index 21cb3909d..2f8a92371 100644
--- a/PerlMagick/README.txt
+++ b/PerlMagick/README.txt
@@ -3,7 +3,7 @@ Introduction
PerlMagick, is an objected-oriented Perl interface to ImageMagick.
Use the module to read, manipulate, or write an image or image sequence
from within a Perl script. This makes it suitable for Web CGI scripts. You
- must have ImageMagick 7.0.0 or above installed on your system for this
+ must have ImageMagick 6.6.7 or above installed on your system for this
module to work properly.
See
@@ -23,8 +23,8 @@ Installation
Get the PerlMagick distribution and type the following:
- gunzip ImageMagick-7.0.0-0.tar.gz
- tar xvf ImageMagick-7.0.0
+ gunzip ImageMagick-6.6.7-0.tar.gz
+ tar xvf ImageMagick-6.6.7
Follow the ImageMagick installation instructions in INSTALL-unix.txt
then type
diff --git a/PerlMagick/quantum/Makefile.PL b/PerlMagick/quantum/Makefile.PL
index e9018c4e7..f608b7075 100644
--- a/PerlMagick/quantum/Makefile.PL
+++ b/PerlMagick/quantum/Makefile.PL
@@ -70,7 +70,7 @@ sub AutodetectWin32gcc {
push @i, catfile($dirpath,'..','..','include','ImageMagick');
push @i, catfile($dirpath,'..','..','..','include');
push @i, catfile($dirpath,'..','..','..','include','ImageMagick');
- foreach (@i) { push @incdir, $_ if (-e "$_/magick/MagickCore.h") };
+ foreach (@i) { push @incdir, $_ if (-e "$_/MagickCore/MagickCore.h") };
}
};
@@ -162,10 +162,10 @@ foreach my $delegate (@tested_delegates) {
# defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile
my $INC_magick = '-I../ -I../.. -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 -I"' . $Config{'usrinc'} . '/ImageMagick"';
-my $LIBS_magick = '-L../../magick/.libs -lMagickCore7-Q16HDRI -lperl -lm';
+my $LIBS_magick = '-L../../MagickCore/.libs -lMagickCore7-Q16HDRI -lperl -lm';
my $CCFLAGS_magick = "$Config{'ccflags'} -I/usr/include/freetype2 -fopenmp -g -O2 -Wall -pthread -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16";
-my $LDFLAGS_magick = "-L../../magick/.libs -lMagickCore7-Q16HDRI $Config{'ldflags'} ";
-my $LDDLFLAGS_magick = "-L../../magick/.libs -lMagickCore7-Q16HDRI $Config{'lddlflags'} ";
+my $LDFLAGS_magick = "-L../../MagickCore/.libs -lMagickCore7-Q16HDRI $Config{'ldflags'} ";
+my $LDDLFLAGS_magick = "-L../../MagickCore/.libs -lMagickCore7-Q16HDRI $Config{'lddlflags'} ";
if (($^O eq 'MSWin32') && ($Config{cc} =~ /gcc/)) {
my($Ipaths, $Lpaths) = AutodetectWin32gcc();
diff --git a/PerlMagick/quantum/Makefile.PL.in b/PerlMagick/quantum/Makefile.PL.in
index 2c459c76f..dd7866357 100644
--- a/PerlMagick/quantum/Makefile.PL.in
+++ b/PerlMagick/quantum/Makefile.PL.in
@@ -70,7 +70,7 @@ sub AutodetectWin32gcc {
push @i, catfile($dirpath,'..','..','include','ImageMagick');
push @i, catfile($dirpath,'..','..','..','include');
push @i, catfile($dirpath,'..','..','..','include','ImageMagick');
- foreach (@i) { push @incdir, $_ if (-e "$_/magick/MagickCore.h") };
+ foreach (@i) { push @incdir, $_ if (-e "$_/MagickCore/MagickCore.h") };
}
};
@@ -162,10 +162,10 @@ foreach my $delegate (@tested_delegates) {
# defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile
my $INC_magick = '-I../ -I@top_srcdir@ @CPPFLAGS@ -I"' . $Config{'usrinc'} . '/ImageMagick"';
-my $LIBS_magick = '-L../../magick/.libs -lMagickCore@MAGICK_MAJOR_VERSION@-@MAGICK_ABI_SUFFIX@ -lperl @MATH_LIBS@';
+my $LIBS_magick = '-L../../MagickCore/.libs -lMagickCore@MAGICK_MAJOR_VERSION@-@MAGICK_ABI_SUFFIX@ -lperl @MATH_LIBS@';
my $CCFLAGS_magick = "$Config{'ccflags'} @CFLAGS@";
-my $LDFLAGS_magick = "-L../../magick/.libs -lMagickCore@MAGICK_MAJOR_VERSION@-@MAGICK_ABI_SUFFIX@ $Config{'ldflags'} @LDFLAGS@";
-my $LDDLFLAGS_magick = "-L../../magick/.libs -lMagickCore@MAGICK_MAJOR_VERSION@-@MAGICK_ABI_SUFFIX@ $Config{'lddlflags'} @LDFLAGS@";
+my $LDFLAGS_magick = "-L../../MagickCore/.libs -lMagickCore@MAGICK_MAJOR_VERSION@-@MAGICK_ABI_SUFFIX@ $Config{'ldflags'} @LDFLAGS@";
+my $LDDLFLAGS_magick = "-L../../MagickCore/.libs -lMagickCore@MAGICK_MAJOR_VERSION@-@MAGICK_ABI_SUFFIX@ $Config{'lddlflags'} @LDFLAGS@";
if (($^O eq 'MSWin32') && ($Config{cc} =~ /gcc/)) {
my($Ipaths, $Lpaths) = AutodetectWin32gcc();
diff --git a/PerlMagick/t/filter.t b/PerlMagick/t/filter.t
index ad619c889..67015745c 100644
--- a/PerlMagick/t/filter.t
+++ b/PerlMagick/t/filter.t
@@ -28,7 +28,7 @@ use FileHandle;
autoflush STDOUT 1;
autoflush STDERR 1;
-$fuzz=int(0.05*(Image::Magick->new()->QuantumRange));
+$fuzz=int(0.0*QuantumRange);
testFilterCompare('input.miff', q//, 'reference/filter/AdaptiveThreshold.miff', 'AdaptiveThreshold', q/'5x5+5%'/, 0.0, 0.0);
++$test;
diff --git a/PerlMagick/t/subroutines.pl b/PerlMagick/t/subroutines.pl
index b99c4f0df..4463fbc56 100644
--- a/PerlMagick/t/subroutines.pl
+++ b/PerlMagick/t/subroutines.pl
@@ -182,11 +182,11 @@ sub testRead {
$ref_32 = $ref_16;
}
- if (Image::Magick->new()->QuantumDepth == 32)
+ if (QuantumDepth == 32)
{
$ref_signature=$ref_32;
}
- elsif (Image::Magick->new()->QuantumDepth == 16)
+ elsif (QuantumDepth == 16)
{
$ref_signature=$ref_16;
}
@@ -223,7 +223,7 @@ sub testRead {
print "Image: $infile, signatures do not match.\n";
print " Expected: $ref_signature\n";
print " Computed: $signature\n";
- print " Depth: ", Image::Magick->new()->QuantumDepth, "\n";
+ print " Depth: ", QuantumDepth, "\n";
++$failure;
$image->Display();
}
@@ -261,7 +261,7 @@ sub testRead {
print "Image: $infile, signatures do not match.\n";
print " Expected: $ref_signature\n";
print " Computed: $signature\n";
- print " Depth: ", Image::Magick->new()->QuantumDepth, "\n";
+ print " Depth: ", QuantumDepth, "\n";
#$image->Display();
++$failure;
}
@@ -420,11 +420,11 @@ sub testReadSized {
$ref_32 = $ref_16;
}
- if (Image::Magick->new()->QuantumDepth == 32)
+ if (QuantumDepth == 32)
{
$ref_signature=$ref_32;
}
- elsif (Image::Magick->new()->QuantumDepth == 16)
+ elsif (QuantumDepth == 16)
{
$ref_signature=$ref_16;
}
@@ -440,8 +440,8 @@ sub testReadSized {
warn "$status" if "$status";
# If depth is not zero, then set it
- if ( Image::Magick->new()->QuantumDepth != 0 ) {
- $status=$image->SetAttribute(depth=>Image::Magick->new()->QuantumDepth);
+ if ( QuantumDepth != 0 ) {
+ $status=$image->SetAttribute(depth=>QuantumDepth);
warn "$status" if "$status";
}
@@ -456,7 +456,7 @@ sub testReadSized {
print "Image: $infile, signatures do not match.\n";
print " Expected: $ref_signature\n";
print " Computed: $signature\n";
- print " Depth: ", Image::Magick->new()->QuantumDepth, "\n";
+ print " Depth: ", QuantumDepth, "\n";
print "not ok $test\n";
#$image->Display();
} else {
@@ -494,11 +494,11 @@ sub testReadWrite {
$ref_32 = $ref_16;
}
- if (Image::Magick->new()->QuantumDepth == 32)
+ if (QuantumDepth == 32)
{
$ref_signature=$ref_32;
}
- elsif (Image::Magick->new()->QuantumDepth == 16)
+ elsif (QuantumDepth == 16)
{
$ref_signature=$ref_16;
}
@@ -543,7 +543,7 @@ sub testReadWrite {
print "Image: $infile, signatures do not match.\n";
print " Expected: $ref_signature\n";
print " Computed: $signature\n";
- print " Depth: ", Image::Magick->new()->QuantumDepth, "\n";
+ print " Depth: ", QuantumDepth, "\n";
print "not ok $test\n";
$image->Display();
} else {
@@ -785,11 +785,11 @@ sub testReadWriteSized {
$ref_32 = $ref_16;
}
- if (Image::Magick->new()->QuantumDepth == 32)
+ if (QuantumDepth == 32)
{
$ref_signature=$ref_32;
}
- elsif (Image::Magick->new()->QuantumDepth == 16)
+ elsif (QuantumDepth == 16)
{
$ref_signature=$ref_16;
}
@@ -856,7 +856,7 @@ sub testReadWriteSized {
print "Image: $infile, signatures do not match.\n";
print " Expected: $ref_signature\n";
print " Computed: $signature\n";
- print " Depth: ", Image::Magick->new()->QuantumDepth, "\n";
+ print " Depth: ", QuantumDepth, "\n";
print "not ok $test\n";
#$image->Display();
} else {
@@ -969,11 +969,11 @@ sub testMontage {
$ref_32 = $ref_16;
}
- if (Image::Magick->new()->QuantumDepth == 32)
+ if (QuantumDepth == 32)
{
$ref_signature=$ref_32;
}
- elsif (Image::Magick->new()->QuantumDepth == 16)
+ elsif (QuantumDepth == 16)
{
$ref_signature=$ref_16;
}
@@ -1042,7 +1042,7 @@ sub testMontage {
print "Test $test, signatures do not match.\n";
print " Expected: $ref_signature\n";
print " Computed: $signature\n";
- print " Depth: ", Image::Magick->new()->QuantumDepth, "\n";
+ print " Depth: ", QuantumDepth, "\n";
$status = $montage->Write("test_${test}_out.miff");
warn "Write: $status" if "$status";
@@ -1100,11 +1100,11 @@ sub testFilterSignature {
$ref_32 = $ref_16;
}
- if (Image::Magick->new()->QuantumDepth == 32)
+ if (QuantumDepth == 32)
{
$ref_signature=$ref_32;
}
- elsif (Image::Magick->new()->QuantumDepth == 16)
+ elsif (QuantumDepth == 16)
{
$ref_signature=$ref_16;
}
@@ -1129,7 +1129,7 @@ sub testFilterSignature {
print "Test $test, signatures do not match.\n";
print " Expected: $ref_signature\n";
print " Computed: $signature\n";
- print " Depth: ", Image::Magick->new()->QuantumDepth, "\n";
+ print " Depth: ", QuantumDepth, "\n";
#$image->Display();
print "not ok $test\n";
} else {
diff --git a/PerlMagick/typemap b/PerlMagick/typemap
index d901f1782..89f947b52 100644
--- a/PerlMagick/typemap
+++ b/PerlMagick/typemap
@@ -1 +1 @@
-Image::Magick::Q16HDRI T_PTROBJ
+Image::Magick T_PTROBJ
diff --git a/configure b/configure
index 02244bfe3..993b11263 100755
--- a/configure
+++ b/configure
@@ -3668,7 +3668,7 @@ MAGICK_PATCHLEVEL_VERSION=0
MAGICK_VERSION=7.0.0-0
-MAGICK_SVN_REVISION=11008:11032
+MAGICK_SVN_REVISION=11008:11034M
# Substitute library versioning
--
2.40.0