Fix inference again

db4
Slava Pestov 2008-06-06 18:57:37 -05:00
parent 2513c2d3df
commit 460ce213af
5 changed files with 15 additions and 6 deletions

View File

@ -25,11 +25,11 @@ TUPLE: cairo-gadget < texture-gadget dim quot ;
M: cairo-gadget cache-key* [ dim>> ] [ quot>> ] bi 2array ; M: cairo-gadget cache-key* [ dim>> ] [ quot>> ] bi 2array ;
: render-cairo ( dim quot -- bytes format ) : render-cairo ( dim quot -- bytes format )
>r 2^-bounds r> copy-cairo GL_BGRA ; >r 2^-bounds r> copy-cairo GL_BGRA ; inline
M: cairo-gadget render* ! M: cairo-gadget render*
[ dim>> dup ] [ quot>> ] bi ! [ dim>> dup ] [ quot>> ] bi
render-cairo render-bytes* ; ! render-cairo render-bytes* ;
! maybe also texture>png ! maybe also texture>png
! : cairo>png ( gadget path -- ) ! : cairo>png ( gadget path -- )

View File

@ -0,0 +1,5 @@
! Copyright (C) 2008 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
IN: help.html

View File

@ -0,0 +1,4 @@
IN: opengl.gadgets.tests
USING: tools.test opengl.gadgets ;
\ render* must-infer

View File

@ -100,7 +100,7 @@ destructors accessors namespaces kernel cairo ;
>r alien>> pango-layout r> with-variable ; inline >r alien>> pango-layout r> with-variable ; inline
: with-pango-cairo ( quot -- ) : with-pango-cairo ( quot -- )
cr pango_cairo_create_layout swap with-layout ; cr pango_cairo_create_layout swap with-layout ; inline
MEMO: dummy-cairo ( -- cr ) MEMO: dummy-cairo ( -- cr )
CAIRO_FORMAT_ARGB32 0 0 cairo_image_surface_create cairo_create ; CAIRO_FORMAT_ARGB32 0 0 cairo_image_surface_create cairo_create ;

View File

@ -18,7 +18,7 @@ M: pango-cairo-backend construct-pango
: setup-layout ( gadget -- quot ) : setup-layout ( gadget -- quot )
[ font>> ] [ text>> ] bi [ font>> ] [ text>> ] bi
'[ , layout-font , layout-text ] ; '[ , layout-font , layout-text ] ; inline
M: pango-cairo-gadget render* ( gadget -- ) M: pango-cairo-gadget render* ( gadget -- )
setup-layout [ layout-size dup ] setup-layout [ layout-size dup ]