mkoppanen Sun Sep 2 02:45:46 2007 UTC
Modified files:
/phpdoc/en/reference/imagick/imagick compositeimage.xml
Log:
Fixed method parameters.
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/imagick/imagick/compositeimage.xml?r1=1.5&r2=1.6&diff_format=u
Index: phpdoc/en/reference/imagick/imagick/compositeimage.xml
diff -u phpdoc/en/reference/imagick/imagick/compositeimage.xml:1.5
phpdoc/en/reference/imagick/imagick/compositeimage.xml:1.6
--- phpdoc/en/reference/imagick/imagick/compositeimage.xml:1.5 Tue Aug 28
02:02:51 2007
+++ phpdoc/en/reference/imagick/imagick/compositeimage.xml Sun Sep 2
02:45:46 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<refentry xmlns="http://docbook.org/ns/docbook";
xml:id="function.imagick-compositeimage">
<refnamediv>
<refname>Imagick::compositeImage</refname>
@@ -10,8 +10,8 @@
&reftitle.description;
<methodsynopsis>
<type>bool</type><methodname>Imagick::compositeImage</methodname>
-
<methodparam><type>Imagick</type><parameter>composite_wand</parameter></methodparam>
- <methodparam><type>int</type><parameter>compose</parameter></methodparam>
+
<methodparam><type>Imagick</type><parameter>composite_object</parameter></methodparam>
+ <methodparam><type>int</type><parameter>composite</parameter></methodparam>
<methodparam><type>int</type><parameter>x</parameter></methodparam>
<methodparam><type>int</type><parameter>y</parameter></methodparam>
<methodparam
choice="opt"><type>int</type><parameter>channel</parameter></methodparam>
@@ -28,9 +28,10 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>composite_wand</parameter></term>
+ <term><parameter>composite_object</parameter></term>
<listitem>
<para>
+ Imagick object which holds the composite image
</para>
</listitem>
</varlistentry>
@@ -38,6 +39,7 @@
<term><parameter>compose</parameter></term>
<listitem>
<para>
+ Composite operator. See <link
linkend="imagick.constants.compositeop">Composite Operator Constants</link>
</para>
</listitem>
</varlistentry>
@@ -45,6 +47,7 @@
<term><parameter>x</parameter></term>
<listitem>
<para>
+ The column offset of the composited image
</para>
</listitem>
</varlistentry>
@@ -52,6 +55,7 @@
<term><parameter>y</parameter></term>
<listitem>
<para>
+ The row offset of the composited image
</para>
</listitem>
</varlistentry>
@@ -59,6 +63,10 @@
<term><parameter>channel</parameter></term>
<listitem>
<para>
+ Provide any channel constant that is valid for your channel mode. To
+ apply to more than one channel, combine channeltype constants using
+ bitwise operators. Defaults to Imagick::CHANNEL_ALL. Refer to this
+ list of <link linkend="imagick.constants.channel">channel
constants</link>.
</para>
</listitem>
</varlistentry>
