From c8c8fdf36019c01c09062442dcaba66f5af1d099 Mon Sep 17 00:00:00 2001 From: Neil Toronto Date: Sun, 8 Jan 2012 23:18:15 -0700 Subject: [PATCH] Contract fix (cherry picked from commit be4bfdff4cd0a821a6697b46b1cde09d23654da4) --- collects/images/private/flomap.rkt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/collects/images/private/flomap.rkt b/collects/images/private/flomap.rkt index 5188475d3a..fb986fcfa3 100644 --- a/collects/images/private/flomap.rkt +++ b/collects/images/private/flomap.rkt @@ -59,9 +59,7 @@ [fmmin ((or/c flomap? real?) (or/c flomap? real?) . -> . flomap?)] [fmmax ((or/c flomap? real?) (or/c flomap? real?) . -> . flomap?)] ;; Blur - [flomap-gaussian-blur ((flomap? real?) - (real? #:x-stddevs real? #:y-stddevs real?) - . ->* . flomap?)] + [flomap-gaussian-blur ((flomap? real?) (real? real? real?) . ->* . flomap?)] [flomap-box-blur ((flomap? real?) (real?) . ->* . flomap?)] [flomap-blur ((flomap? real?) (real?) . ->* . flomap?)] ;[flomap-integral (flomap? . -> . flomap?)] @@ -119,10 +117,10 @@ [flomap-hc-append ([flomap?] #:rest (listof flomap?) . ->* . flomap?)] [flomap-hb-append ([flomap?] #:rest (listof flomap?) . ->* . flomap?)] ;; Effects - [flomap-outline ([flomap? real?] [#:color (or/c real? (listof real?))] . ->* . flomap?)] - [flomap-outlined ([flomap? real?] [#:color (or/c real? (listof real?))] . ->* . flomap?)] - [flomap-shadow ([flomap? real?] [#:color (or/c real? (listof real?))] . ->* . flomap?)] - [flomap-shadowed ([flomap? real?] [#:color (or/c real? (listof real?))] . ->* . flomap?)] + [flomap-outline ([flomap? real?] [#:color (or/c #f (listof real?))] . ->* . flomap?)] + [flomap-outlined ([flomap? real?] [#:color (or/c #f (listof real?))] . ->* . flomap?)] + [flomap-shadow ([flomap? real?] [#:color (or/c #f (listof real?))] . ->* . flomap?)] + [flomap-shadowed ([flomap? real?] [#:color (or/c #f (listof real?))] . ->* . flomap?)] ) unsafe-build-flomap flomap-lift/unsafe @@ -445,7 +443,7 @@ ;; =================================================================================================== ;; Gaussian blur -(define (flomap-gaussian-blur fm xσ [yσ xσ] #:x-stddevs [x-stddevs 3.0] #:y-stddevs [y-stddevs 3.0]) +(define (flomap-gaussian-blur fm xσ [yσ xσ] [x-stddevs 3.0] [y-stddevs 3.0]) (flomap-gaussian-blur-y (flomap-gaussian-blur-x fm (abs (exact->inexact xσ)) (abs (exact->inexact x-stddevs))) (abs (exact->inexact yσ)) (abs (exact->inexact y-stddevs))))