From df0734f09e9efdac0bbe9a429076d76fa0149d35 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Tue, 14 Nov 2006 22:48:55 +0000 Subject: [PATCH] use main-collects-relative for paths svn: r4854 --- collects/mrlib/include-bitmap.ss | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/collects/mrlib/include-bitmap.ss b/collects/mrlib/include-bitmap.ss index 8477a27fe0..7bb9f95bd3 100644 --- a/collects/mrlib/include-bitmap.ss +++ b/collects/mrlib/include-bitmap.ss @@ -1,9 +1,11 @@ (module include-bitmap mzscheme (require (lib "mred.ss" "mred") (lib "class.ss") - (lib "file.ss")) + (lib "file.ss") + (lib "main-collects.ss" "setup")) (require-for-syntax (lib "path-spec.ss" "syntax") - (lib "cm-accomplice.ss")) + (lib "cm-accomplice.ss") + (lib "main-collects.ss" "setup")) (provide include-bitmap include-bitmap/relative-to) @@ -26,9 +28,9 @@ (read-bytes (file-size c-file)))))]) (register-external-file c-file) (with-syntax ([content content] - [c-file (path->bytes c-file)]) + [c-file (path->main-collects-relative c-file)]) (syntax/loc stx - (get-or-load-bitmap content c-file type))))])) + (get-or-load-bitmap content 'c-file type))))])) (define-syntax (include-bitmap/relative-to stx) (syntax-case stx () @@ -61,6 +63,6 @@ (unless (send bm ok?) (error 'include-bitmap "unable to parse image, originated from: ~a" - (path->string (bytes->path orig)))) + (path->string (main-collects-relative->path orig)))) (hash-table-put! cached (cons content type) bm) bm)))))