suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix get-argb-pixels on monochrome bitmap's non-alpha

Browse Source
This commit is contained in:
Matthew Flatt 2010-10-29 16:36:15 -06:00
parent a0ad1ebec0
commit fcf7198e7c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
collects/racket/draw/private/bitmap.rkt
View File

@ -104,15 +104,16 @@
(let ([s (cairo_image_surface_create CAIRO_FORMAT_ARGB32 (max w 1) (max h 1))]) (let ([s (cairo_image_surface_create CAIRO_FORMAT_ARGB32 (max w 1) (max h 1))])
(cairo_surface_flush s) (cairo_surface_flush s)
(cond (cond
[alpha?
;; Init transparent:
(bytes-fill! (cairo_image_surface_get_data s) 0)]
[b&w? [b&w?
;; Init transparent white: ;; Init transparent white:
(transparent-white! s w h)] (transparent-white! s w h)]
[alpha?
;; Init transparent:
(bytes-fill! (cairo_image_surface_get_data s) 0)]
[else [else
;; Init all white, 255 alpha: ;; Init all white, 255 alpha:
(bytes-fill! (cairo_image_surface_get_data s) 255)]) (bytes-fill! (cairo_image_surface_get_data s) 255)])
(cairo_surface_mark_dirty s)
s) s)
#f)] #f)]
[([(make-alts path-string? input-port?) filename] [([(make-alts path-string? input-port?) filename]
@ -588,7 +589,8 @@
(let-values ([(A R G B) (argb-indices)]) (let-values ([(A R G B) (argb-indices)])
(cairo_surface_flush s) (cairo_surface_flush s)
(let ([data (cairo_image_surface_get_data s)] (let ([data (cairo_image_surface_get_data s)]
[row-width (cairo_image_surface_get_stride s)]) [row-width (cairo_image_surface_get_stride s)]
[use-alpha? (or alpha-channel? b&w?)])
(let ([w2 (+ x (min (- width x) w))]) (let ([w2 (+ x (min (- width x) w))])
(for* ([j (in-range y (min (+ y h) height))]) (for* ([j (in-range y (min (+ y h) height))])
(let ([row (* j row-width)] (let ([row (* j row-width)]
@ -599,7 +601,7 @@
[ri (+ row 4i)] [ri (+ row 4i)]
[a (bytes-ref data (+ ri A))] [a (bytes-ref data (+ ri A))]
[unmult (lambda (a v) [unmult (lambda (a v)
(if alpha-channel? (if use-alpha?
(if (zero? a) (if (zero? a)
255 255
(unsafe-fxquotient (fx* v 255) a)) (unsafe-fxquotient (fx* v 255) a))