r63289 - in /trunk/libimage-size-perl: ./ debian/ lib/Image/ t/ xt/
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Mon Oct 4 00:43:07 UTC 2010
Author: jawnsy-guest
Date: Mon Oct 4 00:42:47 2010
New Revision: 63289
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=63289
Log:
* New upstream release
+ Drop author tests, they've been moved to xt/
+ Adds support for Windows WMF files
Added:
trunk/libimage-size-perl/t/Test_emf_small.emf
- copied unchanged from r63287, branches/upstream/libimage-size-perl/current/t/Test_emf_small.emf
trunk/libimage-size-perl/xt/
- copied from r63287, branches/upstream/libimage-size-perl/current/xt/
Removed:
trunk/libimage-size-perl/t/00_load.t
trunk/libimage-size-perl/t/01_pod.t
trunk/libimage-size-perl/t/02_pod_coverage.t
trunk/libimage-size-perl/t/03_meta.t
trunk/libimage-size-perl/t/04_minimumversion.t
trunk/libimage-size-perl/t/05_critic.t
Modified:
trunk/libimage-size-perl/ChangeLog
trunk/libimage-size-perl/ChangeLog.xml
trunk/libimage-size-perl/MANIFEST
trunk/libimage-size-perl/META.yml
trunk/libimage-size-perl/README
trunk/libimage-size-perl/README.textile
trunk/libimage-size-perl/debian/changelog
trunk/libimage-size-perl/debian/control
trunk/libimage-size-perl/imgsize
trunk/libimage-size-perl/lib/Image/Size.pm
trunk/libimage-size-perl/t/all.t
Modified: trunk/libimage-size-perl/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimage-size-perl/ChangeLog?rev=63289&op=diff
==============================================================================
--- trunk/libimage-size-perl/ChangeLog (original)
+++ trunk/libimage-size-perl/ChangeLog Mon Oct 4 00:42:47 2010
@@ -4,6 +4,32 @@
fetching of image size information from files
in a wide variety of common (and not-so-common)
formats.
+
+3.230 Sunday August 29, 2010, 04:00:00 PM -0700
+
+ * imgsize
+ * lib/Image/Size.pm
+ perlcritic clean-ups from new rules.
+
+ * lib/Image/Size.pm
+ * t/Test_emf_small.emf (added)
+ * t/all.t
+ RT #59995: Added support for Windows Enhanced Metafile Format
+ (EMF).
+
+ * t/00_load.t (deleted)
+ * t/01_pod.t (deleted)
+ * t/02_pod_coverage.t (deleted)
+ * t/03_meta.t (deleted)
+ * t/04_minimumversion.t (deleted)
+ * t/05_critic.t (deleted)
+ * xt/00_load.t (added)
+ * xt/01_pod.t (added)
+ * xt/02_pod_coverage.t (added)
+ * xt/03_meta.t (added)
+ * xt/04_minimumversion.t (added)
+ * xt/05_critic.t (added)
+ Move the author/distro-sanity tests to an "xt" directory.
3.221 Sunday April 25, 2010, 02:10:00 PM -0700
@@ -516,9 +542,9 @@
* t/all.t (added)
Initial commit of the core project files.
-# Generated on Sunday April 25, 2010, 02:12:03 PM -0700
+# Generated on Sunday August 29, 2010, 03:54:48 PM -0700
# Using changelog2x/0.11, App::Changelog2x/0.11, XML::LibXML/1.70,
-# XML::LibXSLT/1.70, libxml/2.6.32, libxslt/1.1.24 (with exslt)
+# XML::LibXSLT/1.70, libxml/2.7.6, libxslt/1.1.26 (with exslt)
# XSLT sources:
# $Id: changelog2text.xslt 8 2009-01-19 06:46:50Z rjray $
# $Id: common-text.xslt 8 2009-01-19 06:46:50Z rjray $
Modified: trunk/libimage-size-perl/ChangeLog.xml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimage-size-perl/ChangeLog.xml?rev=63289&op=diff
==============================================================================
--- trunk/libimage-size-perl/ChangeLog.xml (original)
+++ trunk/libimage-size-perl/ChangeLog.xml Mon Oct 4 00:42:47 2010
@@ -13,6 +13,47 @@
information from files in a wide variety of common (and not-so-common)
formats.
</description>
+ <release version="3.230" sc:tag="3.230" date="2010-08-29T16:00:00-07:00">
+ <change git:commit="269c8932ccabf981d7723ee86c5e1ac49f361ece">
+ <fileset>
+ <file path="imgsize" />
+ <file path="lib/Image/Size.pm" />
+ </fileset>
+ <description>
+ perlcritic clean-ups from new rules.
+ </description>
+ </change>
+ <change git:commit="f2ec9f0313a692b5f87b778e38b3bd9641beb922">
+ <fileset>
+ <file path="lib/Image/Size.pm" />
+ <file path="t/Test_emf_small.emf" action="ADD" />
+ <file path="t/all.t" />
+ </fileset>
+ <description>
+ <xhtml:a href="http://rt.cpan.org/Ticket/Display.html?id=59995">RT #59995</xhtml:a>:
+ Added support for Windows Enhanced Metafile Format (EMF).
+ </description>
+ </change>
+ <change git:commit="3ed01fd7bff2cd551f399d9a37d1f96c5330be1f">
+ <fileset>
+ <file path="t/00_load.t" action="DELETE" />
+ <file path="t/01_pod.t" action="DELETE" />
+ <file path="t/02_pod_coverage.t" action="DELETE" />
+ <file path="t/03_meta.t" action="DELETE" />
+ <file path="t/04_minimumversion.t" action="DELETE" />
+ <file path="t/05_critic.t" action="DELETE" />
+ <file path="xt/00_load.t" action="ADD" />
+ <file path="xt/01_pod.t" action="ADD" />
+ <file path="xt/02_pod_coverage.t" action="ADD" />
+ <file path="xt/03_meta.t" action="ADD" />
+ <file path="xt/04_minimumversion.t" action="ADD" />
+ <file path="xt/05_critic.t" action="ADD" />
+ </fileset>
+ <description>
+ Move the author/distro-sanity tests to an "xt" directory.
+ </description>
+ </change>
+ </release>
<release version="3.221" sc:tag="3.221" date="2010-04-25T14:10:00-07:00">
<change git:commit="45914d2c9da36b21d4262627231d41f0203a81cc">
<fileset>
@@ -73,7 +114,7 @@
<file path="t/all.t" />
</fileset>
<description>
- Make the package buildable in a pure-Perl software stack. Per
+ Make the package buildable in a pure-Perl software stack. Per
<xhtml:a href="http://rt.cpan.org/Ticket/Display.html?id=42930">RT ticket #42930</xhtml:a>,
make Compress::Zlib optional, so that those who do not need
it are not required to install it. Updated the test around the
Modified: trunk/libimage-size-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimage-size-perl/MANIFEST?rev=63289&op=diff
==============================================================================
--- trunk/libimage-size-perl/MANIFEST (original)
+++ trunk/libimage-size-perl/MANIFEST Mon Oct 4 00:42:47 2010
@@ -8,12 +8,6 @@
MANIFEST.SKIP
README
README.textile
-t/00_load.t
-t/01_pod.t
-t/02_pod_coverage.t
-t/03_meta.t
-t/04_minimumversion.t
-t/05_critic.t
t/468x60.psd
t/8.swf
t/all.t
@@ -26,8 +20,15 @@
t/pass-1_s.png
t/spacer50.xbm
t/test.gif
+t/Test_emf_small.emf
t/xterm.bmp
t/xterm.xpm
t/yasp.swf
+xt/00_load.t
+xt/01_pod.t
+xt/02_pod_coverage.t
+xt/03_meta.t
+xt/04_minimumversion.t
+xt/05_critic.t
Makefile.PL
META.yml
Modified: trunk/libimage-size-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimage-size-perl/META.yml?rev=63289&op=diff
==============================================================================
--- trunk/libimage-size-perl/META.yml (original)
+++ trunk/libimage-size-perl/META.yml Mon Oct 4 00:42:47 2010
@@ -16,7 +16,7 @@
provides:
Image::Size:
file: lib/Image/Size.pm
- version: 3.221
+ version: 3.230
recommends:
Compress::Zlib: 2
requires:
@@ -27,4 +27,4 @@
homepage: http://search.cpan.org/dist/Image-Size
license: http://dev.perl.org/licenses/
repository: http://github.com/rjray/image-size
-version: 3.221
+version: 3.230
Modified: trunk/libimage-size-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimage-size-perl/README?rev=63289&op=diff
==============================================================================
--- trunk/libimage-size-perl/README (original)
+++ trunk/libimage-size-perl/README Mon Oct 4 00:42:47 2010
@@ -1,7 +1,7 @@
Image::Size - Determine the size of images in several common formats
====================================================================
-Version: 3.221 (See CHANGES below)
+Version: 3.230 (See CHANGES below)
WHAT IS IT
@@ -82,5 +82,38 @@
* lib/Image/Size.pm
-Large-scale code and documentation clean-up based on perlcritic and visual
-review.
+perlcritic clean-ups from new rules.
+
+ * lib/Image/Size.pm
+
+ * t/Test_emf_small.emf (added)
+
+ * t/all.t
+
+RT #59995: Added support for Windows Enhanced Metafile Format (EMF).
+
+ * t/00_load.t (deleted)
+
+ * t/01_pod.t (deleted)
+
+ * t/02_pod_coverage.t (deleted)
+
+ * t/03_meta.t (deleted)
+
+ * t/04_minimumversion.t (deleted)
+
+ * t/05_critic.t (deleted)
+
+ * xt/00_load.t (added)
+
+ * xt/01_pod.t (added)
+
+ * xt/02_pod_coverage.t (added)
+
+ * xt/03_meta.t (added)
+
+ * xt/04_minimumversion.t (added)
+
+ * xt/05_critic.t (added)
+
+Move the author/distro-sanity tests to an "xt" directory.
Modified: trunk/libimage-size-perl/README.textile
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimage-size-perl/README.textile?rev=63289&op=diff
==============================================================================
--- trunk/libimage-size-perl/README.textile (original)
+++ trunk/libimage-size-perl/README.textile Mon Oct 4 00:42:47 2010
@@ -1,6 +1,6 @@
h1. Image::Size - Determine the size of images in several common formats
-Version: 3.221 (See CHANGES below)
+Version: 3.230 (See CHANGES below)
h2. WHAT IS IT
@@ -72,4 +72,25 @@
* imgsize
* lib/Image/Size.pm
-p{margin-bottom:2em}. Large-scale code and documentation clean-up based on perlcritic and visual review.
+p{margin-bottom:2em}. perlcritic clean-ups from new rules.
+
+* lib/Image/Size.pm
+* t/Test_emf_small.emf (added)
+* t/all.t
+
+p{margin-bottom:2em}. RT #59995: Added support for Windows Enhanced Metafile Format (EMF).
+
+* t/00_load.t (deleted)
+* t/01_pod.t (deleted)
+* t/02_pod_coverage.t (deleted)
+* t/03_meta.t (deleted)
+* t/04_minimumversion.t (deleted)
+* t/05_critic.t (deleted)
+* xt/00_load.t (added)
+* xt/01_pod.t (added)
+* xt/02_pod_coverage.t (added)
+* xt/03_meta.t (added)
+* xt/04_minimumversion.t (added)
+* xt/05_critic.t (added)
+
+p{margin-bottom:2em}. Move the author/distro-sanity tests to an "xt" directory.
Modified: trunk/libimage-size-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimage-size-perl/debian/changelog?rev=63289&op=diff
==============================================================================
--- trunk/libimage-size-perl/debian/changelog (original)
+++ trunk/libimage-size-perl/debian/changelog Mon Oct 4 00:42:47 2010
@@ -1,3 +1,11 @@
+libimage-size-perl (3.230-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ + Drop author tests, they've been moved to xt/
+ + Adds support for Windows WMF files
+
+ -- Jonathan Yu <jawnsy at cpan.org> Sun, 03 Oct 2010 20:48:08 -0400
+
libimage-size-perl (3.221-1) unstable; urgency=low
[ Jonathan Yu ]
Modified: trunk/libimage-size-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimage-size-perl/debian/control?rev=63289&op=diff
==============================================================================
--- trunk/libimage-size-perl/debian/control (original)
+++ trunk/libimage-size-perl/debian/control Mon Oct 4 00:42:47 2010
@@ -3,13 +3,11 @@
Priority: optional
Build-Depends: debhelper (>= 7.0.50)
Build-Depends-Indep: perl,
- perl (>= 5.10) | libio-compress-perl | libcompress-zlib-perl (>> 2),
- libtest-pod-perl, libtest-pod-coverage-perl, libtest-cpan-meta-perl,
- libtest-minimumversion-perl
+ perl (>= 5.10) | libio-compress-perl | libcompress-zlib-perl (>> 2)
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: gregor herrmann <gregoa at debian.org>,
Ryan Niebur <ryan at debian.org>, Jonathan Yu <jawnsy at cpan.org>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libimage-size-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libimage-size-perl/
Homepage: http://search.cpan.org/dist/Image-Size/
@@ -22,7 +20,8 @@
Description: module for determining image sizes in several common formats
Image::Size is a Perl module capable of determining image sizes from several
common formats. It handles XPM, XBM, GIF, JPEG, PNG, MNG, the PPM family of
- formats (PPM/PGM/PBM), TIFF, FlashMX (Shockwave Flash version 6), and more.
+ formats (PPM/PGM/PBM), TIFF, FlashMX (Shockwave Flash version 6), WMF, and
+ more.
.
It supports additional file types through Image::Magick (see perlmagick), and
the included "imgsize" script provides access to Image::Size from the shell.
Modified: trunk/libimage-size-perl/imgsize
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimage-size-perl/imgsize?rev=63289&op=diff
==============================================================================
--- trunk/libimage-size-perl/imgsize (original)
+++ trunk/libimage-size-perl/imgsize Mon Oct 4 00:42:47 2010
@@ -102,7 +102,7 @@
=head1 DESCRIPTION
No-brainer to size an image supplied on the command-line. All the real
-work is done in L<Image::Size>.
+work is done in L<Image::Size|Image::Size>.
=head1 REQUIRED ARGUMENTS
@@ -130,7 +130,7 @@
=item C<-a>
Return a Perl-style list of attributes suitable for passing to the C<img()>
-method of the CGI module (see L<CGI>).
+method of the CGI module (see L<CGI|CGI>).
=item C<-f> B<fmt>
@@ -187,7 +187,7 @@
=head1 SEE ALSO
-L<Image::Size>
+L<Image::Size|Image::Size>
=head1 AUTHOR
Modified: trunk/libimage-size-perl/lib/Image/Size.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimage-size-perl/lib/Image/Size.pm?rev=63289&op=diff
==============================================================================
--- trunk/libimage-size-perl/lib/Image/Size.pm (original)
+++ trunk/libimage-size-perl/lib/Image/Size.pm Mon Oct 4 00:42:47 2010
@@ -44,7 +44,7 @@
%CACHE $NO_CACHE $PCD_SCALE $GIF_BEHAVIOR);
%EXPORT_TAGS = ('all' => [ @EXPORT_OK ]);
- $VERSION = '3.221';
+ $VERSION = '3.230';
$VERSION = eval $VERSION; ## no critic(ProhibitStringyEval)
# Default behavior for GIFs is to return the "screen" size
@@ -63,7 +63,7 @@
qr{^\x89PNG\x0d\x0a\x1a\x0a} => \&pngsize,
qr{^P[1-7]} => \&ppmsize, # also XVpics
qr{#define\s+\S+\s+\d+} => \&xbmsize,
- qr{/\* XPM \*/} => \&xpmsize,
+ qr{/[*] XPM [*]/} => \&xpmsize,
qr{^MM\x00\x2a} => \&tiffsize,
qr{^II\x2a\x00} => \&tiffsize,
qr{^BM} => \&bmpsize,
@@ -72,6 +72,7 @@
qr{^FWS} => \&swfsize,
qr{^CWS} => \&swfmxsize,
qr{^\x8aMNG\x0d\x0a\x1a\x0a} => \&mngsize,
+ qr{^\x01\x00\x00\x00} => \&emfsize,
);
# Kodak photo-CDs are weird. Don't ask me why, you really don't want details.
%PCD_MAP = ( 'base/16' => [ 192, 128 ],
@@ -349,11 +350,17 @@
return eof $stream;
}
+# "no critic" because this private routine is only used by auto-loaded code,
+# which Perl::Critic can't detect
+## no critic (ProhibitUnusedPrivateSubroutines)
# Simple converter-routine used by SWF and CWS code
sub _bin2int
{
my $val = shift;
- return unpack 'N', pack 'B32', substr(('0' x 32) . $val, -32); ## no critic (ProhibitParensWithBuiltins)
+ # "no critic" because I want it clear which args are being used by
+ # substr() versus unpack().
+ ## no critic (ProhibitParensWithBuiltins)
+ return unpack 'N', pack 'B32', substr(('0' x 32) . $val, -32);
}
1;
@@ -499,6 +506,8 @@
=item CWS (FlashMX, compressed SWF, Flash 6)
=item PCD (Kodak PhotoCD, see notes below)
+
+=item EMF (Windows Enhanced Metafile Format)
=back
@@ -550,7 +559,7 @@
To make it possible for users to do this themselves, the C<%CACHE> hash-table
that B<Image::Size> uses internally for storage may be imported in the B<use>
statement. The user may then make use of packages such as B<IPC::MMA>
-(L<IPC::MMA>) that can C<tie> a hash to a shared-memory segment:
+(L<IPC::MMA|IPC::MMA>) that can C<tie> a hash to a shared-memory segment:
use Image::Size qw(imgsize %CACHE);
use IPC::MMA;
@@ -687,14 +696,14 @@
tie %Image::Size::CACHE, 'IPC::Shareable', 'size', { create => 1 };
-That example uses B<IPC::Shareable> (see L<IPC::Shareable>) and uses the option
-to the C<tie> command that tells B<IPC::Shareable> to create the segment. Once
-the initial server process starts to create children, they will all share the
-tied handle to the memory segment.
+That example uses B<IPC::Shareable> (see L<IPC::Shareable|IPC::Shareable>) and
+uses the option to the C<tie> command that tells B<IPC::Shareable> to create
+the segment. Once the initial server process starts to create children, they
+will all share the tied handle to the memory segment.
Another package that provides this capability is B<IPC::MMA> (see
-L<IPC::MMA>), which provides shared memory management via the I<mm> library
-from Ralf Engelschall (details available in the documentation for
+L<IPC::MMA|IPC::MMA>), which provides shared memory management via the I<mm>
+library from Ralf Engelschall (details available in the documentation for
B<IPC::MMA>):
use IPC::MMA;
@@ -758,8 +767,9 @@
=head1 SEE ALSO
-L<Image::Magick> and L<Image::Info> Perl modules at CPAN. The
-B<Graphics::Magick> Perl API at L<http://www.graphicsmagick.org/perl.html>.
+L<Image::Magick|Image::Magick> and L<Image::Info|Image::Info> Perl modules at
+CPAN. The B<Graphics::Magick> Perl API at
+L<http://www.graphicsmagick.org/perl.html>.
=head1 CONTRIBUTORS
@@ -1355,3 +1365,21 @@
return ($x, $y, 'CWS');
}
+
+# Windows EMF files, requested by Jan v/d Zee
+sub emfsize
+{
+ my $image = shift;
+
+ my ($x, $y);
+ my $buffer = $READ_IN->($image, 24);
+
+ my ($x1, $y1, $x2, $y2) = unpack 'x8VVVV', $buffer;
+
+ # The four values describe a box *around* the image, not *of* the image.
+ # In other words, the dimensions are not inclusive.
+ $x = $x2 - $x1 - 1;
+ $y = $y2 - $y1 - 1;
+
+ return ($x, $y, 'EMF');
+}
Modified: trunk/libimage-size-perl/t/all.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimage-size-perl/t/all.t?rev=63289&op=diff
==============================================================================
--- trunk/libimage-size-perl/t/all.t (original)
+++ trunk/libimage-size-perl/t/all.t Mon Oct 4 00:42:47 2010
@@ -2,7 +2,7 @@
use IO::File;
use Image::Size qw(:all);
-use Test::More tests => 17;
+use Test::More tests => 18;
# We now only test the CWS branch if the user already has Compress::Zlib
# available. We no longer require it for installation.
@@ -57,6 +57,10 @@
($x, $y, $id) = imgsize("${dir}yasp.swf");
ok(($x == 85 && $y == 36 && $id eq 'SWF'), 'Basic SWF format test');
+# Test EMF code
+($x, $y, $id) = imgsize("${dir}Test_emf_small.emf");
+ok(($x == 638 && $y == 949 && $id eq 'EMF'), 'Basic EMF format test');
+
SKIP: {
skip 'Compress::Zlib not installed', 1 unless $do_cws_test;
More information about the Pkg-perl-cvs-commits
mailing list