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

fix 'solid vs. 'opaque for mono on mono Closes PR 11839

Browse Source
This commit is contained in:
Matthew Flatt 2011-04-14 13:54:59 -06:00
parent 7fb5e36db1
commit 5386206667
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
collects/racket/draw/private/dc.rkt
View File

@ -1644,7 +1644,8 @@
[(or (send src is-color?)
(and (not (eq? style 'opaque))
(= alpha 1.0)
black?))
black?
(not (collapse-bitmap-b&w?))))
(let ([s (cairo_get_source cr)])
(cairo_pattern_reference s)
(cairo_set_source_surface cr

38
collects/tests/gracket/dc.rktl
View File

@ -327,4 +327,42 @@
;; ----------------------------------------
;; Check B&W drawing to B&W, 'solid vs. 'opaque
(let ([mk
(lambda (expect style bg-col col mask?)
(let* ((bm1 (make-object bitmap% 2 2 #t))
(bm2 (make-object bitmap% 2 2 #t))
(bm3 (make-object bitmap% 2 2 #t))
(dc1 (new bitmap-dc% (bitmap bm1)))
(dc2 (new bitmap-dc% (bitmap bm2)))
(dc3 (new bitmap-dc% (bitmap bm3)))
(s (make-bytes 16)))
(send dc1 clear)
(send dc1 set-argb-pixels 0 0 2 1 #"\xFF\0\0\0\xFF\0\0\0")
(send dc2 clear)
(send dc2 set-argb-pixels 0 1 2 1 #"\xFF\0\0\0\xFF\0\0\0")
(send dc3 set-argb-pixels 0 0 2 2 (bytes-append #"\xFF\0\0\0\xFF\xFF\xFF\xFF"
#"\xFF\0\0\0\xFF\xFF\xFF\xFF"))
(send dc2 set-background bg-col)
(send dc2 draw-bitmap bm1 0 0 style col (and mask? bm3))
(send dc2 set-bitmap #f)
(send bm2 get-argb-pixels 0 0 2 2 s)
(let ([col->str (lambda (c)
(if (zero? (send c red)) "black" "white"))])
(test expect `(mk ,style ,(col->str bg-col) ,(col->str col), mask?) s))))]
[black (make-object color%)]
[white (make-object color% 255 255 255)])
(mk #"\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0" 'solid white black #f)
(mk #"\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0" 'solid black black #f)
(mk #"\377\377\377\377\377\377\377\377\377\0\0\0\377\0\0\0" 'solid black white #f)
(mk #"\377\0\0\0\377\377\377\377\377\0\0\0\377\0\0\0" 'solid white black #t)
(mk #"\377\377\377\377\377\377\377\377\377\0\0\0\377\0\0\0" 'solid white white #t)
(mk #"\377\0\0\0\377\0\0\0\377\377\377\377\377\377\377\377" 'opaque white black #f)
(mk #"\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0" 'opaque black black #f)
(mk #"\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" 'opaque white white #f)
(mk #"\377\0\0\0\377\377\377\377\377\377\377\377\377\0\0\0" 'opaque white black #t)
(mk #"\377\377\377\377\377\377\377\377\377\0\0\0\377\0\0\0" 'opaque black white #t))
;; ----------------------------------------
(report-errs)