diff options
Diffstat (limited to 'pnm/read.scm')
| -rw-r--r-- | pnm/read.scm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pnm/read.scm b/pnm/read.scm index f673c35..4c7dd52 100644 --- a/pnm/read.scm +++ b/pnm/read.scm @@ -17,7 +17,7 @@ ;;; along with R7RS-PNM. If not, see <https://www.gnu.org/licenses/>. (define-library (pnm read) - (export image-read + (export pnm-image-read pnm-parse-error?) (import (scheme base) (scheme case-lambda) @@ -26,10 +26,10 @@ (pnm pgm) (pnm ppm)) (begin - (define image-read + (define pnm-image-read (case-lambda ((in) - (image-read in #f)) + (pnm-image-read in #f)) ((in unsafe?) (define (read-u8*) (let ((u8 (read-u8 in))) @@ -76,7 +76,7 @@ (pbm-image (make-pbm-image width height unsafe?))) (read-text-raster width height #f in (lambda (x y v) - (image-set! pbm-image x y (= v 1))) + (pnm-image-set! pbm-image x y (= v 1))) unexpected-eof-error unexpected-character-error) pbm-image)) @@ -93,7 +93,7 @@ unsafe?)) ((P3) (let ((ppm-image (make-ppm-image width height maxval unsafe?))) - (read-text-raster width height #t in (image-pixel-setter ppm-image) + (read-text-raster width height #t in (pnm-image-pixel-setter ppm-image) unexpected-eof-error unexpected-character-error) ppm-image)) @@ -106,7 +106,7 @@ unsafe?)) ((P2) (let ((pgm-image (make-pgm-image width height maxval unsafe?))) - (read-text-raster width height #f in (image-pixel-setter pgm-image) + (read-text-raster width height #f in (pnm-image-pixel-setter pgm-image) unexpected-eof-error unexpected-character-error) pgm-image)))))))))))) @@ -226,11 +226,11 @@ (else number))))))) (define (unexpected-magic-number-error) - (raise (pnm-parse-error "(pnm read) image-read: Not supported magic number"))) + (raise (pnm-parse-error "(pnm read) pnm-image-read: Not supported magic number"))) (define (unexpected-eof-error) - (raise (pnm-parse-error "(pnm read) image-read: Unexpected end of file"))) + (raise (pnm-parse-error "(pnm read) pnm-image-read: Unexpected end of file"))) (define (unexpected-character-error) - (raise (pnm-parse-error "(pnm read) image-read: Unexpected character")))) + (raise (pnm-parse-error "(pnm read) pnm-image-read: Unexpected character")))) (cond-expand ((library (srfi 35)) (import (srfi 35)) |