vrana Mon Jul 26 17:21:27 2004 EDT
Modified files:
/phpdoc/en/reference/image/functions imagecolortransparent.xml
imagecopymerge.xml
Log:
Copying transparency (bug #18527)
http://cvs.php.net/diff.php/phpdoc/en/reference/image/functions/imagecolortransparent.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc/en/reference/image/functions/imagecolortransparent.xml
diff -u phpdoc/en/reference/image/functions/imagecolortransparent.xml:1.3
phpdoc/en/reference/image/functions/imagecolortransparent.xml:1.4
--- phpdoc/en/reference/image/functions/imagecolortransparent.xml:1.3 Thu Apr 18
13:13:09 2002
+++ phpdoc/en/reference/image/functions/imagecolortransparent.xml Mon Jul 26
17:21:27 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<!-- splitted from ./en/functions/image.xml, last change in rev 1.36 -->
<refentry id="function.imagecolortransparent">
<refnamediv>
@@ -24,7 +24,7 @@
<note>
<para>
The transparent color is a property of the image, transparency is not a
- property of the color. Once you have a set a color to be the transparent
+ property of the color. Once you have set a color to be the transparent
color, any regions of the image in that color that were drawn previously
will be transparent.
</para>
@@ -32,6 +32,12 @@
<para>
The identifier of the new (or current, if none is specified)
transparent color is returned.
+ </para>
+ <note>
+ <para>
+ Transparency is copied only with <function>imagecopymerged</function> and
+ true color images, not with <function>imagecopy</function> or pallete images.
+ </note>
</para>
</refsect1>
</refentry>
http://cvs.php.net/diff.php/phpdoc/en/reference/image/functions/imagecopymerge.xml?r1=1.2&r2=1.3&ty=u
Index: phpdoc/en/reference/image/functions/imagecopymerge.xml
diff -u phpdoc/en/reference/image/functions/imagecopymerge.xml:1.2
phpdoc/en/reference/image/functions/imagecopymerge.xml:1.3
--- phpdoc/en/reference/image/functions/imagecopymerge.xml:1.2 Wed Apr 17 02:39:10
2002
+++ phpdoc/en/reference/image/functions/imagecopymerge.xml Mon Jul 26 17:21:27
2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- splitted from ./en/functions/image.xml, last change in rev 1.36 -->
<refentry id="function.imagecopymerge">
<refnamediv>
@@ -31,7 +31,8 @@
The two images will be merged according to <parameter>pct</parameter>
which can range from 0 to 100. When <parameter>pct</parameter> = 0,
no action is taken, when 100 this function behaves identically
- to <function>imagecopy</function>.
+ to <function>imagecopy</function> for pallete images, while it
+ implements alpha transparency for true colour images.
</para>
<note><para>This function was added in PHP 4.0.6</para></note>
</refsect1>
