images.gif: renamed loading-gif>image to gif>image to match the TIFF vocab

diff --git a/extra/images/gif/gif-tests.factor b/extra/images/gif/gif-tests.factor
index 87ce507b2eff2115ef5dc3b4806105c98d5f0514..1eeb420a04ae214556dcacac75c904b7097da366 100644 (file)
--- 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 c6b42a651fb2b3a0b23369999ac9208f3ada8697..6af64be024161f455dba9a9ab7e9a0f6d3684a50 100644 (file)
--- 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 )
     [ <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 ;