From 53862066671da621a78ede6edc9798cbb63719a3 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Thu, 14 Apr 2011 13:54:59 -0600
Subject: [PATCH] fix 'solid vs. 'opaque for mono on mono Closes PR 11839

---
 collects/racket/draw/private/dc.rkt |  3 ++-
 collects/tests/gracket/dc.rktl      | 38 +++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/collects/racket/draw/private/dc.rkt b/collects/racket/draw/private/dc.rkt
index af7a2ae3e6..05f6e41812 100644
--- a/collects/racket/draw/private/dc.rkt
+++ b/collects/racket/draw/private/dc.rkt
@@ -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 
diff --git a/collects/tests/gracket/dc.rktl b/collects/tests/gracket/dc.rktl
index b18939680e..4d431e3c0d 100644
--- a/collects/tests/gracket/dc.rktl
+++ b/collects/tests/gracket/dc.rktl
@@ -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)