From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 2 Jul 2014 17:53:42 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2174
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7dbd926154fba47748e55130672fbe33cb969e35;p=imagemagick

---

diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index c62581f16..93fbc135f 100644
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -4158,8 +4158,7 @@ Features(ref,...)
           PackageName);
         goto PerlException;
       }
-    info=GetPackageInfo(aTHX_ (void *) av,info,exception);
-    distance=1;
+    distance=1.0;
     for (i=2; i < items; i+=2)
     {
       attribute=(char *) SvPV(ST(i-1),na);
@@ -6324,7 +6323,6 @@ Histogram(ref,...)
           PackageName);
         goto PerlException;
       }
-    info=GetPackageInfo(aTHX_ (void *) av,info,exception);
     count=0;
     for ( ; image; image=image->next)
     {
@@ -11845,7 +11843,6 @@ Mosaic(ref)
     rv=newRV(sv);
     av_push(av,sv_bless(rv,hv));
     SvREFCNT_dec(sv);
-    info=GetPackageInfo(aTHX_ (void *) av,info,exception);
     (void) CopyMagickString(info->image_info->filename,image->filename,
       MaxTextExtent);
     SetImageInfo(info->image_info,0,exception);
@@ -14218,7 +14215,6 @@ Statistics(ref,...)
           PackageName);
         goto PerlException;
       }
-    info=GetPackageInfo(aTHX_ (void *) av,info,exception);
     count=0;
     for ( ; image; image=image->next)
     {
diff --git a/PerlMagick/quantum/quantum.xs.in b/PerlMagick/quantum/quantum.xs.in
index 6b7b2d9c7..7faf828ac 100644
--- a/PerlMagick/quantum/quantum.xs.in
+++ b/PerlMagick/quantum/quantum.xs.in
@@ -4158,8 +4158,7 @@ Features(ref,...)
           PackageName);
         goto PerlException;
       }
-    info=GetPackageInfo(aTHX_ (void *) av,info,exception);
-    distance=1;
+    distance=1.0;
     for (i=2; i < items; i+=2)
     {
       attribute=(char *) SvPV(ST(i-1),na);
@@ -6324,7 +6323,6 @@ Histogram(ref,...)
           PackageName);
         goto PerlException;
       }
-    info=GetPackageInfo(aTHX_ (void *) av,info,exception);
     count=0;
     for ( ; image; image=image->next)
     {
@@ -11843,7 +11841,6 @@ Mosaic(ref)
     rv=newRV(sv);
     av_push(av,sv_bless(rv,hv));
     SvREFCNT_dec(sv);
-    info=GetPackageInfo(aTHX_ (void *) av,info,exception);
     (void) CopyMagickString(info->image_info->filename,image->filename,
       MaxTextExtent);
     SetImageInfo(info->image_info,0,exception);
@@ -14216,7 +14213,6 @@ Statistics(ref,...)
           PackageName);
         goto PerlException;
       }
-    info=GetPackageInfo(aTHX_ (void *) av,info,exception);
     count=0;
     for ( ; image; image=image->next)
     {