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 412ce5a0a5c1782fc330b99e9f6817b8cb25c870..1aa892557f92cad6227c8c7a7f1465a01cc3fb0e 100755 (executable)
--- a/extra/ui/render/test/test.factor
+++ b/extra/ui/render/test/test.factor
@@ -1,10 +1,10 @@
 ! 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 colors.constants images ;
+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
@@ -40,7 +40,7 @@ SYMBOL: render-output
     screenshot
     [ render-output set-global ]
     [
-        "resource:extra/ui/render/test/reference.bmp" <image>
+        "resource:extra/ui/render/test/reference.bmp" load-image
         bitmap= "is perfect" "needs work" ?
         "Your UI rendering " prepend
         message-window