From 540c10f3fb529ad7650065a8b11735027d60b28c Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@mandriva.com>
Date: Thu, 23 Feb 2006 16:44:19 -0800
Subject: [PATCH] test/text-antialias-subpixel: Modify to demonstrate problem
 with subpixel BGR and VRGB

---
 test/text-antialias-subpixel-ref.png | Bin 1081 -> 3833 bytes
 test/text-antialias-subpixel.c       |  38 ++++++++++++++++-----------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/test/text-antialias-subpixel-ref.png b/test/text-antialias-subpixel-ref.png
index 88c6e062b5b94cb624d1503bd0f9017d3c1cd8f6..68986ae247ea5f935cfbe7f253dc0a11b80a8e93 100644
GIT binary patch
delta 3822
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

delta 1049
zcmV+!1m^qs9k~dQ7YY;z1^@s6b!q1Mks%y^2p1G19Ks$WSpWb7+et)0R7i=%m48gs
zbr{EA_lpBP2!=Qqp&>v1fd<^loTU&}6A}|*nYo(PmaP~rHikr0i&o8Su8>Isw?t!W
zrmi0wq=Hb^;E$|`NIK*=^b|sFj30N$ad%ID9C6Uyx3GVFw(s`&JkR_2yg$$LeD?l-
zVl;%viP0HRvfRi}skKfk#+PGC9BOW(X#pHJyQp}rk-jkx8w>YQ`OL<k;7gw!rm^KB
z!(%hVtjprX>Pqfg9R`4S?VPGR!0FDPu&W}-%Gu2uFK-PvLp+nzRo9@~TIM4^kY7V}
zeGS{y!&E-Ch2M3(H0??XNbKvG;-OuCFR?aS$1g3l<fa!gKGI648a^mU<B%hd`qwLo
z)lJjgX$r{qIL(wid_M#0-=lSN92gBDQgrs}!W^!(@069X&neE_Gdm$egIC04GD&u%
zUh1w-%gpF;(dbr*+38lCc|-3x*_IqF&wtpl;MW4=-5s@XyQs8nIBn%Y+ul%rl26r{
zLDJI_SrMYa?C>z?bmOp}AvC&xyYw2x`M$LwpNKszd{vsg;L`#OIXz2SqtV9)B+uM9
zLP^sYR$Cvdw7z$`B`ORN(1a!6cKoPF46wiTDD{sP^J;cC?-Zv3pay6zKZ(qPPE{Nu
zE~hde+3T4E)aX<y0IcnA(mvsT1Rx@ziez^;rKkHB@GjepCHZ%xJkAe2pK^Zhy}WX~
z$6xtlsjVbs93>VDChvOMy0!<9hsT#ux}kxDWFy9S6}IqPo`_lDt3VgSh4Y8WFTRJA
zx6@gzonqLriL1XJS#pM9O+FpJeL-I41MIc8!F7wsv`1uid{{1<EaLfp$730>h)gbe
zM<av%VzP`W$cbAl1DE9w^N4trHD|#v8bnTvDg$yOMQW|fIO%`bZB;lmfa4}qyZ{A-
z@NSbbxV#LkF8|)#4DWxv2;ha!KY}NVpm;Ylb^Zst(IAqtR-~y#<l;9Xo1#UYZVuk|
zP_@XVDSzy{Jt7(V{rlQ~9U{p^BImvrx$vb(X1K_qKIOJ!G>8<P^*gS$i>!>jb#nWd
zh*mE$KIf13e<Bi}txP_zaQ;q2rGe9StJ4GfpWyYt=1dUreI6IgX_a&470&PQI6<Qi
z4h~VntoZjX8xZSTYxEEj4!yn0zwo@mu}I+{E+;tnkw|Fl@~!88rlG3CAB$K6sV>-e
z((e;5^j=XWpI10Y%J3Co@<LlzaPYy8A*%p>&Vrdqc=kbP{<{htw0{dbc0yteB!t88
z0AwG8V}XBX08}C(;A^4T1}Vw&?NBiHGz?fFF%|Tx;Fysim~g?J>%j0YGye;Dn2px3
T*-Rh+0000<MNUKnu0mjfwNeH@

diff --git a/test/text-antialias-subpixel.c b/test/text-antialias-subpixel.c
index ead958d11..924065794 100644
--- a/test/text-antialias-subpixel.c
+++ b/test/text-antialias-subpixel.c
@@ -26,7 +26,7 @@
 #include "cairo-test.h"
 
 #define WIDTH  31
-#define HEIGHT 20
+#define HEIGHT 90
 #define TEXT_SIZE 12
 
 cairo_test_t test = {
@@ -41,6 +41,7 @@ draw (cairo_t *cr, int width, int height)
     cairo_text_extents_t extents;
     cairo_font_options_t *font_options;
     static char black[] = "black", blue[] = "blue";
+    cairo_subpixel_order_t order;
 
     cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
     cairo_paint (cr);
@@ -54,24 +55,29 @@ draw (cairo_t *cr, int width, int height)
      * (bad color fringing). The reason we turn off hints here is to
      * try to get repeatable glyph shapes on multiple systems, not for
      * any aesthetic reason. */
-    font_options = cairo_font_options_create ();
 
-    cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_NONE);
-    cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_SUBPIXEL);
-    cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_RGB);
-    cairo_set_font_options (cr, font_options);
-    cairo_font_options_destroy (font_options);
+    for (order = CAIRO_SUBPIXEL_ORDER_RGB ; order < CAIRO_SUBPIXEL_ORDER_VBGR+1 ; order++) {
 
-    cairo_set_source_rgb (cr, 0, 0, 0); /* black */
-    cairo_text_extents (cr, black, &extents);
-    cairo_move_to (cr, -extents.x_bearing, -extents.y_bearing);
-    cairo_show_text (cr, black);
-    cairo_translate (cr, 0, -extents.y_bearing + 1);
+    	font_options = cairo_font_options_create ();
 
-    cairo_set_source_rgb (cr, 0, 0, 1); /* blue */
-    cairo_text_extents (cr, blue, &extents);
-    cairo_move_to (cr, -extents.x_bearing, -extents.y_bearing);
-    cairo_show_text (cr, blue);
+    	cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_NONE);
+    	cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_SUBPIXEL);
+    	cairo_font_options_set_subpixel_order (font_options, order);
+    	cairo_set_font_options (cr, font_options);
+    	cairo_font_options_destroy (font_options);
+
+    	cairo_set_source_rgb (cr, 0, 0, 0); /* black */
+    	cairo_text_extents (cr, black, &extents);
+    	cairo_move_to (cr, -extents.x_bearing, -extents.y_bearing);
+    	cairo_show_text (cr, black);
+    	cairo_translate (cr, 0, -extents.y_bearing + 2);
+
+    	cairo_set_source_rgb (cr, 0, 0, 1); /* blue */
+    	cairo_text_extents (cr, blue, &extents);
+    	cairo_move_to (cr, -extents.x_bearing, -extents.y_bearing);
+    	cairo_show_text (cr, blue);
+    	cairo_translate (cr, 0, -extents.y_bearing + 2);
+    }
 
     return CAIRO_TEST_SUCCESS;
 }