Fix conflict

[factor.git] / extra / ui / render / test / test.factor

diff --git a/extra/ui/render/test/test.factor b/extra/ui/render/test/test.factor
index bd3c0826529cafaf6612aa8e172f7f236bb1d743..1aa892557f92cad6227c8c7a7f1465a01cc3fb0e 100755 (executable)
--- a/extra/ui/render/test/test.factor
+++ b/extra/ui/render/test/test.factor
@@ -1,10 +1,10 @@
-! Copyright (C) 2008 Slava Pestov.
+! Copyright (C) 2008, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors colors arrays kernel sequences math byte-arrays
-namespaces grouping fry cap images.bitmap
-ui.gadgets ui.gadgets.packs ui.gadgets.borders ui.gadgets.grids
-ui.gadgets.grid-lines ui.gadgets.labels ui.gadgets.buttons
-ui.render ui opengl opengl.gl images images.loader ;
+namespaces grouping fry cap images.bitmap ui.gadgets ui.gadgets.packs
+ui.gadgets.borders ui.gadgets.grids ui.gadgets.grid-lines
+ui.gadgets.labels ui.gadgets.buttons ui.pens ui.pens.solid ui.render
+ui opengl opengl.gl colors.constants images images.loader ;
 IN: ui.render.test
 
 SINGLETON: line-test
@@ -30,8 +30,10 @@ SYMBOL: render-output
 
 : bitmap= ( bitmap1 bitmap2 -- ? )
     [
-        [ [ buffer>> ] [ stride 4 align ] bi group ] [ stride ] bi
-        '[ _ head twiddle ] map
+        dup [ [ height>> ] [ stride ] bi * ] [ array>> length ] bi = [
+            [ [ array>> ] [ stride 4 align ] bi group ] [ stride ] bi
+            '[ _ head twiddle ] map
+        ] unless
     ] bi@ = ;
 
 : check-rendering ( gadget -- )
@@ -57,27 +59,27 @@ M: take-screenshot draw-boundary
     <shelf>
         take-screenshot new >>boundary
         <gadget>
-            black <solid> >>interior
+            COLOR: black <solid> >>interior
             { 98 98 } >>dim
-        1 <border> add-gadget
+        { 1 1 } <border> add-gadget
         <gadget>
-            gray <solid> >>boundary
+            COLOR: gray <solid> >>boundary
             { 94 94 } >>dim
-        3 <border>
-            red <solid> >>boundary
+        { 3 3 } <border>
+            COLOR: red <solid> >>boundary
         add-gadget
             <line-gadget> <line-gadget> <line-gadget> 3array
             <line-gadget> <line-gadget> <line-gadget> 3array
             <line-gadget> <line-gadget> <line-gadget> 3array
         3array <grid>
             { 5 5 } >>gap
-            blue <grid-lines> >>boundary
+            COLOR: blue <grid-lines> >>boundary
         add-gadget
         <gadget>
             { 14 14 } >>dim
-            black <checkmark-paint> >>interior
-            black <solid> >>boundary
-        4 <border>
+            COLOR: black <checkmark-paint> >>interior
+            COLOR: black <solid> >>boundary
+        { 4 4 } <border>
         add-gadget ;
     
 : ui-render-test ( -- )