From 9b98625ba8bc3f246f2709b652692089342d3d8e Mon Sep 17 00:00:00 2001
From: Jakub Vrana <vrana@php.net>
Date: Mon, 26 Jul 2004 21:21:27 +0000
Subject: [PATCH] Copying transparency (bug #18527)
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@164374 c90b9560-bf6c-de11-be94-00142212c4b1
---
reference/image/functions/imagecolortransparent.xml | 10 ++++++++--
reference/image/functions/imagecopymerge.xml | 5 +++--
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/reference/image/functions/imagecolortransparent.xml b/reference/image/functions/imagecolortransparent.xml
index c4807e49cf..f1c93ea65c 100644
--- a/reference/image/functions/imagecolortransparent.xml
+++ b/reference/image/functions/imagecolortransparent.xml
@@ -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>
@@ -33,6 +33,12 @@
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>
diff --git a/reference/image/functions/imagecopymerge.xml b/reference/image/functions/imagecopymerge.xml
index 4218160d4f..c9bc650fc8 100644
--- a/reference/image/functions/imagecopymerge.xml
+++ b/reference/image/functions/imagecopymerge.xml
@@ -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>