Drop opencv4 Cabal flag since it's now the only choice

nh2 · nh2 · commit 8ec379d0d4f2 · 2023-09-06T23:57:25.000+02:00
diff --git a/opencv-extra/opencv-extra.cabal b/opencv-extra/opencv-extra.cabal
@@ -38,11 +38,6 @@ source-repository head
   location: git://github.com/LumiGuide/haskell-opencv.git
   subdir:   opencv-extra
 
-flag opencv4
-    description: Use OpenCV >= 4.0.0
-    default: True
-    manual: True
-
 flag enable-nonfree
     description: Builds modules that only work if the system OpenCV was built with the OPENCV_ENABLE_NONFREE option (most OpenCV installations lack this by default).
     default: False
@@ -80,10 +75,7 @@ library
 
     ghc-options: -Wall -fwarn-incomplete-patterns -funbox-strict-fields
 
-    if flag(opencv4)
-        pkgconfig-depends: opencv4 >= 4.0.0
-    else
-        pkgconfig-depends: opencv >= 3.0.0
+    pkgconfig-depends: opencv4 >= 4.0.0
 
     if flag(internal-documentation)
         cpp-options: -DENABLE_INTERNAL_DOCUMENTATION
diff --git a/opencv/opencv.cabal b/opencv/opencv.cabal
@@ -43,11 +43,6 @@ source-repository head
   location: git://github.com/LumiGuide/haskell-opencv.git
   subdir:   opencv
 
-flag opencv4
-    description: Use OpenCV >= 4.0.0
-    default: True
-    manual: True
-
 flag internal-documentation
     description: Enables documentation generation for internal modules.
     default: False
@@ -80,13 +75,7 @@ library
 
     ghc-options: -Wall -fwarn-incomplete-patterns -funbox-strict-fields
 
-    if flag(opencv4)
-        cpp-options:      -DOPENCV4
-        ghc-options: -optc-DOPENCV4
-        pkgconfig-depends: opencv4 >= 4.0.0
-    else
-        pkgconfig-depends: opencv >= 3.0.0
-        build-depends: base64-bytestring >= 1.0.0.1
+    pkgconfig-depends: opencv4 >= 4.0.0
 
     if flag(internal-documentation)
         cpp-options: -DENABLE_INTERNAL_DOCUMENTATION
