Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote branch 'origin/VT/development' into VT/development

  • Loading branch information...
commit 4f3ad793b1e82397fbb6ae1c58e5e6e6465caaa6 2 parents 908fe3f + b72fe4a
@aleator authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 CV/Image.chs
View
4 CV/Image.chs
@@ -671,7 +671,7 @@ tileImages image1 image2 (x,y) = unsafePerformIO $
i1 i2 x y)
-- | Blit image2 onto image1.
blitFix = blit
-blit :: Image GrayScale D32 -> Image GrayScale D32
+blit :: Image GrayScale D32 -> Image GrayScale D32 -> (Int,Int) -> IO ()
blit image1 image2 (x,y)
| badSizes = error $ "Bad blit sizes: " ++ show [(w1,h1),(w2,h2)]++"<-"++show (x,y)
| otherwise = withImage image1 $ \i1 ->
@@ -889,7 +889,7 @@ getAllPixelsRowMajor image = [getPixel (i,j) image
-- |Create a montage form given images (u,v) determines the layout and space the spacing
-- between images. Images are assumed to be the same size (determined by the first image)
-montage :: (CreateImage (Image c d)) => (Int,Int) -> Int -> [Image c d] -> Image c d
+montage :: (CreateImage (Image GrayScale D32)) => (Int,Int) -> Int -> [Image GrayScale D32] -> Image GrayScale D32
montage (u',v') space' imgs
| u'*v' /= (length imgs) = error ("Montage mismatch: "++show (u,v, length imgs))
| otherwise = resultPic
Please sign in to comment.
Something went wrong with that request. Please try again.