Fixed // in filters.c. And things that didn't work in perl 5.004_04

in the testcases.

diff --git a/README b/README
index b1734f234c6b756de6e3f7b35e7e9b0286442e34..4e35693828b7c875295282f23c80945d7c6976b6 100644 (file)
--- a/README
+++ b/README
@@ -91,6 +91,12 @@ t/t105gif.t checks for an bug in libgif and prints out a patch
 if that bug is present, note that this bug only affects the more
 "advanced" features of libgif.
 
+If for some reason you have libungif-devel package installed but
+not libungif on RedHat then you will probably get lots of errors
+like undefined symbol: FreeSavedImages when running make test.
+Install libungif package to fix it.
+
+
 Imager needs to have a fairly recent libtiff installed (we know it
 it runs fine with 3.5.5).  In the future we might consider supporting older
 libtiff versions.  For now you can either configure Imager manually (by

diff --git a/filters.c b/filters.c
index c395ed9bfae0a98c9d8230108d4a13ab6a0627b4..9ef9547ad7caceaf15e8bab6cc1243305e360dd2 100644 (file)
--- a/filters.c
+++ b/filters.c
@@ -932,9 +932,6 @@ i_nearest_color(i_img *im, int num, int *xo, int *yo, i_color *oval, int dmeasur
     c2 = 1.0/(float)(cmatch[midx]);
     c1 = 1.0-c2;
     
-    //    printf("pixel [%d %d %d] c1+c2 = %f\n", val.channel[0], val.channel[1], val.channel[2], c1+c2);
-    //    printf("cmatch = %d, c1 = %f, c2 = %f tval=[%f %f %f]\n", cmatch[midx], c1, c2, tval[midx*im->channels], tval[midx*im->channels+1], tval[midx*im->channels+2] );
-
     for(ch = 0; ch<im->channels; ch++) 
       tval[midx*im->channels + ch] = c1*tval[midx*im->channels + ch] + c2 * (float) val.channel[ch];
   

diff --git a/t/t105gif.t b/t/t105gif.t
index c4603ea33ad92dff9e61c5798dd013f5c4416275..f3fe342dd9733f53f70e520b791f1e89cb21ab33 100644 (file)
--- a/t/t105gif.t
+++ b/t/t105gif.t
@@ -105,7 +105,9 @@ if (!i_has_format("gif")) {
       print test_readgif_cb(1024) ? "ok 10\n" : "not ok 10\n";
     }
     else {
-      print "ok $_ # skip giflib3 doesn't support callbacks\n" for (7..10);
+      for (7..10) {
+       print "ok $_ # skip giflib3 doesn't support callbacks\n";
+      }
     }
     open FH, ">testout/t105_mc.gif" or die "Cannot open testout/t105_mc.gif";
     binmode FH;

diff --git a/t/t50basicoo.t b/t/t50basicoo.t
index fc43b9e0a4ce868ff5b1028b54253657db23ad1b..c9ab551f244806c3ae589fdd4f7394543651f81f 100644 (file)
--- a/t/t50basicoo.t
+++ b/t/t50basicoo.t
@@ -14,7 +14,7 @@ $loaded = 1;
 
 print "ok 1\n";
 
-Imager::init(log=>"testout/t50basicoo.log");
+Imager::init("log"=>"testout/t50basicoo.log");
 
 %hsh=%Imager::formats;