steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make-bitmap-image is more useful now

db4
Slava Pestov 2009-02-27 00:51:55 -06:00
parent 45dae72f4a
commit bfc7b3ce8f
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
basis/cairo/cairo.factor
View File

@ -1,7 +1,7 @@
! Copyright (C) 2008 Doug Coleman. ! Copyright (C) 2008 Doug Coleman.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: cairo.ffi alien.c-types kernel accessors sequences USING: cairo.ffi alien.c-types kernel accessors sequences
namespaces fry continuations destructors ; namespaces fry continuations destructors math images.memory ;
IN: cairo IN: cairo
ERROR: cairo-error message ; ERROR: cairo-error message ;
@ -18,7 +18,7 @@ ERROR: cairo-error message ;
_ [ check-cairo ] bi _ [ check-cairo ] bi
] with-destructors ; inline ] with-destructors ; inline
: check-surface ( surface -- ) cairo_surface_status check-cairo ; : check-surface ( surface -- ) cairo_surface_status (check-cairo) ;
: with-surface ( cairo_surface quot -- ) : with-surface ( cairo_surface quot -- )
'[ '[
@ -32,9 +32,15 @@ ERROR: cairo-error message ;
: width>stride ( width -- stride ) "uint" heap-size * ; inline : width>stride ( width -- stride ) "uint" heap-size * ; inline
: <image-surface> ( data dim -- surface ) : <image-surface> ( data dim -- surface )
first2 over width>stride CAIRO_FORMAT_ARGB32 [ CAIRO_FORMAT_ARGB32 ] dip first2 over width>stride
cairo_image_surface_create_for_data cairo_image_surface_create_for_data
dup check-surface ; dup check-surface ;
: <cairo> ( surface -- cairo ) cairo_create dup check-cairo ; inline
: make-bitmap-image ( dim quot -- image ) : make-bitmap-image ( dim quot -- image )
'[ <image-surface> &cairo_surface_destroy @ ] make-memory-bitmap ; inline '[
<image-surface> &cairo_surface_destroy
cairo_create &cairo_destroy
@
] make-memory-bitmap ; inline