r5593 - in /packages/libimager-perl/trunk: Changes Imager.pm META.yml debian/changelog render.im t/t38ft2font.t t/t65crop.t
kjetil-guest at users.alioth.debian.org
kjetil-guest at users.alioth.debian.org
Thu Jun 14 11:24:29 UTC 2007
Author: kjetil-guest
Date: Thu Jun 14 11:24:29 2007
New Revision: 5593
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=5593
Log:
New upstream release of libimager-perl
Modified:
packages/libimager-perl/trunk/Changes
packages/libimager-perl/trunk/Imager.pm
packages/libimager-perl/trunk/META.yml
packages/libimager-perl/trunk/debian/changelog
packages/libimager-perl/trunk/render.im
packages/libimager-perl/trunk/t/t38ft2font.t
packages/libimager-perl/trunk/t/t65crop.t
Modified: packages/libimager-perl/trunk/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libimager-perl/trunk/Changes?rev=5593&op=diff
==============================================================================
--- packages/libimager-perl/trunk/Changes (original)
+++ packages/libimager-perl/trunk/Changes Thu Jun 14 11:24:29 2007
@@ -1,4 +1,17 @@
Imager release history. Older releases can be found in Changes.old
+
+Imager 0.59 - 14 June 2007
+===========
+
+Bug fixes:
+
+ - fixes a regression introduced by the fixes for RT 11972
+ http://rt.cpan.org/Ticket/Display.html?id=27546
+
+ - cropping outside the image would return an Imager object with
+ no low-level image object, instead of returning false.
+ Fixed by: Philip Gwyn (Leolo)
+ http://rt.cpan.org/Ticket/Display.html?id=27509
Imager 0.58 - 16 May 2007
===========
Modified: packages/libimager-perl/trunk/Imager.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libimager-perl/trunk/Imager.pm?rev=5593&op=diff
==============================================================================
--- packages/libimager-perl/trunk/Imager.pm (original)
+++ packages/libimager-perl/trunk/Imager.pm Thu Jun 14 11:24:29 2007
@@ -155,7 +155,7 @@
BEGIN {
require Exporter;
@ISA = qw(Exporter);
- $VERSION = '0.58';
+ $VERSION = '0.59';
eval {
require XSLoader;
XSLoader::load(Imager => $VERSION);
@@ -754,7 +754,10 @@
$self->_set_error("resulting image would have no content");
return;
}
-
+ if( $r < $l or $b < $t ) {
+ $self->_set_error("attempting to crop outside of the image");
+ return;
+ }
my $dst = $self->_sametype(xsize=>$r-$l, ysize=>$b-$t);
i_copyto($dst->{IMG},$self->{IMG},$l,$t,$r,$b,0,0);
Modified: packages/libimager-perl/trunk/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libimager-perl/trunk/META.yml?rev=5593&op=diff
==============================================================================
--- packages/libimager-perl/trunk/META.yml (original)
+++ packages/libimager-perl/trunk/META.yml Thu Jun 14 11:24:29 2007
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: Imager
-version: 0.58
+version: 0.59
version_from: Imager.pm
author: Tony Cook <tony at imager.perl.org>, Arnar M. Hrafnkelsson
abstract: Perl extension for Generating 24 bit Images
@@ -15,4 +15,4 @@
meta-spec:
version: 1.3
url: http://module-build.sourceforge.net/META-spec-v1.3.html
-generated_by: Imager version 0.58
+generated_by: Imager version 0.59
Modified: packages/libimager-perl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libimager-perl/trunk/debian/changelog?rev=5593&op=diff
==============================================================================
--- packages/libimager-perl/trunk/debian/changelog (original)
+++ packages/libimager-perl/trunk/debian/changelog Thu Jun 14 11:24:29 2007
@@ -1,3 +1,9 @@
+libimager-perl (0.59-1) UNRELEASED; urgency=low
+
+ * (NOT RELEASED YET) New upstream release
+
+ -- Kjetil Kjernsmo <kjetilk at opera.com> Thu, 14 Jun 2007 13:23:49 +0200
+
libimager-perl (0.58-0.1) unstable; urgency=high
* NMU fixing security issue. High urgency
Modified: packages/libimager-perl/trunk/render.im
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libimager-perl/trunk/render.im?rev=5593&op=diff
==============================================================================
--- packages/libimager-perl/trunk/render.im (original)
+++ packages/libimager-perl/trunk/render.im Thu Jun 14 11:24:29 2007
@@ -185,7 +185,7 @@
if (src_alpha == IM_SAMPLE_MAX)
*linep = STORE_COLOR;
else if (src_alpha) {
- IM_WORK_T remains = - src_alpha;
+ IM_WORK_T remains = IM_SAMPLE_MAX - src_alpha;
IM_WORK_T orig_alpha = linep->channel[alpha_channel];
IM_WORK_T dest_alpha = src_alpha + (remains * orig_alpha) / IM_SAMPLE_MAX;
for (ch = 0; ch < alpha_channel; ++ch) {
Modified: packages/libimager-perl/trunk/t/t38ft2font.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libimager-perl/trunk/t/t38ft2font.t?rev=5593&op=diff
==============================================================================
--- packages/libimager-perl/trunk/t/t38ft2font.t (original)
+++ packages/libimager-perl/trunk/t/t38ft2font.t Thu Jun 14 11:24:29 2007
@@ -1,6 +1,6 @@
#!perl -w
use strict;
-use Test::More tests => 182;
+use Test::More tests => 183;
++$|;
# Before `make install' is performed this script should be runnable with
# `make test'. After `make install' it should work as `perl test.pl'
@@ -20,13 +20,13 @@
SKIP:
{
- i_has_format("ft2") or skip("no freetype2 library found", 181);
+ i_has_format("ft2") or skip("no freetype2 library found", 182);
print "# has ft2\n";
my $fontname=$ENV{'TTFONTTEST'}||'./fontfiles/dodge.ttf';
- -f $fontname or skip("cannot find fontfile $fontname", 181);
+ -f $fontname or skip("cannot find fontfile $fontname", 182);
my $bgcolor=i_color_new(255,0,0,0);
@@ -466,6 +466,15 @@
is_color3($colors[0], 0, 0, 0, "check we got black");
is_color3($colors[1], 255, 0, 0, "and red");
}
+
+ { # RT 27546
+ my $im = Imager->new(xsize => 100, ysize => 100, channels => 4);
+ $im->box(filled => 1, color => '#ff0000FF');
+ my $font = Imager::Font->new(file=>'fontfiles/ImUgly.ttf', type=>'ft2');
+ ok($im->string(x => 0, 'y' => 40, text => 'test',
+ size => 11, sizew => 11, font => $font, aa => 1),
+ 'draw on translucent image')
+ }
}
sub align_test {
Modified: packages/libimager-perl/trunk/t/t65crop.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libimager-perl/trunk/t/t65crop.t?rev=5593&op=diff
==============================================================================
--- packages/libimager-perl/trunk/t/t65crop.t (original)
+++ packages/libimager-perl/trunk/t/t65crop.t Thu Jun 14 11:24:29 2007
@@ -1,6 +1,6 @@
#!perl -w
use strict;
-use Test::More tests => 60;
+use Test::More tests => 64;
require "t/testtools.pl";
use Imager;
@@ -170,3 +170,13 @@
cmp_ok($warning, '=~', 'void', "correct warning");
cmp_ok($warning, '=~', 't65crop\\.t', "correct file");
}
+
+{
+ my $src = test_oo_img();
+ ok(!$src->crop( top=>1000, bottom=>1500, left=>0, right=>100 ),
+ "outside of image" );
+ cmp_ok($src->errstr, '=~', qr/outside of the image/, "and message");
+ ok(!$src->crop( top=>100, bottom=>1500, left=>1000, right=>1500 ),
+ "outside of image" );
+ cmp_ok($src->errstr, '=~', qr/outside of the image/, "and message");
+}
More information about the Pkg-perl-cvs-commits
mailing list