From c3391ac0ae1b6420a6b37f55fab5b77a4b2ee759 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Thu, 13 Mar 2008 01:49:21 -0600 Subject: [PATCH] Remove file-length --- core/io/files/files.factor | 2 +- extra/ui/freetype/freetype.factor | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/io/files/files.factor b/core/io/files/files.factor index cbb6e77ff9..104c38518a 100755 --- a/core/io/files/files.factor +++ b/core/io/files/files.factor @@ -220,7 +220,7 @@ M: pathname <=> [ pathname-string ] compare ; >r r> with-stream ; inline : file-contents ( path encoding -- str ) - dupd [ file-length read ] with-file-reader ; + dupd [ file-info file-info-size read ] with-file-reader ; : with-file-writer ( path encoding quot -- ) >r r> with-stream ; inline diff --git a/extra/ui/freetype/freetype.factor b/extra/ui/freetype/freetype.factor index 8078ec4a33..8dca72c29e 100755 --- a/extra/ui/freetype/freetype.factor +++ b/extra/ui/freetype/freetype.factor @@ -4,6 +4,7 @@ USING: alien alien.accessors alien.c-types arrays io kernel libc math math.vectors namespaces opengl opengl.gl prettyprint assocs sequences io.files io.styles continuations freetype ui.gadgets.worlds ui.render ui.backend byte-arrays ; + IN: ui.freetype TUPLE: freetype-renderer ; @@ -74,7 +75,7 @@ M: freetype-renderer free-fonts ( world -- ) : open-face ( font style -- face ) ttf-name ttf-path dup malloc-file-contents - swap file-length + swap file-info file-info-size (open-face) ; SYMBOL: dpi