From 474ecac48f29945879fd149cee40618c182e7b08 Mon Sep 17 00:00:00 2001 From: Keith Lazuka Date: Sat, 26 Sep 2009 13:15:58 -0400 Subject: [PATCH] images.gif: renamed loading-gif>image to gif>image to match the TIFF vocab --- extra/images/gif/gif-tests.factor | 6 +++--- extra/images/gif/gif.factor | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extra/images/gif/gif-tests.factor b/extra/images/gif/gif-tests.factor index 87ce507b2e..1eeb420a04 100644 --- a/extra/images/gif/gif-tests.factor +++ b/extra/images/gif/gif-tests.factor @@ -32,7 +32,7 @@ IN: images.gif.tests gif-example1 gif-example2 gif-example3 gif-example4 gif-example5 gif-example6 } - [ execute( -- gif ) loading-gif>image image. ] each ; + [ execute( -- gif ) gif>image image. ] each ; : declared-num-colors ( gif -- n ) flags>> 3 bits 1 + 2^ ; : actual-num-colors ( gif -- n ) global-color-table>> length ; @@ -71,7 +71,7 @@ IN: images.gif.tests 0 0 0 255 255 255 255 255 0 0 0 255 0 0 0 255 255 255 255 255 0 0 0 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 255 } -] [ gif-example3 loading-gif>image bitmap>> ] unit-test +] [ gif-example3 gif>image bitmap>> ] unit-test [ BV{ @@ -85,7 +85,7 @@ IN: images.gif.tests 255 000 000 255 000 000 000 000 000 000 000 000 255 000 000 255 } -] [ gif-example5 loading-gif>image bitmap>> ] unit-test +] [ gif-example5 gif>image bitmap>> ] unit-test [ 100 ] [ gif-example1 >index-stream length ] unit-test [ 870 ] [ gif-example2 >index-stream length ] unit-test diff --git a/extra/images/gif/gif.factor b/extra/images/gif/gif.factor index c6b42a651f..6af64be024 100644 --- a/extra/images/gif/gif.factor +++ b/extra/images/gif/gif.factor @@ -243,7 +243,7 @@ ERROR: unhandled-data byte ; [ graphic-control-extensions>> first transparent-color-index>> ] [ drop f ] if ; -: loading-gif>image ( loading-gif -- image ) +: gif>image ( loading-gif -- image ) [ ] dip [ dimensions >>dim ] [ drop RGBA >>component-order ubyte-components >>component-type ] @@ -258,4 +258,4 @@ ERROR: loading-gif-error gif-image ; dup loading?>> [ loading-gif-error ] when ; M: gif-image stream>image ( path gif-image -- image ) - drop load-gif ensure-loaded loading-gif>image ; + drop load-gif ensure-loaded gif>image ;