From c4ca69d3fa84dca98dce71c7a71b61413d6be165 Mon Sep 17 00:00:00 2001
From: scuri <scuri>
Date: Tue, 27 Oct 2009 19:45:36 +0000
Subject: Fixed: compositing in IMAGERGB when canvas has a semi-transparent
 alpha channel and a color with semi transparent alpha are used.

---
 html/en/func/attributes.html | 4 ++--
 html/en/func/color.html      | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'html/en/func')

diff --git a/html/en/func/attributes.html b/html/en/func/attributes.html
index 60768e4..984af01 100644
--- a/html/en/func/attributes.html
+++ b/html/en/func/attributes.html
@@ -17,7 +17,7 @@ canvas:SetForeground(color: lightuserdata) [in Lua]</pre>
       color is used in all primitives (lines, areas, marks and text). Default value: <b>
         <tt>CD_BLACK</tt></b>. Value <tt><b>CD_QUERY</b> </tt>simply returns the 
       current value.</p>
-    <p>Notice that CD_QUERY conflicts with color RGBA=(255,255,255,255) (full 
+    <p>Notice that CD_QUERY conflicts with color RGBA=(255,255,255,0) (full 
     transparent white). Use <strong>SetForeground</strong> to avoid the 
     conflict. See also <a href="color.html">Color Coding</a>.</p>
     <pre class="function"><span class="mainFunction">long int <a name="cdBackground">cdCanvasBackground</a>(cdCanvas* canvas, long int color); [in C]</span>
@@ -31,7 +31,7 @@ canvas:SetBackground(color: lightuserdata) [in Lua]</pre>
       background color only makes sense for <strong>Clear</strong><tt><font> </font></tt>and for 
       primitives affected by the background opacity attribute. Default value: <b><tt>CD_WHITE</tt></b>. 
       Value <tt><b>CD_QUERY</b> </tt>simply returns the current value.</p>
-    <p>Notice that CD_QUERY conflicts with color RGBA=(255,255,255,255) (full 
+    <p>Notice that CD_QUERY conflicts with color RGBA=(255,255,255,0) (full 
     transparent white). Use <strong>SetBackground</strong> to avoid the 
     conflict. See also <a href="color.html">Color Coding</a>.</p>
     <pre class="function"><span class="mainFunction">int <a name="cdWriteMode">cdCanvasWriteMode</a>(cdCanvas* canvas, int mode); [in C]</span>
diff --git a/html/en/func/color.html b/html/en/func/color.html
index 9ec9928..8efd8a4 100644
--- a/html/en/func/color.html
+++ b/html/en/func/color.html
@@ -52,12 +52,13 @@ cd.DecodeColor(color: lightuserdata) -&gt; (r, g, b: number) [in Lua]</pre>
 
 cd.EncodeAlpha(color: lightuserdata, alpha: number) -&gt; (color: lightuserdata) [in Lua]</pre>
     <p>Returns the given color coded with the alpha information. ATENTION: At the 
-      moment only the Win32 with GDI+ and the IMAGERGB drivers support alpha 
-      components in color coding. Se in <a href="../drv/gdiplus.html">Windows Using 
-        GDI+ Base Driver</a> and <a href="../drv/irgb.html">IMAGERGB driver</a>. The 
+      moment only the <a href="../drv/gdiplus.html">Win32 with GDI+</a>, the
+	<a href="../drv/xrender.html">XRender</a> and the <a href="../drv/irgb.html">IMAGERGB</a> 
+	drivers support alpha components in color coding. The 
       internal representation of the component is inverted, because the default value 
       must be 0 and opaque for backward compatibility, so you should use the <strong>cdDecodeAlpha</strong>
-      function ot the <strong>cdAlpha</strong> macro to retrieve the alpha component.</p>
+      function or the <strong>cdAlpha</strong> macro to retrieve the alpha component. 
+	0 is transparent, 255 is opaque.</p>
     <pre class="function"><span class="mainFunction">unsigned char <a name="cdDecodeAlpha">cdDecodeAlpha</a>(long int color) [in C]</span>
 
 cd.DecodeAlpha(color: lightuserdata) -&gt; (a: number) [in Lua]</pre>
-- 
cgit v1.2.3