diff --git a/opencv/src/OpenCV/Features2d.hs b/opencv/src/OpenCV/Features2d.hs
@@ -197,11 +197,7 @@ newOrb OrbParams{..} = fromPtr
         , $(int32_t orb_edgeThreshold)
         , $(int32_t orb_firstLevel)
         , $(int32_t c'WTA_K)
-#ifdef OPENCV4
         , cv::ORB::ScoreType($(int32_t c'scoreType))
-#else
-        , $(int32_t c'scoreType)
-#endif
         , $(int32_t orb_patchSize)
         , $(int32_t orb_fastThreshold)
         );
diff --git a/opencv/src/OpenCV/ImgProc/FeatureDetection.hs b/opencv/src/OpenCV/ImgProc/FeatureDetection.hs
@@ -335,11 +335,7 @@ houghCircles dp minDist param1 param2 minRadius maxRadius src = unsafeWrapExcept
         cv::HoughCircles(
           *$(Mat * srcPtr),
           circles,
-#ifdef OPENCV4
           HOUGH_GRADIENT,
-#else
-          CV_HOUGH_GRADIENT,
-#endif
           $(double c'dp),
           $(double c'minDist),
           $(double c'param1),
diff --git a/opencv/src/OpenCV/ImgProc/GeometricImgTransform.hsc b/opencv/src/OpenCV/ImgProc/GeometricImgTransform.hsc
@@ -91,9 +91,7 @@ C.context openCvCtx
 
 C.include "opencv2/core.hpp"
 C.include "opencv2/imgproc.hpp"
-#ifdef OPENCV4
 C.include "opencv2/calib3d.hpp"
-#endif
 C.using "namespace cv"
 
 #include <bindings.dsl.h>
diff --git a/opencv/src/OpenCV/ImgProc/ObjectDetection.hsc b/opencv/src/OpenCV/ImgProc/ObjectDetection.hsc
@@ -101,33 +101,12 @@ data MatchTemplateNormalisation
    | MatchTemplateNormed    -- ^ Use normalization.
    deriving (Show, Eq)
 
-#ifdef OPENCV4
 #num TM_SQDIFF
 #num TM_SQDIFF_NORMED
 #num TM_CCORR
 #num TM_CCORR_NORMED
 #num TM_CCOEFF
 #num TM_CCOEFF_NORMED
-#else
-#num CV_TM_SQDIFF
-#num CV_TM_SQDIFF_NORMED
-#num CV_TM_CCORR
-#num CV_TM_CCORR_NORMED
-#num CV_TM_CCOEFF
-#num CV_TM_CCOEFF_NORMED
-c'TM_SQDIFF        :: Num a => a
-c'TM_SQDIFF_NORMED :: Num a => a
-c'TM_CCORR         :: Num a => a
-c'TM_CCORR_NORMED  :: Num a => a
-c'TM_CCOEFF        :: Num a => a
-c'TM_CCOEFF_NORMED :: Num a => a
-c'TM_SQDIFF        = c'CV_TM_SQDIFF
-c'TM_SQDIFF_NORMED = c'CV_TM_SQDIFF_NORMED
-c'TM_CCORR         = c'CV_TM_CCORR
-c'TM_CCORR_NORMED  = c'CV_TM_CCORR_NORMED
-c'TM_CCOEFF        = c'CV_TM_CCOEFF
-c'TM_CCOEFF_NORMED = c'CV_TM_CCOEFF_NORMED
-#endif
 
 marshalMatchTemplateMethod :: MatchTemplateMethod -> Bool -> Int32
 marshalMatchTemplateMethod m n =
diff --git a/opencv/src/OpenCV/ImgProc/StructuralAnalysis.hsc b/opencv/src/OpenCV/ImgProc/StructuralAnalysis.hsc
@@ -57,9 +57,7 @@ import qualified "vector" Data.Vector.Storable as VS
 
 #include <bindings.dsl.h>
 #include "opencv2/imgproc.hpp"
-#ifdef OPENCV4
 #include "namespace.hpp"
-#endif
 
 C.context openCvCtx
 
@@ -109,7 +107,6 @@ data ContourApproximationMethod
    | ContourApproximationTC89L1
    | ContourApproximationTC89KCOS
 
-#ifdef OPENCV4
 #num RETR_EXTERNAL
 #num RETR_LIST
 #num RETR_CCOMP
@@ -118,32 +115,6 @@ data ContourApproximationMethod
 #num CHAIN_APPROX_SIMPLE
 #num CHAIN_APPROX_TC89_L1
 #num CHAIN_APPROX_TC89_KCOS
-#else
-#num CV_RETR_EXTERNAL
-#num CV_RETR_LIST
-#num CV_RETR_CCOMP
-#num CV_RETR_TREE
-#num CV_CHAIN_APPROX_NONE
-#num CV_CHAIN_APPROX_SIMPLE
-#num CV_CHAIN_APPROX_TC89_L1
-#num CV_CHAIN_APPROX_TC89_KCOS
-c'RETR_EXTERNAL          :: Num a => a
-c'RETR_LIST              :: Num a => a
-c'RETR_CCOMP             :: Num a => a
-c'RETR_TREE              :: Num a => a
-c'CHAIN_APPROX_NONE      :: Num a => a
-c'CHAIN_APPROX_SIMPLE    :: Num a => a
-c'CHAIN_APPROX_TC89_L1   :: Num a => a
-c'CHAIN_APPROX_TC89_KCOS :: Num a => a
-c'RETR_EXTERNAL          = c'CV_RETR_EXTERNAL
-c'RETR_LIST              = c'CV_RETR_LIST
-c'RETR_CCOMP             = c'CV_RETR_CCOMP
-c'RETR_TREE              = c'CV_RETR_TREE
-c'CHAIN_APPROX_NONE      = c'CV_CHAIN_APPROX_NONE
-c'CHAIN_APPROX_SIMPLE    = c'CV_CHAIN_APPROX_SIMPLE
-c'CHAIN_APPROX_TC89_L1   = c'CV_CHAIN_APPROX_TC89_L1
-c'CHAIN_APPROX_TC89_KCOS = c'CV_CHAIN_APPROX_TC89_KCOS
-#endif
 
 marshalContourRetrievalMode :: ContourRetrievalMode -> Int32
 marshalContourRetrievalMode = \case
diff --git a/opencv/src/OpenCV/Internal/Calib3d/Constants.hsc b/opencv/src/OpenCV/Internal/Calib3d/Constants.hsc
@@ -12,25 +12,10 @@ module OpenCV.Internal.Calib3d.Constants where
 
 #include "namespace.hpp"
 
-#ifdef OPENCV4
 #num FM_7POINT
 #num FM_8POINT
 #num FM_RANSAC
 #num FM_LMEDS
-#else
-#num CV_FM_7POINT
-#num CV_FM_8POINT
-#num CV_FM_RANSAC
-#num CV_FM_LMEDS
-c'FM_7POINT :: Num a => a
-c'FM_8POINT :: Num a => a
-c'FM_RANSAC :: Num a => a
-c'FM_LMEDS  :: Num a => a
-c'FM_7POINT = c'CV_FM_7POINT
-c'FM_8POINT = c'CV_FM_8POINT
-c'FM_RANSAC = c'CV_FM_RANSAC
-c'FM_LMEDS  = c'CV_FM_LMEDS
-#endif
 
 #num LMEDS
 #num RANSAC
diff --git a/opencv/src/OpenCV/Internal/Core/Types/Mat/Depth.hs b/opencv/src/OpenCV/Internal/Core/Types/Mat/Depth.hs
@@ -28,9 +28,6 @@ data Depth =
    | Depth_32S
    | Depth_32F
    | Depth_64F
-#ifndef OPENCV4
-   | Depth_USRTYPE1
-#endif
      deriving (Bounded, Enum, Eq, Show)
 
 --------------------------------------------------------------------------------
diff --git a/opencv/src/OpenCV/Internal/Core/Types/Mat/HMat.hs b/opencv/src/OpenCV/Internal/Core/Types/Mat/HMat.hs
@@ -24,9 +24,6 @@ import "base" Foreign.C.Types
 import "base" Foreign.Ptr ( Ptr )
 import "base" Foreign.Storable ( Storable(..), peekElemOff, pokeElemOff )
 import "base" System.IO.Unsafe ( unsafePerformIO )
-#ifndef OPENCV4
-import qualified "bytestring" Data.ByteString as B
-#endif
 import "linear" Linear.Vector ( zero )
 import "linear" Linear.V4 ( V4(..) )
 import "this" OpenCV.Core.Types
@@ -54,9 +51,6 @@ data HElems
    | HElems_32S      !(VU.Vector Int32)
    | HElems_32F      !(VU.Vector Float)
    | HElems_64F      !(VU.Vector Double)
-#ifndef OPENCV4
-   | HElems_USRTYPE1 !(V.Vector B.ByteString)
-#endif
      deriving (Show, Eq)
 
 hElemsDepth :: HElems -> Depth
@@ -68,9 +62,6 @@ hElemsDepth = \case
     HElems_32S      _v -> Depth_32S
     HElems_32F      _v -> Depth_32F
     HElems_64F      _v -> Depth_64F
-#ifndef OPENCV4
-    HElems_USRTYPE1 _v -> Depth_USRTYPE1
-#endif
 
 hElemsLength :: HElems -> Int
 hElemsLength = \case
@@ -81,9 +72,6 @@ hElemsLength = \case
     HElems_32S      v -> VG.length v
     HElems_32F      v -> VG.length v
     HElems_64F      v -> VG.length v
-#ifndef OPENCV4
-    HElems_USRTYPE1 v -> VG.length v
-#endif
 
 class ToHElems a where
     toHElems :: VU.Vector a -> HElems
@@ -121,9 +109,6 @@ matToHMat mat = unsafePerformIO $ withMatData mat $ \step dataPtr -> do
           Depth_32S -> HElems_32S <$> copyToVec
           Depth_32F -> HElems_32F <$> copyToVec
           Depth_64F -> HElems_64F <$> copyToVec
-#ifndef OPENCV4
-          Depth_USRTYPE1 -> HElems_USRTYPE1 <$> error "todo"
-#endif
       where
         copyToVec :: (Storable a, VU.Unbox a) => IO (VU.Vector a)
         copyToVec = do
@@ -159,9 +144,6 @@ hMatToMatIO (HMat shape channels elems) = do
         HElems_32S      v -> copyFromVec v
         HElems_32F      v -> copyFromVec v
         HElems_64F      v -> copyFromVec v
-#ifndef OPENCV4
-        HElems_USRTYPE1 _v -> error "todo"
-#endif
       where
         copyFromVec :: (Storable a, VU.Unbox a) => VU.Vector a -> IO ()
         copyFromVec v =
diff --git a/opencv/src/OpenCV/Internal/Core/Types/Mat/Marshal.hsc b/opencv/src/OpenCV/Internal/Core/Types/Mat/Marshal.hsc
@@ -32,9 +32,6 @@ import "this" OpenCV.Internal.Core.Types.Mat.Depth
 #num CV_32S
 #num CV_32F
 #num CV_64F
-#ifndef OPENCV4
-#num CV_USRTYPE1
-#endif
 
 marshalDepth :: Depth -> Int32
 marshalDepth = \case
@@ -45,9 +42,6 @@ marshalDepth = \case
     Depth_32S      -> c'CV_32S
     Depth_32F      -> c'CV_32F
     Depth_64F      -> c'CV_64F
-#ifndef OPENCV4
-    Depth_USRTYPE1 -> c'CV_USRTYPE1
-#endif
 
 unmarshalDepth :: Int32 -> Depth
 unmarshalDepth n
@@ -58,9 +52,6 @@ unmarshalDepth n
     | n == c'CV_32S      = Depth_32S
     | n == c'CV_32F      = Depth_32F
     | n == c'CV_64F      = Depth_64F
-#ifndef OPENCV4
-    | n == c'CV_USRTYPE1 = Depth_USRTYPE1
-#endif
     | otherwise          = error $ "unknown depth " <> show n
 
 #num CV_CN_SHIFT
diff --git a/opencv/src/OpenCV/Internal/Exception.hs b/opencv/src/OpenCV/Internal/Exception.hs
@@ -142,9 +142,6 @@ displayDepth depth = show depth ++ " (" ++ haskellDepth ++ ")"
         Depth_32S -> "Int32"
         Depth_32F -> "Float"
         Depth_64F -> "Double"
-#ifndef OPENCV4
-        Depth_USRTYPE1 -> "not supported in Haskell"
-#endif
 
 newtype CvCppException = CvCppException { unCvCppException :: ForeignPtr (C CvCppException) }
 
diff --git a/opencv/src/OpenCV/JSON.hs b/opencv/src/OpenCV/JSON.hs
@@ -21,11 +21,6 @@ import "this" OpenCV.Core.Types.Mat.HMat
 import "this" OpenCV.TypeLevel
 import "transformers" Control.Monad.Trans.Except
 
-#ifndef OPENCV4
-import qualified "base64-bytestring" Data.ByteString.Base64 as B64 ( encode, decode )
-import qualified "text" Data.Text.Encoding as TE ( encodeUtf8, decodeUtf8 )
-#endif
-
 --------------------------------------------------------------------------------
 
 newtype J a = J {unJ :: a}
@@ -91,9 +86,6 @@ instance ToJSON HElems where
         HElems_32S      v -> f "32S" v
         HElems_32F      v -> f "32F" v
         HElems_64F      v -> f "64F" v
-#ifndef OPENCV4
-        HElems_USRTYPE1 v -> f "USR" $ fmap (TE.decodeUtf8 . B64.encode) v
-#endif
       where
         f :: (ToJSON a) => Text -> a -> Value
         f typ v = object [ "type"  .= typ
@@ -113,9 +105,6 @@ instance FromJSON HElems where
                     "32S" -> HElems_32S      <$> elems
                     "32F" -> HElems_32F      <$> elems
                     "64F" -> HElems_64F      <$> elems
-#ifndef OPENCV4
-                    "USR" -> HElems_USRTYPE1 <$> (mapM (either fail pure . B64.decode . TE.encodeUtf8) =<< elems)
-#endif
                     _ -> fail $ "Unknown Helems type " <> T.unpack typ
 
 --------------------------------------------------------------------------------
diff --git a/opencv/src/OpenCV/Video.hsc b/opencv/src/OpenCV/Video.hsc
@@ -35,9 +35,7 @@ C.using "namespace cv"
 
 --------------------------------------------------------------------------------
 
-#ifdef OPENCV4
 {-# DEPRECATED estimateRigidTransform "Use estimateAffine2D or estimateAffinePartial2D instead" #-}
-#endif
 
 -- | Computes an optimal affine transformation between two 2D point sets
 --
