diff options
| -rw-r--r-- | pnm/pgm.scm | 12 | ||||
| -rw-r--r-- | pnm/ppm.scm | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/pnm/pgm.scm b/pnm/pgm.scm index 5abbab2..c0e0b25 100644 --- a/pnm/pgm.scm +++ b/pnm/pgm.scm @@ -41,25 +41,25 @@ (if (< maxval 256) (let () (define (xy->idx x y) (+ x (* y width))) - (define (getter x y) + (define (pixel-getter x y) (let ((idx (xy->idx x y))) (bytevector-u8-ref data idx))) - (define (setter x y v) + (define (pixel-setter x y v) (let ((idx (xy->idx x y))) (bytevector-u8-set! data idx v))) - (make-image 'pgm width height maxval data getter setter)) + (make-image 'pgm width height maxval data pixel-getter pixel-setter)) (let () (define (xy->idx x y) (+ x (* y width))) - (define (getter x y) + (define (pixel-getter x y) (let ((idx (xy->idx x y))) (combine-values (bytevector-u8-ref data idx) (bytevector-u8-ref data (+ idx 1))))) - (define (setter x y v) + (define (pixel-setter x y v) (let ((idx (xy->idx x y))) (let-values (((v1 v2) (split-value v))) (bytevector-u8-set! data idx v1) (bytevector-u8-set! data (+ idx 1) v2)))) - (make-image 'pgm width height maxval data getter setter)))))) + (make-image 'pgm width height maxval data pixel-getter pixel-setter)))))) (define (split-value v) (values (modulo (quotient v 256) 256) diff --git a/pnm/ppm.scm b/pnm/ppm.scm index 17a7c43..453ca78 100644 --- a/pnm/ppm.scm +++ b/pnm/ppm.scm @@ -42,20 +42,20 @@ (if (< maxval 256) (let* ((w*3 (* width 3))) (define (xy->idx x y) (+ (* 3 x) (* y w*3))) - (define (getter 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 (setter 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))) - (make-image 'ppm width height maxval data getter setter)) + (make-image 'ppm width height maxval data pixel-getter pixel-setter)) (let* ((w*6 (* width 6))) (define (xy->idx x y) (+ (* 6 x) (* y w*6))) - (define (getter 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))) @@ -63,7 +63,7 @@ (bytevector-u8-ref data (+ idx 3))) (combine-values (bytevector-u8-ref data (+ idx 4)) (bytevector-u8-ref data (+ idx 5)))))) - (define (setter 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)) @@ -74,7 +74,7 @@ (bytevector-u8-set! data (+ idx 3) g2) (bytevector-u8-set! data (+ idx 4) b1) (bytevector-u8-set! data (+ idx 5) b2)))) - (make-image 'ppm width height maxval data getter setter)))))) + (make-image 'ppm width height maxval data pixel-getter pixel-setter)))))) (define (split-value v) (values (modulo (quotient v 256) 256) |