reference/image/functions/imagecopymerge.xml
593ea510e853ff034e03f78a4be0daa41661c9d4
593ea510e853ff034e03f78a4be0daa41661c9d4
...
...
@@ -9,22 +9,22 @@
9
9
&reftitle.description;
10
10
<methodsynopsis>
11
11
<type>bool</type><methodname>imagecopymerge</methodname>
12
-
<methodparam><type>resource</type><parameter>dst_im</parameter></methodparam>
13
-
<methodparam><type>resource</type><parameter>src_im</parameter></methodparam>
12
+
<methodparam><type>GdImage</type><parameter>dst_image</parameter></methodparam>
13
+
<methodparam><type>GdImage</type><parameter>src_image</parameter></methodparam>
14
14
<methodparam><type>int</type><parameter>dst_x</parameter></methodparam>
15
15
<methodparam><type>int</type><parameter>dst_y</parameter></methodparam>
16
16
<methodparam><type>int</type><parameter>src_x</parameter></methodparam>
17
17
<methodparam><type>int</type><parameter>src_y</parameter></methodparam>
18
-
<methodparam><type>int</type><parameter>src_w</parameter></methodparam>
19
-
<methodparam><type>int</type><parameter>src_h</parameter></methodparam>
18
+
<methodparam><type>int</type><parameter>src_width</parameter></methodparam>
19
+
<methodparam><type>int</type><parameter>src_height</parameter></methodparam>
20
20
<methodparam><type>int</type><parameter>pct</parameter></methodparam>
21
21
</methodsynopsis>
22
22
<para>
23
-
Copy a part of <parameter>src_im</parameter> onto
24
-
<parameter>dst_im</parameter> starting at the x,y coordinates
23
+
Copy a part of <parameter>src_image</parameter> onto
24
+
<parameter>dst_image</parameter> starting at the x,y coordinates
25
25
<parameter>src_x</parameter>, <parameter>src_y </parameter> with
26
-
a width of <parameter>src_w</parameter> and a height of
27
-
<parameter>src_h</parameter>. The portion defined will be copied
26
+
a width of <parameter>src_width</parameter> and a height of
27
+
<parameter>src_height</parameter>. The portion defined will be copied
28
28
onto the x,y coordinates, <parameter>dst_x</parameter> and
29
29
<parameter>dst_y</parameter>.
30
30
</para>
...
...
@@ -34,13 +34,13 @@
34
34
<para>
35
35
<variablelist>
36
36
<varlistentry>
37
-
<term><parameter>dst_im</parameter></term>
37
+
<term><parameter>dst_image</parameter></term>
38
38
<listitem>
39
39
<para>&gd.image.destination;</para>
40
40
</listitem>
41
41
</varlistentry>
42
42
<varlistentry>
43
-
<term><parameter>src_im</parameter></term>
43
+
<term><parameter>src_image</parameter></term>
44
44
<listitem>
45
45
<para>&gd.image.source;</para>
46
46
</listitem>
...
...
@@ -78,13 +78,13 @@
78
78
</listitem>
79
79
</varlistentry>
80
80
<varlistentry>
81
-
<term><parameter>src_w</parameter></term>
81
+
<term><parameter>src_width</parameter></term>
82
82
<listitem>
83
83
<para>&gd.source.width;</para>
84
84
</listitem>
85
85
</varlistentry>
86
86
<varlistentry>
87
-
<term><parameter>src_h</parameter></term>
87
+
<term><parameter>src_height</parameter></term>
88
88
<listitem>
89
89
<para>&gd.source.height;</para>
90
90
</listitem>
...
...
@@ -111,6 +111,31 @@
111
111
&return.success;
112
112
</para>
113
113
</refsect1>
114
+
115
+
<refsect1 role="changelog">
116
+
&reftitle.changelog;
117
+
<informaltable>
118
+
<tgroup cols="2">
119
+
<thead>
120
+
<row>
121
+
<entry>&Version;</entry>
122
+
<entry>&Description;</entry>
123
+
</row>
124
+
</thead>
125
+
<tbody>
126
+
<row>
127
+
<entry>8.0.0</entry>
128
+
<entry>
129
+
<parameter>dst_image</parameter> and <parameter>src_image</parameter> expect
130
+
<classname>GdImage</classname> instances now; previously, <type>resource</type>s
131
+
were expected.
132
+
</entry>
133
+
</row>
134
+
</tbody>
135
+
</tgroup>
136
+
</informaltable>
137
+
</refsect1>
138
+
114
139
<refsect1 role="examples">
115
140
&reftitle.examples;
116
141
<para>
...
...
@@ -139,7 +164,6 @@ imagedestroy($src);
139
164
</para>
140
165
</refsect1>
141
166
</refentry>
142
-
143
167
<!-- Keep this comment at the end of the file
144
168
Local variables:
145
169
mode: sgml
146
170