From a02a8d68c36523d23554bb6f9039623096e29180 Mon Sep 17 00:00:00 2001
From: Roel van Dijk <vandijk.roel@gmail.com>
Date: Tue, 13 Jun 2017 16:28:11 +0200
Subject: [PATCH 01/15] Add opencv-extra hackage state to readme

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 516d5cbc..128f1da8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,9 @@
-[![Hackage](https://img.shields.io/hackage/v/opencv.svg)](https://hackage.haskell.org/package/opencv)
 [![Build Status](https://travis-ci.org/LumiGuide/haskell-opencv.svg)](https://travis-ci.org/LumiGuide/haskell-opencv)
 
+[opencv ![Hackage](https://img.shields.io/hackage/v/opencv.svg)](https://hackage.haskell.org/package/opencv)
+
+[opencv-extra ![Hackage](https://img.shields.io/hackage/v/opencv-extra.svg)](https://hackage.haskell.org/package/opencv-extra)
+
 Haskell OpenCV-3.x binding
 ==========================
 

From db9f8a428ca25a089a36c127e4e918fb39d2f1a4 Mon Sep 17 00:00:00 2001
From: Dmitry Krylov <dima@emply.ru>
Date: Sun, 7 May 2017 11:31:20 +1000
Subject: [PATCH 02/15] Syntax error in comment

---
 opencv/src/OpenCV/Calib3d.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opencv/src/OpenCV/Calib3d.hs b/opencv/src/OpenCV/Calib3d.hs
index bd62c493..f14d526f 100644
--- a/opencv/src/OpenCV/Calib3d.hs
+++ b/opencv/src/OpenCV/Calib3d.hs
@@ -110,7 +110,7 @@ findFundamentalMat
 findFundamentalMat pts1 pts2 method = do
     (fm, pointMask) <- c'findFundamentalMat
     -- If the c++ function can't find a fundamental matrix it will
-    -- retrun an empty matrix. We check for this case by trying to
+    -- return an empty matrix. We check for this case by trying to
     -- coerce the result to the desired type.
     catchE (Just . (, unsafeCoerceMat pointMask) <$> coerceMat fm)
            (\case CoerceMatError _msgs -> pure Nothing

From 45ef8b556c83c75aa8fb0c2236ca578c0506a7fb Mon Sep 17 00:00:00 2001
From: Dmitry Krylov <dima@emply.ru>
Date: Sun, 7 May 2017 11:37:01 +1000
Subject: [PATCH 03/15] Bindings for cv::findHomography

---
 opencv/src/OpenCV/Calib3d.hs                  | 85 +++++++++++++++++++
 .../src/OpenCV/Internal/Calib3d/Constants.hsc |  5 ++
 2 files changed, 90 insertions(+)

diff --git a/opencv/src/OpenCV/Calib3d.hs b/opencv/src/OpenCV/Calib3d.hs
index f14d526f..a099b181 100644
--- a/opencv/src/OpenCV/Calib3d.hs
+++ b/opencv/src/OpenCV/Calib3d.hs
@@ -1,11 +1,15 @@
 {-# LANGUAGE QuasiQuotes #-}
+{-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE TemplateHaskell #-}
 
 module OpenCV.Calib3d
     ( FundamentalMatMethod(..)
+    , FindHomographyMethod(..)
+    , FindHomographyParams(..)
     , WhichImage(..)
     -- , calibrateCamera
     , findFundamentalMat
+    , findHomography
     , computeCorrespondEpilines
     ) where
 
@@ -14,6 +18,7 @@ import "base" Data.Word
 import "base" Foreign.C.Types
 import qualified "inline-c" Language.C.Inline as C
 import qualified "inline-c-cpp" Language.C.Inline.Cpp as C
+import "data-default" Data.Default
 import "this" OpenCV.Internal.C.Inline ( openCvCtx )
 import "this" OpenCV.Internal.C.Types
 import "this" OpenCV.Internal.Calib3d.Constants
@@ -57,6 +62,18 @@ marshalWhichImage = \case
     Image1 -> 1
     Image2 -> 2
 
+
+data FindHomographyMethod = FindHomographyMethod0
+                          | FindHomographyMethodRANSAC
+                          | FindHomographyMethodLMEDS
+                          | FindHomographyMethodRHO
+
+marshalFindHomographyMethod :: FindHomographyMethod -> Int32
+marshalFindHomographyMethod FindHomographyMethod0 = 0
+marshalFindHomographyMethod FindHomographyMethodRANSAC = c'RANSAC
+marshalFindHomographyMethod FindHomographyMethodLMEDS  = c'LMEDS
+marshalFindHomographyMethod FindHomographyMethodRHO    = c'RHO
+
 --------------------------------------------------------------------------------
 
 -- {- |
@@ -143,6 +160,74 @@ findFundamentalMat pts1 pts2 method = do
     c'numPts2 = fromIntegral $ V.length pts2
     (c'method, c'p1, c'p2) = marshalFundamentalMatMethod method
 
+
+
+data FindHomographyParams = FindHomographyParams
+    { method :: FindHomographyMethod
+    , ransacReprojThreshold :: Double
+    , maxIters :: Int
+    , confidence :: Double
+    }
+
+
+instance Default FindHomographyParams where
+    def = FindHomographyParams
+            { method = FindHomographyMethod0
+            , ransacReprojThreshold = 3
+            , maxIters = 2000
+            , confidence = 0.995
+            }
+
+
+findHomography
+    :: (IsPoint2 point2 CDouble)
+    => V.Vector (point2 CDouble) -- ^ Points from the first image.
+    -> V.Vector (point2 CDouble) -- ^ Points from the second image.
+    -> FindHomographyParams
+    -> CvExcept ( Maybe ( Mat ('S '[ 'S 3, 'S 3 ]) ('S 1) ('S Double)
+                        , Mat ('S '[ 'D, 'D   ]) ('S 1) ('S Word8 )
+                        )
+                )
+findHomography srcPoints dstPoints (FindHomographyParams{..}) = do
+    (fm, pointMask) <- c'findHomography
+    -- If the c++ function can't find a fundamental matrix it will
+    -- return an empty matrix. We check for this case by trying to
+    -- coerce the result to the desired type.
+    catchE (Just . (, unsafeCoerceMat pointMask) <$> coerceMat fm)
+           (\case CoerceMatError _msgs -> pure Nothing
+                  otherError           -> throwE otherError
+           )
+  where
+    c'findHomography = unsafeWrapException $ do
+      fm <- newEmptyMat
+      pointMask <- newEmptyMat
+      handleCvException (pure (fm, pointMask)) $
+        withPtr fm $ \fmPtr ->
+        withPtr pointMask $ \pointMaskPtr ->
+        withArrayPtr (V.map toPoint srcPoints) $ \srcPtr ->
+        withArrayPtr (V.map toPoint dstPoints) $ \dstPtr ->
+          [cvExcept|
+            cv::_InputArray srcPts = cv::_InputArray($(Point2d * srcPtr), $(int32_t c'numSrcPts));
+            cv::_InputArray dstPts = cv::_InputArray($(Point2d * dstPtr), $(int32_t c'numDstPts));
+            *$(Mat * fmPtr) =
+              cv::findHomography
+                  ( srcPts
+                  , dstPts
+                  , $(int32_t c'method)
+                  , $(double c'ransacReprojThreshold)
+                  , *$(Mat * pointMaskPtr)
+                  , $(int32_t c'maxIters)
+                  , $(double c'confidence)
+                  );
+          |]
+    c'numSrcPts = fromIntegral $ V.length srcPoints
+    c'numDstPts = fromIntegral $ V.length dstPoints
+    c'method = marshalFindHomographyMethod method
+    c'ransacReprojThreshold = realToFrac ransacReprojThreshold
+    c'maxIters = fromIntegral maxIters
+    c'confidence = realToFrac confidence
+
+
 {- | For points in an image of a stereo pair, computes the corresponding epilines in the other image
 
 <http://docs.opencv.org/3.0-last-rst/modules/calib3d/doc/camera_calibration_and_3d_reconstruction.html#computecorrespondepilines OpenCV Sphinx doc>
diff --git a/opencv/src/OpenCV/Internal/Calib3d/Constants.hsc b/opencv/src/OpenCV/Internal/Calib3d/Constants.hsc
index 2da3dc39..e9756106 100644
--- a/opencv/src/OpenCV/Internal/Calib3d/Constants.hsc
+++ b/opencv/src/OpenCV/Internal/Calib3d/Constants.hsc
@@ -16,3 +16,8 @@ module OpenCV.Internal.Calib3d.Constants where
 #num CV_FM_8POINT
 #num CV_FM_RANSAC
 #num CV_FM_LMEDS
+
+#num LMEDS
+#num RANSAC
+#num RHO
+

From 9f62cd5c66bb32ca7c2b97feeefa9414c6023d09 Mon Sep 17 00:00:00 2001
From: Roel van Dijk <roel@lambdacube.nl>
Date: Thu, 15 Jun 2017 16:05:33 +0200
Subject: [PATCH 04/15] findHomography style police

---
 opencv/src/OpenCV/Calib3d.hs | 67 ++++++++++++++++++------------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/opencv/src/OpenCV/Calib3d.hs b/opencv/src/OpenCV/Calib3d.hs
index a099b181..d4619429 100644
--- a/opencv/src/OpenCV/Calib3d.hs
+++ b/opencv/src/OpenCV/Calib3d.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE QuasiQuotes #-}
-{-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE TemplateHaskell #-}
 
 module OpenCV.Calib3d
@@ -62,17 +61,23 @@ marshalWhichImage = \case
     Image1 -> 1
     Image2 -> 2
 
-
-data FindHomographyMethod = FindHomographyMethod0
-                          | FindHomographyMethodRANSAC
-                          | FindHomographyMethodLMEDS
-                          | FindHomographyMethodRHO
+data FindHomographyMethod
+   = FindHomographyMethod_0
+     -- ^ A regular method using all the points.
+   | FindHomographyMethod_RANSAC
+     -- ^ RANSAC-based robust method.
+   | FindHomographyMethod_LMEDS
+     -- ^ Least-Median robust method.
+   | FindHomographyMethod_RHO
+     -- ^ PROSAC-based robust method.
+     deriving (Show)
 
 marshalFindHomographyMethod :: FindHomographyMethod -> Int32
-marshalFindHomographyMethod FindHomographyMethod0 = 0
-marshalFindHomographyMethod FindHomographyMethodRANSAC = c'RANSAC
-marshalFindHomographyMethod FindHomographyMethodLMEDS  = c'LMEDS
-marshalFindHomographyMethod FindHomographyMethodRHO    = c'RHO
+marshalFindHomographyMethod = \case
+    FindHomographyMethod_0      -> 0
+    FindHomographyMethod_RANSAC -> c'RANSAC
+    FindHomographyMethod_LMEDS  -> c'LMEDS
+    FindHomographyMethod_RHO    -> c'RHO
 
 --------------------------------------------------------------------------------
 
@@ -135,7 +140,7 @@ findFundamentalMat pts1 pts2 method = do
            )
   where
     c'findFundamentalMat = unsafeWrapException $ do
-      fm   <- newEmptyMat
+      fm        <- newEmptyMat
       pointMask <- newEmptyMat
       handleCvException (pure (fm, pointMask)) $
         withPtr fm $ \fmPtr ->
@@ -160,24 +165,21 @@ findFundamentalMat pts1 pts2 method = do
     c'numPts2 = fromIntegral $ V.length pts2
     (c'method, c'p1, c'p2) = marshalFundamentalMatMethod method
 
-
-
-data FindHomographyParams = FindHomographyParams
-    { method :: FindHomographyMethod
-    , ransacReprojThreshold :: Double
-    , maxIters :: Int
-    , confidence :: Double
-    }
-
+data FindHomographyParams
+   = FindHomographyParams
+     { fhpMethod                :: !FindHomographyMethod
+     , fhpRansacReprojThreshold :: !Double
+     , fhpMaxIters              :: !Int
+     , fhpConfidence            :: !Double
+     } deriving (Show)
 
 instance Default FindHomographyParams where
     def = FindHomographyParams
-            { method = FindHomographyMethod0
-            , ransacReprojThreshold = 3
-            , maxIters = 2000
-            , confidence = 0.995
-            }
-
+          { fhpMethod                = FindHomographyMethod_0
+          , fhpRansacReprojThreshold = 3
+          , fhpMaxIters              = 2000
+          , fhpConfidence            = 0.995
+          }
 
 findHomography
     :: (IsPoint2 point2 CDouble)
@@ -188,7 +190,7 @@ findHomography
                         , Mat ('S '[ 'D, 'D   ]) ('S 1) ('S Word8 )
                         )
                 )
-findHomography srcPoints dstPoints (FindHomographyParams{..}) = do
+findHomography srcPoints dstPoints fhp = do
     (fm, pointMask) <- c'findHomography
     -- If the c++ function can't find a fundamental matrix it will
     -- return an empty matrix. We check for this case by trying to
@@ -199,7 +201,7 @@ findHomography srcPoints dstPoints (FindHomographyParams{..}) = do
            )
   where
     c'findHomography = unsafeWrapException $ do
-      fm <- newEmptyMat
+      fm        <- newEmptyMat
       pointMask <- newEmptyMat
       handleCvException (pure (fm, pointMask)) $
         withPtr fm $ \fmPtr ->
@@ -222,11 +224,10 @@ findHomography srcPoints dstPoints (FindHomographyParams{..}) = do
           |]
     c'numSrcPts = fromIntegral $ V.length srcPoints
     c'numDstPts = fromIntegral $ V.length dstPoints
-    c'method = marshalFindHomographyMethod method
-    c'ransacReprojThreshold = realToFrac ransacReprojThreshold
-    c'maxIters = fromIntegral maxIters
-    c'confidence = realToFrac confidence
-
+    c'method = marshalFindHomographyMethod $ fhpMethod fhp
+    c'ransacReprojThreshold = realToFrac $ fhpRansacReprojThreshold fhp
+    c'maxIters = fromIntegral $ fhpMaxIters fhp
+    c'confidence = realToFrac $ fhpConfidence fhp
 
 {- | For points in an image of a stereo pair, computes the corresponding epilines in the other image
 

From 2979834825e0aaef42a9688a5dac7ac0a382c0cf Mon Sep 17 00:00:00 2001
From: Roel van Dijk <roel@lambdacube.nl>
Date: Thu, 15 Jun 2017 18:09:58 +0200
Subject: [PATCH 05/15] Add hconcat and vconcat

---
 opencv/src/OpenCV/Core/ArrayOps.hs | 76 ++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/opencv/src/OpenCV/Core/ArrayOps.hs b/opencv/src/OpenCV/Core/ArrayOps.hs
index 6a669df6..c528d281 100644
--- a/opencv/src/OpenCV/Core/ArrayOps.hs
+++ b/opencv/src/OpenCV/Core/ArrayOps.hs
@@ -44,6 +44,8 @@ module OpenCV.Core.ArrayOps
     , meanStdDev
     , matFlip, FlipDirection(..)
     , matTranspose
+    , hconcat
+    , vconcat
     ) where
 
 import "base" Data.Proxy ( Proxy(..) )
@@ -922,3 +924,77 @@ matTranspose src = unsafePerformIO $ do
           cv::transpose(*$(Mat * srcPtr), *$(Mat * dstPtr));
         }|]
     pure $ unsafeCoerceMat dst
+
+{- | Applies horizontal concatenation to given matrices.
+
+Example:
+
+@
+hconcatImg :: Mat ('S '[ 'D, 'D ]) ('S 3) ('S Word8)
+hconcatImg = exceptError $
+    hconcat $ V.fromList
+      [ halfSize birds_768x512
+      , halfSize flower_768x512
+      , halfSize sailboat_768x512
+      ]
+  where
+    halfSize = exceptError . resize (ResizeRel 0.5) InterArea
+@
+
+<<doc/generated/examples/hconcatImg.png hconcatImg>>
+-}
+hconcat
+    :: V.Vector (Mat ('S '[rows, 'D]) channels depth)
+    -> CvExcept (Mat ('S '[rows, 'D]) channels depth)
+hconcat mats = unsafeWrapException $ do
+    dst <- unsafeCoerceMat <$> newEmptyMat
+    handleCvException (pure dst) $
+      withArrayPtr mats $ \matsPtr ->
+      withPtr dst $ \dstPtr ->
+        [cvExcept|
+          cv::hconcat
+            ( $(Mat * matsPtr)
+            , $(size_t c'numMats)
+            , *$(Mat * dstPtr)
+            );
+        |]
+  where
+    c'numMats :: C.CSize
+    c'numMats = fromIntegral $ V.length mats
+
+{- | Applies vertical concatenation to given matrices.
+
+Example:
+
+@
+vconcatImg :: Mat ('S '[ 'D, 'D ]) ('S 3) ('S Word8)
+vconcatImg = exceptError $
+    vconcat $ V.fromList
+      [ halfSize birds_768x512
+      , halfSize flower_768x512
+      , halfSize sailboat_768x512
+      ]
+  where
+    halfSize = exceptError . resize (ResizeRel 0.5) InterArea
+@
+
+<<doc/generated/examples/vconcatImg.png vconcatImg>>
+-}
+vconcat
+    :: V.Vector (Mat ('S '[ 'D, cols ]) channels depth)
+    -> CvExcept (Mat ('S '[ 'D, cols ]) channels depth)
+vconcat mats = unsafeWrapException $ do
+    dst <- unsafeCoerceMat <$> newEmptyMat
+    handleCvException (pure dst) $
+      withArrayPtr mats $ \matsPtr ->
+      withPtr dst $ \dstPtr ->
+        [cvExcept|
+          cv::vconcat
+            ( $(Mat * matsPtr)
+            , $(size_t c'numMats)
+            , *$(Mat * dstPtr)
+            );
+        |]
+  where
+    c'numMats :: C.CSize
+    c'numMats = fromIntegral $ V.length mats

From 884857725b02e8a930a2a4178d8e39e372585131 Mon Sep 17 00:00:00 2001
From: Roel van Dijk <roel@lambdacube.nl>
Date: Fri, 16 Jun 2017 15:28:28 +0200
Subject: [PATCH 06/15] Add hsc2hs alignof macro

---
 opencv/include/hsc_macros.hpp | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/opencv/include/hsc_macros.hpp b/opencv/include/hsc_macros.hpp
index 1d6e5982..c42567b1 100644
--- a/opencv/include/hsc_macros.hpp
+++ b/opencv/include/hsc_macros.hpp
@@ -9,6 +9,7 @@ This files defines some hsc2hs macros. For documentation on how to construct cus
 #include <bindings.dsl.h>
 
 #define bc_sizeof_varid(name) {printf("c'sizeof_");bc_word(name);}; \
+#define bc_alignof_varid(name) {printf("c'alignof_");bc_word(name);}; \
 
 /*
 The #sizeof macro outputs a Haskell constant with the size of the C/C++ type in bytes.
@@ -27,4 +28,23 @@ Results in the following Haskell code:
     bc_sizeof_varid(# name);printf(" = %lu\n", sizeof(name)); \
   }; \
 
+/*
+The #alignof macro outputs a Haskell constant with the alignment off the C/C++ type in bytes.
+
+For example the following:
+
+  #alignof Point2i
+
+Results in the following Haskell code:
+
+  c'alignof_Point2i :: Int
+  c'alignof_Point2i = 4
+
+The specific alignment that is calculated is platform dependent.
+*/
+#define hsc_alignof(name) \
+  { bc_alignof_varid(# name);printf(" :: Int\n"); \
+    bc_alignof_varid(# name);printf(" = %lu\n", alignof(name)); \
+  }; \
+
 #endif /* __HSC_MACROS_H__ */

From 91fba8d6767c3817c20c818471d5292365569107 Mon Sep 17 00:00:00 2001
From: Roel van Dijk <roel@lambdacube.nl>
Date: Fri, 16 Jun 2017 15:35:46 +0200
Subject: [PATCH 07/15] Fixed bug in hsc_macros

Whitespace matters. Also, don't test with just "cabal build" without a
"cabal clean"...
---
 opencv/include/hsc_macros.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/opencv/include/hsc_macros.hpp b/opencv/include/hsc_macros.hpp
index c42567b1..22d71c3f 100644
--- a/opencv/include/hsc_macros.hpp
+++ b/opencv/include/hsc_macros.hpp
@@ -9,6 +9,7 @@ This files defines some hsc2hs macros. For documentation on how to construct cus
 #include <bindings.dsl.h>
 
 #define bc_sizeof_varid(name) {printf("c'sizeof_");bc_word(name);}; \
+
 #define bc_alignof_varid(name) {printf("c'alignof_");bc_word(name);}; \
 
 /*

From 452b21b98d0a9e9d4cec4a8daf43739b9d803862 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sun, 18 Jun 2017 20:35:16 +0200
Subject: [PATCH 08/15] Upgrade nixpkgs to the latest HEAD to fix
 opencv-contrib on OS X

Fixes #87.
---
 nixpkgs-config.nix | 2 +-
 nixpkgs.nix        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixpkgs-config.nix b/nixpkgs-config.nix
index 351c40fe..2bee0e7c 100644
--- a/nixpkgs-config.nix
+++ b/nixpkgs-config.nix
@@ -15,7 +15,7 @@
 
       opencv3 = pkgs.opencv3.override {
         enableIpp       = !osx;
-        enableContrib   = !osx;
+        enableContrib   = true;
         enableGtk2      = true;
         enableFfmpeg    = !osx;
         enableGStreamer = true;
diff --git a/nixpkgs.nix b/nixpkgs.nix
index 1804c3cf..bfe5c0f0 100644
--- a/nixpkgs.nix
+++ b/nixpkgs.nix
@@ -2,6 +2,6 @@ let pkgs = import <nixpkgs> {};
 in pkgs.fetchFromGitHub {
  owner   = "NixOS";
  repo    = "nixpkgs";
- rev     = "0011f9065a1ad1da4db67bec8d535d91b0a78fba";
- sha256  = "0m662mibyxqmp83zdhsi084p2h90268h3i8bfk3b2q8pbjz89yx2";
+ rev     = "89e02c7516ff301d28301926e9d7b373f29836fe";
+ sha256  = "0v28hyyn1hw9951w1zvq5s40bbmk3gpjsmhq0cyp7lvs7d1aq0z7";
 }

From 8231a2b85fbf5ff25aa0fc860ab6345cfc2bbbb3 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sun, 18 Jun 2017 21:56:10 +0200
Subject: [PATCH 09/15] Add links to the source repository in the cabal files

---
 opencv-examples/opencv-examples.cabal             | 5 +++++
 opencv-extra-examples/opencv-extra-examples.cabal | 5 +++++
 opencv-extra/opencv-extra.cabal                   | 5 +++++
 opencv/opencv.cabal                               | 5 +++++
 4 files changed, 20 insertions(+)

diff --git a/opencv-examples/opencv-examples.cabal b/opencv-examples/opencv-examples.cabal
index 350da0f1..e1d8e22f 100644
--- a/opencv-examples/opencv-examples.cabal
+++ b/opencv-examples/opencv-examples.cabal
@@ -14,6 +14,11 @@ extra-source-files:
     data/*.jpg
     data/*.xml
 
+source-repository head
+  type:     git
+  location: git://github.com/LumiGuide/haskell-opencv.git
+  subdir:   opencv-examples
+
 library
     hs-source-dirs: lib
     exposed-modules:
diff --git a/opencv-extra-examples/opencv-extra-examples.cabal b/opencv-extra-examples/opencv-extra-examples.cabal
index cd1ace4e..40e0469c 100644
--- a/opencv-extra-examples/opencv-extra-examples.cabal
+++ b/opencv-extra-examples/opencv-extra-examples.cabal
@@ -13,6 +13,11 @@ extra-source-files:
     data/*.jpg
     data/*.xml
 
+source-repository head
+  type:     git
+  location: git://github.com/LumiGuide/haskell-opencv.git
+  subdir:   opencv-extra-examples
+
 executable tracker
   main-is: tracker.hs
   hs-source-dirs: src
diff --git a/opencv-extra/opencv-extra.cabal b/opencv-extra/opencv-extra.cabal
index d85eecd0..0527debc 100644
--- a/opencv-extra/opencv-extra.cabal
+++ b/opencv-extra/opencv-extra.cabal
@@ -15,6 +15,11 @@ extra-doc-files:
     doc/generated/*.png
     doc/generated/examples/*.png
 
+source-repository head
+  type:     git
+  location: git://github.com/LumiGuide/haskell-opencv.git
+  subdir:   opencv-extra
+
 flag internal-documentation
     description: Enables documentation generation for internal modules.
     default: False
diff --git a/opencv/opencv.cabal b/opencv/opencv.cabal
index 708d67e3..86258cc5 100644
--- a/opencv/opencv.cabal
+++ b/opencv/opencv.cabal
@@ -26,6 +26,11 @@ extra-doc-files:
     doc/generated/examples/*.gif
     doc/color_conversions.png
 
+source-repository head
+  type:     git
+  location: git://github.com/LumiGuide/haskell-opencv.git
+  subdir:   opencv
+
 flag internal-documentation
     description: Enables documentation generation for internal modules.
     default: False

From 6b78bc4c431d693b0bc828cc86708882a26f777c Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Mon, 19 Jun 2017 18:59:49 +0200
Subject: [PATCH 10/15] Fix build on OS X

---
 opencv-extra/Setup.hs         | 2 +-
 opencv-extra/opencv-extra.nix | 4 ++--
 opencv/Setup.hs               | 2 +-
 opencv/opencv.nix             | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/opencv-extra/Setup.hs b/opencv-extra/Setup.hs
index 031daa10..6a35c073 100644
--- a/opencv-extra/Setup.hs
+++ b/opencv-extra/Setup.hs
@@ -3,6 +3,6 @@ import System.Environment ( getArgs )
 
 main = do
     args <- getArgs
-    let args' | "configure" `elem` args = args ++ ["--with-gcc","g++", "--with-ld","g++"]
+    let args' | "configure" `elem` args = args ++ ["--with-gcc","c++", "--with-ld","c++"]
               | otherwise               = args
     defaultMainArgs args'
diff --git a/opencv-extra/opencv-extra.nix b/opencv-extra/opencv-extra.nix
index 0ec2d714..7f3702b6 100644
--- a/opencv-extra/opencv-extra.nix
+++ b/opencv-extra/opencv-extra.nix
@@ -73,8 +73,8 @@ mkDerivation {
   libraryPkgconfigDepends = [ opencv3 ];
 
   configureFlags =
-    [ "--with-gcc=g++"
-      "--with-ld=g++"
+    [ "--with-gcc=${stdenv.cc}/bin/c++"
+      "--with-ld=${stdenv.cc}/bin/c++"
     ];
 
   hardeningDisable = [ "bindnow" ];
diff --git a/opencv/Setup.hs b/opencv/Setup.hs
index 031daa10..6a35c073 100644
--- a/opencv/Setup.hs
+++ b/opencv/Setup.hs
@@ -3,6 +3,6 @@ import System.Environment ( getArgs )
 
 main = do
     args <- getArgs
-    let args' | "configure" `elem` args = args ++ ["--with-gcc","g++", "--with-ld","g++"]
+    let args' | "configure" `elem` args = args ++ ["--with-gcc","c++", "--with-ld","c++"]
               | otherwise               = args
     defaultMainArgs args'
diff --git a/opencv/opencv.nix b/opencv/opencv.nix
index a28674cc..80ed9954 100644
--- a/opencv/opencv.nix
+++ b/opencv/opencv.nix
@@ -103,8 +103,8 @@ mkDerivation ({
   libraryPkgconfigDepends = [ opencv3 ];
 
   configureFlags =
-    [ "--with-gcc=g++"
-      "--with-ld=g++"
+    [ "--with-gcc=${stdenv.cc}/bin/c++"
+      "--with-ld=${stdenv.cc}/bin/c++"
     ];
 
   hardeningDisable = [ "bindnow" ];

From 848b6f1e7f9e5713ed0470efd2eb4630f6d44583 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Mon, 19 Jun 2017 19:10:27 +0200
Subject: [PATCH 11/15] Document that building on OS X now works

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 128f1da8..6f690bdd 100644
--- a/README.md
+++ b/README.md
@@ -45,11 +45,11 @@ break between minor releases, so be careful.
 Development
 -----------
 
-We use Nix to enter an environment containing all the needed dependencies. For
-the moment the following commands only work on Linux. The Nix expression for
-opencv-extra currently fails to build on OS X.
+To get into an environment that contains all the needed dependencies we use Nix. 
+The following commands work both on Linux and OS X:
 
     curl https://nixos.org/nix/install | sh   # Only execute this if you haven't installed Nix yet.
+    cd opencv[-extra]
     nix-shell
 
 Then you should be able to use `cabal` as normal.

From 18b71bbbf777b80cfa137a333313729e83c6c3c5 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Mon, 19 Jun 2017 21:12:35 +0200
Subject: [PATCH 12/15] Reference opencv-extra and the examples from the
 package description

---
 opencv-extra/opencv-extra.cabal | 8 ++++++++
 opencv/opencv.cabal             | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/opencv-extra/opencv-extra.cabal b/opencv-extra/opencv-extra.cabal
index 0527debc..6f52da9a 100644
--- a/opencv-extra/opencv-extra.cabal
+++ b/opencv-extra/opencv-extra.cabal
@@ -10,6 +10,14 @@ build-type:    Custom
 cabal-version: >=1.23
 category:      AI, Graphics
 synopsis:      Haskell binding to OpenCV-3.x extra modules
+description:   This is a Haskell library providing a binding to the OpenCV-3.x contrib modules.
+               It binds directly with the C++ API using the @inline-c@ Haskell library.
+               .
+               The library is far from complete but the framework is there to easily
+               bind missing functionality.
+               .
+               Make sure to checkout the
+               <https://github.com/LumiGuide/haskell-opencv/tree/master/opencv-extra-examples opencv-extra-examples>.
 
 extra-doc-files:
     doc/generated/*.png
diff --git a/opencv/opencv.cabal b/opencv/opencv.cabal
index 86258cc5..996aa8e6 100644
--- a/opencv/opencv.cabal
+++ b/opencv/opencv.cabal
@@ -15,6 +15,12 @@ description:   This is a Haskell library providing a binding to OpenCV-3.x.
                .
                The library is far from complete but the framework is there to easily
                bind missing functionality.
+               .
+               Note that the OpenCV contrib modules are provided by
+               <http://hackage.haskell.org/package/opencv-extra opencv-extra>.
+               .
+               Make sure to checkout the
+               <https://github.com/LumiGuide/haskell-opencv/tree/master/opencv-examples opencv-examples>.
 
 extra-source-files:
     data/*.png

From 893fad46e92d8aa926539a672bbd30fa9998acad Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Tue, 20 Jun 2017 01:10:25 +0200
Subject: [PATCH 13/15] Added CHANGELOGs

---
 opencv-extra/CHANGELOG.md       | 11 +++++++++++
 opencv-extra/opencv-extra.cabal |  5 ++++-
 opencv/CHANGELOG.md             | 18 ++++++++++++++++++
 opencv/opencv.cabal             |  3 ++-
 4 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 opencv-extra/CHANGELOG.md
 create mode 100644 opencv/CHANGELOG.md

diff --git a/opencv-extra/CHANGELOG.md b/opencv-extra/CHANGELOG.md
new file mode 100644
index 00000000..ea7154f1
--- /dev/null
+++ b/opencv-extra/CHANGELOG.md
@@ -0,0 +1,11 @@
+## 0.0.0.1 - 2017-06-20
+
+### Changed
+
+- Fix build on OS X.
+- Add source repo to cabal file.
+- Added a Cabal package description.
+
+## 0.0.0.0 - 2017-06-11
+
+- Initial version
diff --git a/opencv-extra/opencv-extra.cabal b/opencv-extra/opencv-extra.cabal
index 6f52da9a..81254a9b 100644
--- a/opencv-extra/opencv-extra.cabal
+++ b/opencv-extra/opencv-extra.cabal
@@ -1,5 +1,5 @@
 name:          opencv-extra
-version:       0.0.0.0
+version:       0.0.0.1
 homepage:      https://github.com/LumiGuide/haskell-opencv
 bug-reports:   https://github.com/LumiGuide/haskell-opencv/issues
 license:       BSD3
@@ -19,6 +19,9 @@ description:   This is a Haskell library providing a binding to the OpenCV-3.x c
                Make sure to checkout the
                <https://github.com/LumiGuide/haskell-opencv/tree/master/opencv-extra-examples opencv-extra-examples>.
 
+extra-source-files:
+    CHANGELOG.md
+
 extra-doc-files:
     doc/generated/*.png
     doc/generated/examples/*.png
diff --git a/opencv/CHANGELOG.md b/opencv/CHANGELOG.md
new file mode 100644
index 00000000..bbc445d2
--- /dev/null
+++ b/opencv/CHANGELOG.md
@@ -0,0 +1,18 @@
+## 0.0.1.0 - 2017-06-20
+
+### Added
+
+- OpenCV.Calib3d: findHomography.
+- OpenCV.Core.ArrayOps: hconcat, vconcat.
+- include/hsc_macros.hpp: #alignof macro.
+
+### Changed
+
+- Fix build on OS X.
+- Add source repo to cabal file.
+- Reference opencv-extra and the examples from the Cabal package description.
+
+
+## 0.0.0.0 - 2017-06-11
+
+- Initial version
diff --git a/opencv/opencv.cabal b/opencv/opencv.cabal
index 996aa8e6..8c6abd2f 100644
--- a/opencv/opencv.cabal
+++ b/opencv/opencv.cabal
@@ -1,5 +1,5 @@
 name:          opencv
-version:       0.0.0.0
+version:       0.0.1.0
 homepage:      https://github.com/LumiGuide/haskell-opencv
 bug-reports:   https://github.com/LumiGuide/haskell-opencv/issues
 license:       BSD3
@@ -23,6 +23,7 @@ description:   This is a Haskell library providing a binding to OpenCV-3.x.
                <https://github.com/LumiGuide/haskell-opencv/tree/master/opencv-examples opencv-examples>.
 
 extra-source-files:
+    CHANGELOG.md
     data/*.png
     data/*.jpg
 

From 7003db475680b808a560c72ebbd0417caf6d64b4 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Tue, 20 Jun 2017 01:20:44 +0200
Subject: [PATCH 14/15] CHANGELOG.md: link versions to a GitHub changelog

---
 opencv-extra/CHANGELOG.md | 5 ++++-
 opencv/CHANGELOG.md       | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/opencv-extra/CHANGELOG.md b/opencv-extra/CHANGELOG.md
index ea7154f1..e2e5c7b2 100644
--- a/opencv-extra/CHANGELOG.md
+++ b/opencv-extra/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.0.0.1 - 2017-06-20
+## [0.0.0.1] - 2017-06-20
 
 ### Changed
 
@@ -9,3 +9,6 @@
 ## 0.0.0.0 - 2017-06-11
 
 - Initial version
+
+
+[0.0.0.1]: https://github.com/LumiGuide/haskell-opencv/compare/opencv-extra-0.0.0.0...opencv-extra-0.0.0.1
diff --git a/opencv/CHANGELOG.md b/opencv/CHANGELOG.md
index bbc445d2..0de5468a 100644
--- a/opencv/CHANGELOG.md
+++ b/opencv/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.0.1.0 - 2017-06-20
+## [0.0.1.0] - 2017-06-20
 
 ### Added
 
@@ -16,3 +16,6 @@
 ## 0.0.0.0 - 2017-06-11
 
 - Initial version
+
+
+[0.0.1.0]: https://github.com/LumiGuide/haskell-opencv/compare/opencv-0.0.0.0...opencv-0.0.1.0

From 6b5dd90b6e64c0d20cc469e0ef8c0e85a79ac9bc Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Tue, 20 Jun 2017 01:52:18 +0200
Subject: [PATCH 15/15] Add the logo the Cabal package descriptions

---
 README.md                           |   2 +-
 data/haskell-opencv-logo-200x82.png | Bin 0 -> 4281 bytes
 opencv-extra/opencv-extra.cabal     |   4 +++-
 opencv/opencv.cabal                 |   4 +++-
 4 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 data/haskell-opencv-logo-200x82.png

diff --git a/README.md b/README.md
index 6f690bdd..4fe14442 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 Haskell OpenCV-3.x binding
 ==========================
 
-<img src="https://raw.githubusercontent.com/LumiGuide/haskell-opencv/master/data/haskell-opencv-logo.png" width="200px" alt="Haskell OpenCV-3.x logo" />
+<img src="https://raw.githubusercontent.com/LumiGuide/haskell-opencv/master/data/haskell-opencv-logo-200x82.png" alt="Haskell OpenCV-3.x logo" />
 
 
 This is a Haskell library providing a binding to OpenCV-3.x. It binds directly
diff --git a/data/haskell-opencv-logo-200x82.png b/data/haskell-opencv-logo-200x82.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec63774bc4c5628e21fd07c0f5b15cab54f44fc6
GIT binary patch
literal 4281
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
b)O!91nH<lJ2e}JN00000NkvXXu0mjfrM?=n

literal 0
HcmV?d00001

diff --git a/opencv-extra/opencv-extra.cabal b/opencv-extra/opencv-extra.cabal
index 81254a9b..683d155d 100644
--- a/opencv-extra/opencv-extra.cabal
+++ b/opencv-extra/opencv-extra.cabal
@@ -10,7 +10,9 @@ build-type:    Custom
 cabal-version: >=1.23
 category:      AI, Graphics
 synopsis:      Haskell binding to OpenCV-3.x extra modules
-description:   This is a Haskell library providing a binding to the OpenCV-3.x contrib modules.
+description:   <<https://raw.githubusercontent.com/LumiGuide/haskell-opencv/master/data/haskell-opencv-logo-200x82.png>>
+               .
+               This is a Haskell library providing a binding to the OpenCV-3.x contrib modules.
                It binds directly with the C++ API using the @inline-c@ Haskell library.
                .
                The library is far from complete but the framework is there to easily
diff --git a/opencv/opencv.cabal b/opencv/opencv.cabal
index 8c6abd2f..4a272a95 100644
--- a/opencv/opencv.cabal
+++ b/opencv/opencv.cabal
@@ -10,7 +10,9 @@ build-type:    Custom
 cabal-version: >=1.23
 category:      AI, Graphics
 synopsis:      Haskell binding to OpenCV-3.x
-description:   This is a Haskell library providing a binding to OpenCV-3.x.
+description:   <<https://raw.githubusercontent.com/LumiGuide/haskell-opencv/master/data/haskell-opencv-logo-200x82.png>>
+               .
+               This is a Haskell library providing a binding to OpenCV-3.x.
                It binds directly with the C++ API using the @inline-c@ Haskell library.
                .
                The library is far from complete but the framework is there to easily