diff options
| author | Masaya Tojo <masaya@tojo.tokyo> | 2024-08-07 12:33:41 +0900 |
|---|---|---|
| committer | Masaya Tojo <masaya@tojo.tokyo> | 2024-08-07 23:43:20 +0900 |
| commit | 440d81869346951bbd7060043faeb5593ac5865d (patch) | |
| tree | 33ea344eff202777620bfa4660751e5f70271e22 /pnm | |
| parent | 4847907ee7e44f9b83e7f7c55dc9605d261bb18e (diff) | |
Rename procedures from image-ref/set! to image-pixel-read/pixel-write!
Diffstat (limited to 'pnm')
| -rw-r--r-- | pnm/image.scm | 8 | ||||
| -rw-r--r-- | pnm/read.scm | 2 | ||||
| -rw-r--r-- | pnm/write.scm | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pnm/image.scm b/pnm/image.scm index 4960ec6..4022184 100644 --- a/pnm/image.scm +++ b/pnm/image.scm @@ -26,8 +26,8 @@ image-data image-pixel-reader image-pixel-writer - image-ref - image-set!) + image-pixel-read + image-pixel-write!) (import (scheme base) (scheme case-lambda)) (begin @@ -42,10 +42,10 @@ (pixel-reader image-pixel-reader) (pixel-writer image-pixel-writer)) - (define (image-ref image x y) + (define (image-pixel-read image x y) ((image-pixel-reader image) x y)) - (define image-set! + (define image-pixel-write! (case-lambda ((image x y v) ((image-pixel-writer image) x y v)) diff --git a/pnm/read.scm b/pnm/read.scm index 7d2cbdc..d13557e 100644 --- a/pnm/read.scm +++ b/pnm/read.scm @@ -71,7 +71,7 @@ (pbm-image (make-pbm-image width height))) (read-text-raster width height #f in (lambda (x y v) - (image-set! pbm-image x y (= v 1))) + (image-pixel-write! pbm-image x y (= v 1))) unexpected-eof-error unexpected-character-error) pbm-image)) diff --git a/pnm/write.scm b/pnm/write.scm index 849e3de..c85fec5 100644 --- a/pnm/write.scm +++ b/pnm/write.scm @@ -82,19 +82,19 @@ ((ppm) (write-raster (lambda (x y) - (let-values (((r g b) (image-ref image x y))) + (let-values (((r g b) (image-pixel-read image x y))) (write-token (number->string r)) (write-token (number->string g)) (write-token (number->string b)))))) ((pgm) (write-raster (lambda (x y) - (let ((v (image-ref image x y))) + (let ((v (image-pixel-read image x y))) (write-token (number->string v)))))) ((pbm) (write-raster (lambda (x y) - (let ((b (image-ref image x y))) + (let ((b (image-pixel-read image x y))) (write-token (if b "1" "0")))))))))) (define (write-string-u8 str out) |