1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
|
From 21dd8a0600cbfac46723c7745b377fce94c8bdc3 Mon Sep 17 00:00:00 2001
From: Torsten Schönfeld <kaffeetisch@gmx.de>
Date: Sat, 31 Mar 2012 10:34:11 +0000
Subject: Fix compiling and testing against older versions of cairo
---
(limited to 't/CairoPath.t')
diff --git a/t/CairoPath.t b/t/CairoPath.t
index e515172..770e464 100644
--- a/t/CairoPath.t
+++ b/t/CairoPath.t
@@ -11,11 +11,17 @@ use strict;
use warnings;
use Cairo;
-use Test::More tests => 6;
+use Test::More;
use constant IMG_WIDTH => 256;
use constant IMG_HEIGHT => 256;
+if (Cairo::VERSION >= Cairo::VERSION_ENCODE (1, 4, 0)) {
+ plan tests => 6;
+} else {
+ plan skip_all => 'path behavior not predictable on cairo < 1.4';
+}
+
my $surf = Cairo::ImageSurface->create ('rgb24', IMG_WIDTH, IMG_HEIGHT);
my $cr = Cairo::Context->create ($surf);
--
cgit v0.9.0.2
From a1cd2e45b4ee49a724ae5d7e854ad9829eebf00d Mon Sep 17 00:00:00 2001
From: Torsten Schönfeld <kaffeetisch@gmx.de>
Date: Sat, 07 Apr 2012 18:01:31 +0000
Subject: Make t/CairoPath.t more robust
The end of a path that took a round trip into cairo and back might differ
for different versions of cairo. Hence, compare only the beginning with
the expected path.
---
diff --git a/t/CairoPath.t b/t/CairoPath.t
index 770e464..27a3aad 100644
--- a/t/CairoPath.t
+++ b/t/CairoPath.t
@@ -11,17 +11,11 @@ use strict;
use warnings;
use Cairo;
-use Test::More;
+use Test::More tests => 18;
use constant IMG_WIDTH => 256;
use constant IMG_HEIGHT => 256;
-if (Cairo::VERSION >= Cairo::VERSION_ENCODE (1, 4, 0)) {
- plan tests => 6;
-} else {
- plan skip_all => 'path behavior not predictable on cairo < 1.4';
-}
-
my $surf = Cairo::ImageSurface->create ('rgb24', IMG_WIDTH, IMG_HEIGHT);
my $cr = Cairo::Context->create ($surf);
@@ -40,14 +34,7 @@ my $expected_path = [
];
my $path = $cr->copy_path;
-is_deeply ($path, $expected_path);
-
-sub paths_agree {
- my ($cr, $path, $expected_path) = @_;
- $cr->new_path;
- $cr->append_path ($path);
- is_deeply ($cr->copy_path, $expected_path);
-}
+paths_agree ($path, $expected_path);
# Modifying single point values.
foreach ($path, $expected_path) {
@@ -57,21 +44,21 @@ foreach ($path, $expected_path) {
$_->[2]{points}[2][0] = 99;
$_->[2]{points}[2][1] = 1010;
}
-paths_agree ($cr, $path, $expected_path);
+path_round_trip_ok ($cr, $path, $expected_path);
# Modifying single points.
foreach ($path, $expected_path) {
$_->[1]{points}[0] = [333, 444];
$_->[2]{points}[2] = [77, 88];
}
-paths_agree ($cr, $path, $expected_path);
+path_round_trip_ok ($cr, $path, $expected_path);
# Replacing all points.
foreach ($path, $expected_path) {
$_->[1]{points} = [[3333, 4444]];
$_->[2]{points} = [[55, 66], [77, 88], [99, 1010]];
}
-paths_agree ($cr, $path, $expected_path);
+path_round_trip_ok ($cr, $path, $expected_path);
# Replacing and adding path segments.
my @cloned_path = @{$path};
@@ -86,9 +73,24 @@ foreach (\@cloned_path, $expected_path) {
type => 'line-to',
points => [[23, 42]] };
}
-paths_agree ($cr, \@cloned_path, $expected_path);
+path_round_trip_ok ($cr, \@cloned_path, $expected_path);
# Passing bare arrays into Cairo.
$cr->new_path;
$cr->append_path ($expected_path);
-is_deeply ($cr->copy_path, $expected_path);
+paths_agree ($cr->copy_path, $expected_path);
+
+sub path_round_trip_ok {
+ my ($cr, $path, $expected_path) = @_;
+ $cr->new_path;
+ $cr->append_path ($path);
+ paths_agree ($cr->copy_path, $expected_path);
+}
+
+sub paths_agree {
+ my ($path, $expected_path) = @_;
+ # Only the first three entries seem to be reliable across cairo versions.
+ for (0..2) {
+ is_deeply ($path->[$_], $expected_path->[$_]);
+ }
+}
--
cgit v0.9.0.2
|
