Skip to content

Commit 32321d8

Browse files
Fan2ShrekFan2Shrek
authored
Partial imagick sync (#2173)
1 parent ea84739 commit 32321d8

17 files changed

+107
-124
lines changed

‎reference/imagick/imagickdraw/arc.xml

+13-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
3-
<!-- EN-Revision: 0f49e97eebd971ba0468bc1b7c6265fd457f60c8 Maintainer: yannick Status: ready -->
2+
<!-- EN-Revision: e4ec40195f0fb0f7a25e827571922dedb1c6f6ac Maintainer: yannick Status: ready -->
43
<!-- Reviewed: yes -->
54

65
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.arc">
@@ -13,12 +12,12 @@
1312
&reftitle.description;
1413
<methodsynopsis>
1514
<modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::arc</methodname>
16-
<methodparam><type>float</type><parameter>sx</parameter></methodparam>
17-
<methodparam><type>float</type><parameter>sy</parameter></methodparam>
18-
<methodparam><type>float</type><parameter>ex</parameter></methodparam>
19-
<methodparam><type>float</type><parameter>ey</parameter></methodparam>
20-
<methodparam><type>float</type><parameter>sd</parameter></methodparam>
21-
<methodparam><type>float</type><parameter>ed</parameter></methodparam>
15+
<methodparam><type>float</type><parameter>start_x</parameter></methodparam>
16+
<methodparam><type>float</type><parameter>start_y</parameter></methodparam>
17+
<methodparam><type>float</type><parameter>end_x</parameter></methodparam>
18+
<methodparam><type>float</type><parameter>end_y</parameter></methodparam>
19+
<methodparam><type>float</type><parameter>start_angle</parameter></methodparam>
20+
<methodparam><type>float</type><parameter>end_angle</parameter></methodparam>
2221
</methodsynopsis>
2322
&warn.undocumented.func;
2423
<para>
@@ -31,47 +30,47 @@
3130
<para>
3231
<variablelist>
3332
<varlistentry>
34-
<term><parameter>sx</parameter></term>
33+
<term><parameter>start_x</parameter></term>
3534
<listitem>
3635
<para>
3736
Abscisse du point de début d'arc dans le rectangle d'encadrement
3837
</para>
3938
</listitem>
4039
</varlistentry>
4140
<varlistentry>
42-
<term><parameter>sy</parameter></term>
41+
<term><parameter>start_y</parameter></term>
4342
<listitem>
4443
<para>
4544
Ordonnée du point de début d'arc dans le rectangle d'encadrement
4645
</para>
4746
</listitem>
4847
</varlistentry>
4948
<varlistentry>
50-
<term><parameter>ex</parameter></term>
49+
<term><parameter>end_x</parameter></term>
5150
<listitem>
5251
<para>
5352
Abscisse du point de fin d'arc dans le rectangle d'encadrement
5453
</para>
5554
</listitem>
5655
</varlistentry>
5756
<varlistentry>
58-
<term><parameter>ey</parameter></term>
57+
<term><parameter>end_y</parameter></term>
5958
<listitem>
6059
<para>
6160
Ordonnée du point de fin d'arc dans le rectangle d'encadrement
6261
</para>
6362
</listitem>
6463
</varlistentry>
6564
<varlistentry>
66-
<term><parameter>sd</parameter></term>
65+
<term><parameter>start_angle</parameter></term>
6766
<listitem>
6867
<para>
6968
Degré de rotation initial
7069
</para>
7170
</listitem>
7271
</varlistentry>
7372
<varlistentry>
74-
<term><parameter>ed</parameter></term>
73+
<term><parameter>end_angle</parameter></term>
7574
<listitem>
7675
<para>
7776
Degré de rotation final

‎reference/imagick/imagickdraw/circle.xml

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
3-
<!-- EN-Revision: 0f49e97eebd971ba0468bc1b7c6265fd457f60c8 Maintainer: yannick Status: ready -->
2+
<!-- EN-Revision: e4ec40195f0fb0f7a25e827571922dedb1c6f6ac Maintainer: yannick Status: ready -->
43
<!-- Reviewed: yes -->
54

65
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.circle">
@@ -13,10 +12,10 @@
1312
&reftitle.description;
1413
<methodsynopsis>
1514
<modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::circle</methodname>
16-
<methodparam><type>float</type><parameter>ox</parameter></methodparam>
17-
<methodparam><type>float</type><parameter>oy</parameter></methodparam>
18-
<methodparam><type>float</type><parameter>px</parameter></methodparam>
19-
<methodparam><type>float</type><parameter>py</parameter></methodparam>
15+
<methodparam><type>float</type><parameter>origin_x</parameter></methodparam>
16+
<methodparam><type>float</type><parameter>origin_y</parameter></methodparam>
17+
<methodparam><type>float</type><parameter>perimeter_x</parameter></methodparam>
18+
<methodparam><type>float</type><parameter>perimeter_y</parameter></methodparam>
2019
</methodsynopsis>
2120
&warn.undocumented.func;
2221
<para>
@@ -29,31 +28,31 @@
2928
<para>
3029
<variablelist>
3130
<varlistentry>
32-
<term><parameter>ox</parameter></term>
31+
<term><parameter>origin_x</parameter></term>
3332
<listitem>
3433
<para>
3534
abscisse de l'origine
3635
</para>
3736
</listitem>
3837
</varlistentry>
3938
<varlistentry>
40-
<term><parameter>oy</parameter></term>
39+
<term><parameter>origin_y</parameter></term>
4140
<listitem>
4241
<para>
4342
ordonnée de l'origine
4443
</para>
4544
</listitem>
4645
</varlistentry>
4746
<varlistentry>
48-
<term><parameter>px</parameter></term>
47+
<term><parameter>perimeter_x</parameter></term>
4948
<listitem>
5049
<para>
5150
abscisse du périmètre
5251
</para>
5352
</listitem>
5453
</varlistentry>
5554
<varlistentry>
56-
<term><parameter>py</parameter></term>
55+
<term><parameter>perimeter_y</parameter></term>
5756
<listitem>
5857
<para>
5958
ordonnée du périmètre

‎reference/imagick/imagickdraw/color.xml

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
3-
<!-- EN-Revision: 0f49e97eebd971ba0468bc1b7c6265fd457f60c8 Maintainer: yannick Status: ready -->
2+
<!-- EN-Revision: e4ec40195f0fb0f7a25e827571922dedb1c6f6ac Maintainer: yannick Status: ready -->
43
<!-- Reviewed: yes -->
54

65
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.color">
@@ -15,7 +14,7 @@
1514
<modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::color</methodname>
1615
<methodparam><type>float</type><parameter>x</parameter></methodparam>
1716
<methodparam><type>float</type><parameter>y</parameter></methodparam>
18-
<methodparam><type>int</type><parameter>paintMethod</parameter></methodparam>
17+
<methodparam><type>int</type><parameter>paint</parameter></methodparam>
1918
</methodsynopsis>
2019
&warn.undocumented.func;
2120
<para>
@@ -46,7 +45,7 @@
4645
</listitem>
4746
</varlistentry>
4847
<varlistentry>
49-
<term><parameter>paintMethod</parameter></term>
48+
<term><parameter>paint</parameter></term>
5049
<listitem>
5150
<para>
5251
Une des constantes <link linkend="imagick.constants.paint">PAINT</link>

‎reference/imagick/imagickdraw/composite.xml

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
3-
<!-- EN-Revision: 0f49e97eebd971ba0468bc1b7c6265fd457f60c8 Maintainer: yannick Status: ready -->
2+
<!-- EN-Revision: e4ec40195f0fb0f7a25e827571922dedb1c6f6ac Maintainer: yannick Status: ready -->
43
<!-- Reviewed: yes -->
54

65
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.composite">
@@ -13,12 +12,12 @@
1312
&reftitle.description;
1413
<methodsynopsis>
1514
<modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::composite</methodname>
16-
<methodparam><type>int</type><parameter>compose</parameter></methodparam>
15+
<methodparam><type>int</type><parameter>composite</parameter></methodparam>
1716
<methodparam><type>float</type><parameter>x</parameter></methodparam>
1817
<methodparam><type>float</type><parameter>y</parameter></methodparam>
1918
<methodparam><type>float</type><parameter>width</parameter></methodparam>
2019
<methodparam><type>float</type><parameter>height</parameter></methodparam>
21-
<methodparam><type>Imagick</type><parameter>compositeWand</parameter></methodparam>
20+
<methodparam><type>Imagick</type><parameter>image</parameter></methodparam>
2221
</methodsynopsis>
2322
&warn.undocumented.func;
2423
<para>
@@ -32,7 +31,7 @@
3231
<para>
3332
<variablelist>
3433
<varlistentry>
35-
<term><parameter>compose</parameter></term>
34+
<term><parameter>composite</parameter></term>
3635
<listitem>
3736
<para>
3837
l'opérateur de composition.
@@ -74,7 +73,7 @@
7473
</listitem>
7574
</varlistentry>
7675
<varlistentry>
77-
<term><parameter>compositeWand</parameter></term>
76+
<term><parameter>image</parameter></term>
7877
<listitem>
7978
<para>
8079
L'objet <classname>Imagick</classname> où la composition est prise.

‎reference/imagick/imagickdraw/construct.xml

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
3-
<!-- EN-Revision: 668b6fc28891062b1c96202009ccb70b7147740d Maintainer: yannick Status: ready -->
2+
<!-- EN-Revision: e4ec40195f0fb0f7a25e827571922dedb1c6f6ac Maintainer: yannick Status: ready -->
43
<!-- Reviewed: yes Maintainer: yannick -->
54

65
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.construct">
@@ -11,10 +10,10 @@
1110

1211
<refsect1 role="description">
1312
&reftitle.description;
14-
<methodsynopsis>
13+
<constructorsynopsis role="ImagickDraw">
1514
<modifier>public</modifier> <methodname>ImagickDraw::__construct</methodname>
1615
<void/>
17-
</methodsynopsis>
16+
</constructorsynopsis>
1817
&warn.undocumented.func;
1918
<para>
2019
Le constructeur de la classe <classname>ImagickDraw</classname>.

‎reference/imagick/imagickdraw/ellipse.xml

+13-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
3-
<!-- EN-Revision: 668b6fc28891062b1c96202009ccb70b7147740d Maintainer: yannick Status: ready -->
2+
<!-- EN-Revision: e4ec40195f0fb0f7a25e827571922dedb1c6f6ac Maintainer: yannick Status: ready -->
43
<!-- Reviewed: yes -->
54

65
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.ellipse">
@@ -13,12 +12,12 @@
1312
&reftitle.description;
1413
<methodsynopsis>
1514
<modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::ellipse</methodname>
16-
<methodparam><type>float</type><parameter>ox</parameter></methodparam>
17-
<methodparam><type>float</type><parameter>oy</parameter></methodparam>
18-
<methodparam><type>float</type><parameter>rx</parameter></methodparam>
19-
<methodparam><type>float</type><parameter>ry</parameter></methodparam>
20-
<methodparam><type>float</type><parameter>start</parameter></methodparam>
21-
<methodparam><type>float</type><parameter>end</parameter></methodparam>
15+
<methodparam><type>float</type><parameter>origin_x</parameter></methodparam>
16+
<methodparam><type>float</type><parameter>origin_y</parameter></methodparam>
17+
<methodparam><type>float</type><parameter>radius_x</parameter></methodparam>
18+
<methodparam><type>float</type><parameter>radius_y</parameter></methodparam>
19+
<methodparam><type>float</type><parameter>angle_start</parameter></methodparam>
20+
<methodparam><type>float</type><parameter>angle_end</parameter></methodparam>
2221
</methodsynopsis>
2322
&warn.undocumented.func;
2423
<para>
@@ -31,42 +30,42 @@
3130
<para>
3231
<variablelist>
3332
<varlistentry>
34-
<term><parameter>ox</parameter></term>
33+
<term><parameter>origin_x</parameter></term>
3534
<listitem>
3635
<para>
3736
</para>
3837
</listitem>
3938
</varlistentry>
4039
<varlistentry>
41-
<term><parameter>oy</parameter></term>
40+
<term><parameter>origin_y</parameter></term>
4241
<listitem>
4342
<para>
4443
</para>
4544
</listitem>
4645
</varlistentry>
4746
<varlistentry>
48-
<term><parameter>rx</parameter></term>
47+
<term><parameter>radius_x</parameter></term>
4948
<listitem>
5049
<para>
5150
</para>
5251
</listitem>
5352
</varlistentry>
5453
<varlistentry>
55-
<term><parameter>ry</parameter></term>
54+
<term><parameter>radius_y</parameter></term>
5655
<listitem>
5756
<para>
5857
</para>
5958
</listitem>
6059
</varlistentry>
6160
<varlistentry>
62-
<term><parameter>start</parameter></term>
61+
<term><parameter>angle_start</parameter></term>
6362
<listitem>
6463
<para>
6564
</para>
6665
</listitem>
6766
</varlistentry>
6867
<varlistentry>
69-
<term><parameter>end</parameter></term>
68+
<term><parameter>angle_end</parameter></term>
7069
<listitem>
7170
<para>
7271
</para>

‎reference/imagick/imagickdraw/getclippath.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
3-
<!-- EN-Revision: fa0c88f1e36a3f28b4fcee0b2d1e188b54e0c44b Maintainer: yannick Status: ready -->
2+
<!-- EN-Revision: e4ec40195f0fb0f7a25e827571922dedb1c6f6ac Maintainer: yannick Status: ready -->
43
<!-- Reviewed: yes -->
54

65
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.getclippath">
@@ -12,7 +11,7 @@
1211
<refsect1 role="description">
1312
&reftitle.description;
1413
<methodsynopsis>
15-
<modifier>public</modifier> <type>string</type><methodname>ImagickDraw::getClipPath</methodname>
14+
<modifier>public</modifier> <type class="union"><type>false</type><type>string</type></type><methodname>ImagickDraw::getClipPath</methodname>
1615
<void/>
1716
</methodsynopsis>
1817
&warn.undocumented.func;

‎reference/imagick/imagickdraw/gettextencoding.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
3-
<!-- EN-Revision: fa0c88f1e36a3f28b4fcee0b2d1e188b54e0c44b Maintainer: yannick Status: ready -->
2+
<!-- EN-Revision: e4ec40195f0fb0f7a25e827571922dedb1c6f6ac Maintainer: yannick Status: ready -->
43
<!-- Reviewed: yes -->
54

65
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.gettextencoding">
@@ -12,7 +11,7 @@
1211
<refsect1 role="description">
1312
&reftitle.description;
1413
<methodsynopsis>
15-
<modifier>public</modifier> <type>string</type><methodname>ImagickDraw::getTextEncoding</methodname>
14+
<modifier>public</modifier> <type class="union"><type>false</type><type>string</type></type><methodname>ImagickDraw::getTextEncoding</methodname>
1615
<void/>
1716
</methodsynopsis>
1817
&warn.undocumented.func;

‎reference/imagick/imagickdraw/line.xml

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
3-
<!-- EN-Revision: 668b6fc28891062b1c96202009ccb70b7147740d Maintainer: yannick Status: ready -->
2+
<!-- EN-Revision: e4ec40195f0fb0f7a25e827571922dedb1c6f6ac Maintainer: yannick Status: ready -->
43
<!-- Reviewed: yes -->
54

65
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.line">
@@ -13,10 +12,10 @@
1312
&reftitle.description;
1413
<methodsynopsis>
1514
<modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::line</methodname>
16-
<methodparam><type>float</type><parameter>sx</parameter></methodparam>
17-
<methodparam><type>float</type><parameter>sy</parameter></methodparam>
18-
<methodparam><type>float</type><parameter>ex</parameter></methodparam>
19-
<methodparam><type>float</type><parameter>ey</parameter></methodparam>
15+
<methodparam><type>float</type><parameter>start_x</parameter></methodparam>
16+
<methodparam><type>float</type><parameter>start_y</parameter></methodparam>
17+
<methodparam><type>float</type><parameter>end_x</parameter></methodparam>
18+
<methodparam><type>float</type><parameter>end_y</parameter></methodparam>
2019
</methodsynopsis>
2120
&warn.undocumented.func;
2221
<para>
@@ -30,31 +29,31 @@
3029
<para>
3130
<variablelist>
3231
<varlistentry>
33-
<term><parameter>sx</parameter></term>
32+
<term><parameter>start_x</parameter></term>
3433
<listitem>
3534
<para>
3635
L'abscisse de début
3736
</para>
3837
</listitem>
3938
</varlistentry>
4039
<varlistentry>
41-
<term><parameter>sy</parameter></term>
40+
<term><parameter>start_y</parameter></term>
4241
<listitem>
4342
<para>
4443
L'ordonnée de début
4544
</para>
4645
</listitem>
4746
</varlistentry>
4847
<varlistentry>
49-
<term><parameter>ex</parameter></term>
48+
<term><parameter>end_x</parameter></term>
5049
<listitem>
5150
<para>
5251
L'abscisse de fin
5352
</para>
5453
</listitem>
5554
</varlistentry>
5655
<varlistentry>
57-
<term><parameter>ey</parameter></term>
56+
<term><parameter>end_y</parameter></term>
5857
<listitem>
5958
<para>
6059
L'ordonnée de fin

0 commit comments

Comments
 (0)