Raneme procedures from pixel-setter/getter to pixel-writer/reader

5 files changed, 25 insertions, 25 deletions

diff --git a/pnm/image.scm b/pnm/image.scm
index ceab0cf..4960ec6 100644
--- a/pnm/image.scm
+++ b/pnm/image.scm
@@ -24,30 +24,30 @@
           image-height
           image-maxval
           image-data
-          image-pixel-getter
-          image-pixel-setter
+          image-pixel-reader
+          image-pixel-writer
           image-ref
           image-set!)
   (import (scheme base)
           (scheme case-lambda))
   (begin
     (define-record-type <image>
-      (make-image type width height maxval data pixel-getter pixel-setter)
+      (make-image type width height maxval data pixel-reader pixel-writer)
       image?
       (type image-type)
       (width image-width)
       (height image-height)
       (maxval image-maxval)
       (data image-data)
-      (pixel-getter image-pixel-getter)
-      (pixel-setter image-pixel-setter))
+      (pixel-reader image-pixel-reader)
+      (pixel-writer image-pixel-writer))
 
     (define (image-ref image x y)
-      ((image-pixel-getter image) x y))
+      ((image-pixel-reader image) x y))
 
     (define image-set!
       (case-lambda
         ((image x y v)
-         ((image-pixel-setter image) x y v))
+         ((image-pixel-writer image) x y v))
         ((image x y r g b)
-         ((image-pixel-setter image) x y r g b))))))
+         ((image-pixel-writer image) x y r g b))))))
diff --git a/pnm/pbm.scm b/pnm/pbm.scm
index b3d2c3c..e8e01d3 100644
--- a/pnm/pbm.scm
+++ b/pnm/pbm.scm
@@ -44,15 +44,15 @@
             (values (+ (* y byte-width)
                        byte-x)
                     bit-x)))
-        (define (pixel-getter x y)
+        (define (pixel-reader x y)
           (let-values (((byte-idx bit-idx) (xy->byte-idx+bit-idx x y)))
             (let ((byte (bytevector-u8-ref data byte-idx)))
               (bit-set? (- 7 bit-idx) byte))))
-        (define (pixel-setter x y b)
+        (define (pixel-writer x y b)
           (let-values (((byte-idx bit-idx) (xy->byte-idx+bit-idx x y)))
             (let ((byte (bytevector-u8-ref data byte-idx)))
               (bytevector-u8-set! data byte-idx
                                   (copy-bit (- 7 bit-idx) byte b)))))
         (unless (= byte-count (bytevector-length data))
           (error (string-append "(pnm pbm) make-pbm-image: Invalid bytevector length" byte-count)))
-        (make-image 'pbm width height #t data pixel-getter pixel-setter)))))
+        (make-image 'pbm width height #t data pixel-reader pixel-writer)))))
diff --git a/pnm/pgm.scm b/pnm/pgm.scm
index 200720f..c37d587 100644
--- a/pnm/pgm.scm
+++ b/pnm/pgm.scm
@@ -45,29 +45,29 @@
       (if (< maxval 256)
           (let ((byte-count (* width height)))
             (define (xy->idx x y) (+ x (* y width)))
-            (define (pixel-getter x y)
+            (define (pixel-reader x y)
               (let ((idx (xy->idx x y)))
                 (bytevector-u8-ref data idx)))
-            (define (pixel-setter x y v)
+            (define (pixel-writer x y v)
               (let ((idx (xy->idx x y)))
                 (bytevector-u8-set! data idx v)))
             (unless (= byte-count (bytevector-length data))
               (error (string-append "(pnm pbm) make-pbm-image: Invalid bytevector length" byte-count)))
-            (make-image 'pgm width height maxval data pixel-getter pixel-setter))
+            (make-image 'pgm width height maxval data pixel-reader pixel-writer))
           (let ((byte-count (* width height 2)))
             (define (xy->idx x y) (+ x (* y width)))
-            (define (pixel-getter x y)
+            (define (pixel-reader x y)
               (let ((idx (xy->idx x y)))
                 (combine-values (bytevector-u8-ref data idx)
                                 (bytevector-u8-ref data (+ idx 1)))))
-            (define (pixel-setter x y v)
+            (define (pixel-writer 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))))
             (unless (= byte-count (bytevector-length data))
               (error (string-append "(pnm pbm) make-pbm-image: Invalid bytevector length" byte-count)))
-            (make-image 'pgm width height maxval data pixel-getter pixel-setter))))
+            (make-image 'pgm width height maxval data pixel-reader pixel-writer))))
 
     (define (split-value v)
       (values (modulo (quotient v 256) 256)
diff --git a/pnm/ppm.scm b/pnm/ppm.scm
index 11331af..6fe7f1f 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-getter x y)
+            (define (pixel-reader 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-setter x y r g b)
+            (define (pixel-writer 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-getter pixel-setter))
+            (make-image 'ppm width height maxval data pixel-reader pixel-writer))
           (let* ((w*6 (* width 6))
                  (byte-count (* w*6 height)))
             (define (xy->idx x y) (+ (* 6 x) (* y w*6)))
-            (define (pixel-getter x y)
+            (define (pixel-reader 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-setter x y r g b)
+            (define (pixel-writer 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-getter pixel-setter))))
+            (make-image 'ppm width height maxval data pixel-reader pixel-writer))))
 
     (define (split-value v)
       (values (modulo (quotient v 256) 256)
diff --git a/pnm/read.scm b/pnm/read.scm
index a2e0555..7d2cbdc 100644
--- a/pnm/read.scm
+++ b/pnm/read.scm
@@ -87,7 +87,7 @@
                                          (read-bytevector (* 6 width height) in))))
                    ((P3)
                     (let ((ppm-image (make-ppm-image width height maxval)))
-                      (read-text-raster width height #t in (image-pixel-setter ppm-image)
+                      (read-text-raster width height #t in (image-pixel-writer ppm-image)
                                         unexpected-eof-error
                                         unexpected-character-error)
                       ppm-image))
@@ -99,7 +99,7 @@
                                          (read-bytevector (* 2 width height) in))))
                    ((P2)
                     (let ((pgm-image (make-pgm-image width height maxval)))
-                      (read-text-raster width height #f in (image-pixel-setter pgm-image)
+                      (read-text-raster width height #f in (image-pixel-writer pgm-image)
                                         unexpected-eof-error
                                         unexpected-character-error)
                       pgm-image))))))))))