From f771fb288ff62d761fcf43e0815a9b2a482db7b4 Mon Sep 17 00:00:00 2001 From: Masaya Tojo Date: Wed, 7 Aug 2024 23:42:19 +0900 Subject: Rename procedures from image-pixel-read/write! to image-pixel-ref/set! --- pnm/image.scm | 24 ++++++++++++------------ pnm/pbm.scm | 6 +++--- pnm/pgm.scm | 12 ++++++------ pnm/ppm.scm | 12 ++++++------ pnm/read.scm | 6 +++--- pnm/write.scm | 6 +++--- 6 files changed, 33 insertions(+), 33 deletions(-) (limited to 'pnm') diff --git a/pnm/image.scm b/pnm/image.scm index 4022184..15702ba 100644 --- a/pnm/image.scm +++ b/pnm/image.scm @@ -24,30 +24,30 @@ image-height image-maxval image-data - image-pixel-reader - image-pixel-writer - image-pixel-read - image-pixel-write!) + image-pixel-getter + image-pixel-setter + image-pixel-ref + image-pixel-set!) (import (scheme base) (scheme case-lambda)) (begin (define-record-type - (make-image type width height maxval data pixel-reader pixel-writer) + (make-image type width height maxval data pixel-getter pixel-setter) image? (type image-type) (width image-width) (height image-height) (maxval image-maxval) (data image-data) - (pixel-reader image-pixel-reader) - (pixel-writer image-pixel-writer)) + (pixel-getter image-pixel-getter) + (pixel-setter image-pixel-setter)) - (define (image-pixel-read image x y) - ((image-pixel-reader image) x y)) + (define (image-pixel-ref image x y) + ((image-pixel-getter image) x y)) - (define image-pixel-write! + (define image-pixel-set! (case-lambda ((image x y v) - ((image-pixel-writer image) x y v)) + ((image-pixel-setter image) x y v)) ((image x y r g b) - ((image-pixel-writer image) x y r g b)))))) + ((image-pixel-setter image) x y r g b)))))) diff --git a/pnm/pbm.scm b/pnm/pbm.scm index e8e01d3..b3d2c3c 100644 --- a/pnm/pbm.scm +++ b/pnm/pbm.scm @@ -44,15 +44,15 @@ (values (+ (* y byte-width) byte-x) bit-x))) - (define (pixel-reader x y) + (define (pixel-getter 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-writer x y b) + (define (pixel-setter 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-reader pixel-writer))))) + (make-image 'pbm width height #t data pixel-getter pixel-setter))))) diff --git a/pnm/pgm.scm b/pnm/pgm.scm index c37d587..200720f 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-reader x y) + (define (pixel-getter x y) (let ((idx (xy->idx x y))) (bytevector-u8-ref data idx))) - (define (pixel-writer x y v) + (define (pixel-setter 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-reader pixel-writer)) + (make-image 'pgm width height maxval data pixel-getter pixel-setter)) (let ((byte-count (* width height 2))) (define (xy->idx x y) (+ x (* y width))) - (define (pixel-reader 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 (pixel-writer 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)))) (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-reader pixel-writer)))) + (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 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) diff --git a/pnm/read.scm b/pnm/read.scm index d13557e..42ded91 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-pixel-write! pbm-image x y (= v 1))) + (image-pixel-set! pbm-image x y (= v 1))) unexpected-eof-error unexpected-character-error) pbm-image)) @@ -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-writer ppm-image) + (read-text-raster width height #t in (image-pixel-setter 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-writer pgm-image) + (read-text-raster width height #f in (image-pixel-setter pgm-image) unexpected-eof-error unexpected-character-error) pgm-image)))))))))) diff --git a/pnm/write.scm b/pnm/write.scm index c85fec5..849e3de 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-pixel-read image x y))) + (let-values (((r g b) (image-ref 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-pixel-read image x y))) + (let ((v (image-ref image x y))) (write-token (number->string v)))))) ((pbm) (write-raster (lambda (x y) - (let ((b (image-pixel-read image x y))) + (let ((b (image-ref image x y))) (write-token (if b "1" "0")))))))))) (define (write-string-u8 str out) -- cgit v1.2.3