diff options
Diffstat (limited to 'pnm/ppm.scm')
| -rw-r--r-- | pnm/ppm.scm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pnm/ppm.scm b/pnm/ppm.scm index 6fe7f1f..11331af 100644 --- a/pnm/ppm.scm +++ b/pnm/ppm.scm @@ -47,23 +47,23 @@ (let* ((w*3 (* width 3)) (byte-count (* w*3 height))) (define (xy->idx x y) (+ (* 3 x) (* y w*3))) - (define (pixel-reader x y) + (define (pixel-getter x y) (let ((idx (xy->idx x y))) (values (bytevector-u8-ref data idx) (bytevector-u8-ref data (+ idx 1)) (bytevector-u8-ref data (+ idx 2))))) - (define (pixel-writer x y r g b) + (define (pixel-setter x y r g b) (let ((idx (xy->idx x y))) (bytevector-u8-set! data idx r) (bytevector-u8-set! data (+ idx 1) g) (bytevector-u8-set! data (+ idx 2) b))) (unless (= byte-count (bytevector-length data)) (error (string-append "(pnm pbm) make-pbm-image: Invalid bytevector length" byte-count))) - (make-image 'ppm width height maxval data pixel-reader pixel-writer)) + (make-image 'ppm width height maxval data pixel-getter pixel-setter)) (let* ((w*6 (* width 6)) (byte-count (* w*6 height))) (define (xy->idx x y) (+ (* 6 x) (* y w*6))) - (define (pixel-reader x y) + (define (pixel-getter x y) (let ((idx (xy->idx x y))) (values (combine-values (bytevector-u8-ref data idx) (bytevector-u8-ref data (+ idx 1))) @@ -71,7 +71,7 @@ (bytevector-u8-ref data (+ idx 3))) (combine-values (bytevector-u8-ref data (+ idx 4)) (bytevector-u8-ref data (+ idx 5)))))) - (define (pixel-writer x y r g b) + (define (pixel-setter x y r g b) (let ((idx (xy->idx x y))) (let-values (((r1 r2) (split-value r)) ((g1 g2) (split-value g)) @@ -84,7 +84,7 @@ (bytevector-u8-set! data (+ idx 5) b2)))) (unless (= byte-count (bytevector-length data)) (error (string-append "(pnm pbm) make-pbm-image: Invalid bytevector length" byte-count))) - (make-image 'ppm width height maxval data pixel-reader pixel-writer)))) + (make-image 'ppm width height maxval data pixel-getter pixel-setter)))) (define (split-value v) (values (modulo (quotient v 256) 256) |