Commit 9ae2c47c authored by Alessandro Ghedini's avatar Alessandro Ghedini

Imported Upstream version 1.090

parent 0df6c85e
/*
* Copyright (c) 2004-2005 by the cairo perl team (see the file README)
* Copyright (c) 2004-2012 by the cairo perl team (see the file README)
*
* Licensed under the LGPL, see LICENSE file for more information.
*
......@@ -425,13 +425,16 @@ BOOT:
call_atexit ((ATEXIT_t) cairo_debug_reset_static_data, NULL);
#endif
int VERSION (class=NULL)
# The VERSION fallback is implemented in lib/Cairo.pm.
int LIB_VERSION (...)
CODE:
RETVAL = CAIRO_VERSION;
OUTPUT:
RETVAL
int VERSION_ENCODE (...)
int LIB_VERSION_ENCODE (...)
ALIAS:
VERSION_ENCODE = 1
PREINIT:
int major, minor, micro;
CODE:
......@@ -444,7 +447,7 @@ int VERSION_ENCODE (...)
minor = SvIV (ST (2));
micro = SvIV (ST (3));
} else {
croak ("Usage: Cairo::VERSION_ENCODE (major, minor, micro) or Cairo->VERSION_ENCODE (major, minor, micro)");
croak ("Usage: Cairo::LIB_VERSION_ENCODE (major, minor, micro) or Cairo->LIB_VERSION_ENCODE (major, minor, micro)");
}
RETVAL = CAIRO_VERSION_ENCODE (major, minor, micro);
......@@ -453,11 +456,15 @@ int VERSION_ENCODE (...)
# int cairo_version ();
int cairo_version (class=NULL)
ALIAS:
lib_version = 1
C_ARGS:
/* void */
# const char* cairo_version_string ();
const char* cairo_version_string (class=NULL)
ALIAS:
lib_version_string = 1
C_ARGS:
/* void */
......
=== ChangeLog discontinued ===
With the move to git, we stop maintaining a separate ChangeLog and
rely on proper commit messages instead.
rely on proper commit messages instead. Web view of changes:
<http://git.gnome.org/browse/perl-Cairo/>.
2009-03-28 Torsten Schoenfeld <kaffeetisch@gmx.de>
......
......@@ -2,7 +2,7 @@
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
......@@ -485,7 +485,9 @@ convey the exclusion of warranty; and each file should have at least the
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
Also add information on how to contact you by electronic and paper mail.
......
--- #YAML:1.0
name: Cairo
version: 1.082
version: 1.090
abstract: Perl interface to the cairo 2d vector graphics library
author: []
license: unknown
......
#
# Copyright (c) 2004-2006 by the cairo perl team (see the file README)
# Copyright (c) 2004-2012 by the cairo perl team (see the file README)
#
# Licensed under the LGPL, see LICENSE file for more information.
#
......
Overview of changes in Cairo 1.090
==================================
* Make "use Cairo x.yyy" work; fixes RT#72783. This required renaming the old
Cairo::VERSION, a wrapper for CAIRO_VERSION, to Cairo::LIB_VERSION -- but we
kept the old way of calling it working. Cairo::version,
Cairo::version_string and Cairo::VERSION_ENCODE got the same treatment for
consistency.
* Updated FSF LGPL notice address (RT#72664)
Overview of changes in Cairo 1.082
==================================
* Update the symbol export list for linking on win32
(https://bugzilla.gnome.org/show_bug.cgi?id=665265)
(https://bugzilla.gnome.org/show_bug.cgi?id=665265)
Overview of changes in Cairo 1.081
==================================
......
......@@ -56,7 +56,7 @@ Please report bugs to the gnome-perl product in GNOME's Bugzilla:
COPYRIGHT AND LICENSE
---------------------
Copyright (C) 2004-2011 by the cairo perl team
Copyright (C) 2004-2012 by the cairo perl team
Ross McFarland rwmcfa1 at neces dot com
Torsten Schoenfeld kaffeetisch at gmx dot de
......@@ -72,5 +72,5 @@ PARTICULAR PURPOSE. See the GNU Library General Public License for more
details.
You should have received a copy of the GNU Library General Public License along
with this library; if not, write to the Free Software Foundation, Inc., 59
Temple Place - Suite 330, Boston, MA 02111-1307 USA.
with this library; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Copyright (c) 2004-2011 by the cairo perl team (see the file README)
# Copyright (c) 2004-2012 by the cairo perl team (see the file README)
#
# Licensed under the LGPL, see LICENSE file for more information.
#
......@@ -14,15 +14,23 @@ use DynaLoader;
our @ISA = qw/DynaLoader/;
our $VERSION = '1.082';
our $VERSION = '1.090';
sub dl_load_flags { $^O eq 'darwin' ? 0x00 : 0x01 }
Cairo->bootstrap ($VERSION);
# --------------------------------------------------------------------------- #
package Cairo;
# Our Cairo::VERSION used to be a simple wrapper around CAIRO_VERSION. But a
# package's VERSION sub is supposed to do Perl version checking so that things
# like 'use Cairo 1.00' work. To not break backwards-compatibility, we
# dispatch according to the number of arguments passed in.
sub VERSION {
if (scalar @_ == 2) {
shift->SUPER::VERSION (@_);
} else {
Cairo::LIB_VERSION (@_);
}
}
1;
......@@ -1409,6 +1417,16 @@ For hysterical reasons, you can also use the following syntax:
=item $stride = $surface->get_stride [1.2]
=item $stride = Cairo::Format::stride_for_width ($format, $width) [1.6]
=over
=item $format: I<Cairo::Format>
=item $width: integer
=back
=back
=cut
......@@ -1715,13 +1733,18 @@ For hysterical reasons, you can also use the following syntax:
=over
=item $version = Cairo->version
=item $version_code = Cairo->lib_version
=item $version_string = Cairo->lib_version_string
These two functions return the version of libcairo that the program is
currently running against.
=item $string = Cairo->version_string
=item $version_code = Cairo->LIB_VERSION
=item $version_code = Cairo->VERSION
Returns the version of libcairo that L<Cairo> was compiled against.
=item $version_code = Cairo->VERSION_ENCODE ($major, $minor, $micro)
=item $version_code = Cairo->LIB_VERSION_ENCODE ($major, $minor, $micro)
=over
......@@ -1733,15 +1756,8 @@ For hysterical reasons, you can also use the following syntax:
=back
=item $stride = Cairo::Format::stride_for_width ($format, $width) [1.6]
=over
=item $format: I<Cairo::Format>
=item $width: integer
=back
Encodes the version C<$major.$minor.$micro> as an integer suitable for
comparison against C<< Cairo->lib_version >> and C<< Cairo->LIB_VERSION >>.
=back
......
#!/usr/bin/perl
#
# Copyright (c) 2004-2005 by the cairo perl team (see the file README)
# Copyright (c) 2004-2012 by the cairo perl team (see the file README)
#
# Licensed under the LGPL, see LICENSE file for more information.
#
......@@ -10,7 +10,7 @@
use strict;
use warnings;
use Test::More tests => 75;
use Test::More tests => 70;
unless (eval 'use Test::Number::Delta; 1;') {
my $reason = 'Test::Number::Delta not available';
......@@ -20,15 +20,7 @@ unless (eval 'use Test::Number::Delta; 1;') {
use constant IMG_WIDTH => 256;
use constant IMG_HEIGHT => 256;
BEGIN {
use_ok ('Cairo');
}
ok(defined Cairo::version);
ok(defined Cairo::version_string);
ok(defined Cairo->version);
ok(defined Cairo->version_string);
use Cairo;
my $surf = Cairo::ImageSurface->create ('rgb24', IMG_WIDTH, IMG_HEIGHT);
isa_ok ($surf, 'Cairo::Surface');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment