(no commit message)

diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index d58ba017e2252eedb851845f976700517eb40a4e..e339f323cb08a650395423eaf60857646e3f0afc 100644 (file)
--- a/MagickCore/morphology.c
+++ b/MagickCore/morphology.c
@@ -2734,7 +2734,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image,
             /*
               Alpha blending.
             */
-            for (v=0; v < (ssize_t) kernel->width; v++)
+            for (v=0; v < (ssize_t) kernel->height; v++)
             {
               for (u=0; u < (ssize_t) kernel->width; u++)
               {
@@ -2922,7 +2922,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image,
             /*
               Alpha blending.
             */
-            for (v=0; v < (ssize_t) kernel->width; v++)
+            for (v=0; v < (ssize_t) kernel->height; v++)
             {
               for (u=0; u < (ssize_t) kernel->width; u++)
               {

diff --git a/PerlMagick/Magick.pm b/PerlMagick/Magick.pm
index 6863a5a497d961e6a281498a18112cb0727e1ea6..dcda837a1446b45cb6e818a83434a5b71c03bb2c 100644 (file)
--- a/PerlMagick/Magick.pm
+++ b/PerlMagick/Magick.pm
@@ -16,18 +16,92 @@ package Image::Magick;
 #
 #  Initial version, written by Kyle Shorter.
 
-
 use strict;
 use Carp;
-
-use parent qw/Image::Magick::Q16HDRI/;
+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 $VERSION;
+
+# Preloaded methods go here.
+
+sub new
+{
+    my $this = shift;
+    my $class = ref($this) || $this || "Image::Magick";
+    my $self = [ ];
+    bless $self, $class;
+    $self->set(@_) if @_;
+    return $self;
+}
+
+sub New
+{
+    my $this = shift;
+    my $class = ref($this) || $this || "Image::Magick";
+    my $self = [ ];
+    bless $self, $class;
+    $self->set(@_) if @_;
+    return $self;
+}
+
+# Autoload methods go after =cut, and are processed by the autosplit program.
+
+END { UNLOAD () };
 
 1;
 __END__
 
 =head1 NAME
 
-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.
+Image::Magick - objected-oriented Perl interface to ImageMagick. Use it to read, manipulate, or write an image or image sequence from within a Perl script.
 
 =head1 SYNOPSIS
 
@@ -48,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/local/share/doc/ImageMagick-6.8.2/www/perl-magick.html
         http://www.imagemagick.org/script/perl-magick.php
 
 If you have problems, go to

diff --git a/PerlMagick/Makefile.nt b/PerlMagick/Makefile.nt
index 985674ddc60b7d1feedcaefd933971a20c6e4a23..72e0e9793dc487cf25a4bda31074b39af4116f3d 100644 (file)
--- a/PerlMagick/Makefile.nt
+++ b/PerlMagick/Makefile.nt
@@ -38,7 +38,7 @@ WriteMakefile(
     'AUTHOR'    => 'ImageMagick Studio',
     'NAME'      => 'Image::Magick',
     'VERSION_FROM' => 'Magick.pm', # finds $VERSION
-    'LIBS'      => ['-L..\VisualMagick\lib -L..\VisualMagick\bin -lCORE_RL_MagickCore_.lib -lCORE_DB_MagickCore_.lib'],
+    'LIBS'      => ['-L..\VisualMagick\lib -L..\VisualMagick\bin -lCORE_RL_magick_.lib -lCORE_DB_magick_.lib'],
     'DEFINE'    => '-D_VISUALC_ -D_WINDOWS',     # e.g., '-DHAVE_SOMETHING' 
     'INC'       => '-I.. -I..\xlib\include',
     'BINARY_LOCATION'  => 'x86/Image-Magick.tar.gz',