Merge work done by aavogt over the last two years

.gitignore

@@ -0,0 +1,6 @@
+dist
+*_hsc.c
+*_hsc.h
+*.hi
+*.o
+

HOpenCV.cabal

@@ -1,63 +1,93 @@
 name: HOpenCV
-version: 0.1.2.2
+version: 0.4.0
 license: BSD3
-maintainer: Noam Lewis <jones.noamle@gmail.com>
-bug-reports: mailto:jones.noamle@gmail.com
+author: Noam Lewis <jones.noamle@gmail.com>
+maintainer: Anthony Cowley <acowley@gmail.com>
+stability: experimental
 category: AI, Graphics
-synopsis: A binding for the OpenCV computer vision library
-Tested-With:   GHC == 6.10.4
+synopsis: A binding for the OpenCV computer vision library.
+Tested-With:   GHC==7.6.1
 description:
-   Initial version with very limited bindings to OpenCV 2.0. (See: <http://opencv.willowgarage.com/wiki/Welcome>)
-   .
-   For a functional interface to this library, see the package "cv-combinators".
-   .
-   Online module documentation, if not build below, can be found at <http://www.ee.bgu.ac.il/~noamle/>.
+   Limited bindings to OpenCV 2.4. (See: <http://opencv.willowgarage.com/wiki/Welcome>)
    .
    /Installation/
    .
-   You must install OpenCV (development packages) prior to installing this package. Currently only tested on Ubuntu Linux, but should work on most linux distributions. For OpenCV installation on other *nix platforms, see <http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.0/>
-   .
-   On /Ubuntu/ systems, the appropriate version of OpenCV can be installed by (the instructions are for Karmic):
+   You must install OpenCV (development packages) prior to installing this package. Currently tested on Mac OS 10.7.
    .
-   > sudo add-apt-repository ppa:gijzelaar/opencv2-karmic
-   > sudo apt-get update
-   > sudo apt-get install libcv-dev libhighgui-dev
+   /Usage/
    .
-   You should then have libcv4 and libhighgui4 installed automatically too.
+   The "OpenCV.HighCV" module exposes the most commonly used functionality. The @Core@ modules contain to low-level OpenCV interfaces, while modules not in the @Core@ directory provide specific types of operations.
    .
-
-build-type: Simple
-cabal-version:  >= 1.2
-extra-source-files:
-   src/AI/CV/OpenCV/HOpenCV_wrap.h
+   See @src\/Examples\/VideoFunhouse@ for an example application.
+build-type:         Custom
+cabal-version:      >= 1.8
+extra-source-files: src/OpenCV/Core/HOpenCV_wrap.h 
+                    src/Examples/VideoFunhouse/Makefile 
+                    src/Examples/VideoFunhouse/Rate.hs
+                    src/Examples/VideoFunhouse/VideoFunhouse.hs
+                    src/Examples/Closing/Closing.hs
+source-repository head
+  type: git
+  location: git://github.com/acowley/HOpenCV.git
+
+Flag OpenCV21
+  Description: Link against OpenCV 2.1
+  Default:     False
+
+Flag MotionAnalysis
+  Description: Export optical flow bindings. Doesn't work with GHCi.
+  Default:     False
 
 library
    exposed-modules:
-      AI.CV.OpenCV.CV
-      AI.CV.OpenCV.CxCore
-      AI.CV.OpenCV.HighGui
-      AI.CV.OpenCV.Types
+      OpenCV.Core.CV
+      OpenCV.Core.CVOp 
+      OpenCV.Core.CxCore
+      OpenCV.Core.HighGui
+      OpenCV.Core.Image
+      OpenCV.Core.ImageUtil
+      OpenCV.Core.ColorConversion
+      OpenCV.HighCV
+      OpenCV.GUI
+      OpenCV.Video
+      OpenCV.FloodFill
+      OpenCV.PixelUtils
+      OpenCV.ColorConversion
+      OpenCV.Drawing
+      OpenCV.Contours
+      OpenCV.Threshold
+      OpenCV.ArrayOps
+      OpenCV.Filtering
+      OpenCV.FeatureDetection
+      OpenCV.Histograms
+      OpenCV.Color
    c-sources:
-      src/AI/CV/OpenCV/HOpenCV_wrap.c
+      src/OpenCV/Core/HOpenCV_wrap.c
+      src/OpenCV/ArrayOps_hsc.c
+      src/OpenCV/FloodFill_hsc.c
+      src/OpenCV/Drawing_hsc.c
+   other-modules: OpenCV.Core.StorableUtil
    hs-Source-Dirs: src
-   include-dirs: /usr/include/opencv
-   extra-libraries: cv,highgui
-   build-depends: base >=4 && <5, allocated-processor >= 0.0.1, vector-space
-   ghc-options: -Wall -fno-warn-type-defaults
-
-executable test-hopencv
-  c-sources:
-     src/AI/CV/OpenCV/HOpenCV_wrap.c
-  include-dirs: /usr/include/opencv
-  hs-source-dirs:  src
-  Build-Depends: base >=4 && <5
-  main-is: Test.hs
-  Ghc-Options: -Wall -fno-warn-type-defaults
-  Ghc-Prof-Options:  -prof -auto-all 
-  extra-libraries: cv,highgui
-  other-modules: AI.CV.OpenCV.CxCore, AI.CV.OpenCV.CV, AI.CV.OpenCV.HighGui, AI.CV.OpenCV.Types
+   if flag(MotionAnalysis)
+     exposed-modules:   OpenCV.Motion
+   if os(windows)
+     include-dirs:	C:\\OpenCV2.2\\include
+     extra-lib-dirs:	C:\\OpenCV2.2\\bin
+     extra-libraries: 	opencv_core220,opencv_imgproc220,opencv_highgui220,opencv_video220
+   else
+     if flag(OpenCV21)
+       CC-Options:      "-DOCV21"
+       extra-libraries: cv highgui
+     else
+       extra-libraries: opencv_core,opencv_imgproc,opencv_highgui,opencv_video
 
+   -- needed to load in ghci-7.8 
+   cc-options: -fPIC
 
---source-repository head
---  type: git
---  location: git://github.com/sinelaw/HOpenCV.git
+   build-depends: base >= 4.6 && <5, 
+                  template-haskell,
+                  vector-space >= 0.7.2,
+                  directory >= 1.0.1.0 && < 2,
+                  vector >= 0.7,
+                  singletons, tagged
+   ghc-options: -Wall -fno-warn-name-shadowing -O2 -funbox-strict-fields

README.md

@@ -0,0 +1,24 @@
+# HOpenCV
+
+[OpenCV](http://opencv.willowgarage.com/wiki/) bindings for Haskell
+(tested with OpenCV 2.1, 2.2, 2.3.0, and 2.3.1).
+
+- Image color channel count and color depth are statically checked.
+
+- A functional interface is provided through the HighCV module.
+
+- When operations are directly composed, they will be performed
+  in-place where possible as the intermediate images are not
+  observable. GHC's optimizations must be enabled (e.g. -O2).
+
+- See
+  [src/Examples](https://github.com/acowley/HOpenCV/tree/master/src/Examples)
+  for example programs. In particular, the
+  [VideoFunhouse](https://github.com/acowley/HOpenCV/tree/master/src/Examples/VideoFunhouse)
+  executable demonstrates realtime image processing on either the
+  video feed from a webcam or a video file. Fusion of in-place
+  operations is demonstrated along with light-weight parallelism.
+
+NOTE: Only a small part of OpenCV is currently wrapped.
+
+

Setup.hs

@@ -0,0 +1,20 @@
+import Data.List (intercalate)
+import Distribution.Simple
+import System.Cmd
+import System.Exit
+import System.FilePath
+
+libs :: [String]
+libs = ["opencv_core", "opencv_imgproc", "opencv_highgui", "opencv_video"]
+
+runHsc2hs :: FilePath -> IO ExitCode
+runHsc2hs f = system $ "hsc2hs "++f++" "++libs'
+  where libs' = intercalate " " $ map ("-L -l"++) libs
+
+srcPath :: FilePath
+srcPath = "src/OpenCV"
+
+main :: IO ()
+main = do mapM_ (runHsc2hs . (srcPath </>) . flip addExtension "hsc")
+                ["ArrayOps", "FloodFill", "Drawing"]
+          defaultMain