rubthrough change

diff --git a/Changes b/Changes
index 5623b9cda865d4201d4b3781cf8b58e2bdc2fcc2..672190e66abe82349af02e9fac7a6bbef7219d06 100644 (file)
--- a/Changes
+++ b/Changes
@@ -8,6 +8,14 @@ Bug fixes:
  - avoid using CHECK as a label in Imager::Test
    http://nntp.x.perl.org/group/perl.cpan.testers/5220921
 
+ - re-work most image file test files that require a library into
+   separate library present/not present files to remove stupidly long
+   conditionals
+
+ - don't treat rubthrough() outside the bounds of the target image as
+   an error.
+   http://nntp.x.perl.org/group/perl.cpan.testers/5185716
+
 Imager 0.67_01 - 02 Sep 2009
 ==============
 

diff --git a/rubthru.im b/rubthru.im
index d5ff2267f41fe1b14e6ec2aaf27f96f76a9dc6e4..f71eff1baffdcd12d5e2ca48a9b8cec9f2d9be9f 100644 (file)
--- a/rubthru.im
+++ b/rubthru.im
@@ -196,8 +196,9 @@ i_rubthru(i_img *im, i_img *src, int tx, int ty, int src_minx, int src_miny,
   if (tx >= im->xsize || ty >= im->ysize
       || src_minx >= src_maxx || src_miny >= src_maxy) {
     i_clear_error();
-    i_push_error(0, "rubthrough: nothing to do");
-    return 0;
+    /* just do nothing, attempting to rubthrough outside the target isn't
+       worth being an error */
+    return 1;
   }
 
   if (im->channels == 1 || im->channels == 3)