Merge pull request #2 from AlexKnauth/opaque-positive-predicate

switch cond order, Color before Bitmap-Pattern

Author: wargrey

bitmap/digitama/base.rkt

@@ -3,6 +3,7 @@
 (provide (all-defined-out))
 
 (define-type Color (U Symbol Integer FlColor))
+(define-predicate color? Color)
 
 (struct paint () #:transparent #:type-name Paint)
 (struct flcolor () #:transparent #:type-name FlColor)

bitmap/digitama/source.rkt

@@ -25,8 +25,8 @@
 (define fill-paint->source : (-> Fill-Paint Bitmap-Source)
   (lambda [paint]
     (cond [(bitmap? paint) (bitmap-surface paint)]
-          [(bitmap-pattern? paint) paint]
-          [else (rgb* paint)])))
+          [(color? paint) (rgb* paint)]
+          [else paint])))
 
 (define fill-paint->source* : (-> (Option Fill-Paint) (Option Bitmap-Source))
   (lambda [paint]