From 177fbc7bbb554e973a16f9bd62841d2c0256d658 Mon Sep 17 00:00:00 2001 From: Giles Payne Date: Tue, 16 Jun 2020 08:15:27 +0900 Subject: [PATCH] Cleanup unneeded raw pointer handling code --- modules/core/misc/objc/common/CVObjcUtil.h | 2 -- modules/core/misc/objc/common/Mat.h | 1 - 2 files changed, 3 deletions(-) diff --git a/modules/core/misc/objc/common/CVObjcUtil.h b/modules/core/misc/objc/common/CVObjcUtil.h index be28f75..9d7d986 100644 --- a/modules/core/misc/objc/common/CVObjcUtil.h +++ b/modules/core/misc/objc/common/CVObjcUtil.h @@ -15,8 +15,6 @@ typedef union { float f; int32_t i; } V32; #ifdef __cplusplus #import -#define MAKE_PTR(t) (*((cv::Ptr*)self.nativePtr)) - template std::vector objc2cv(NSArray* _Nonnull array, CV& (* _Nonnull converter)(OBJC* _Nonnull)) { std::vector ret; for (OBJC* obj in array) { diff --git a/modules/core/misc/objc/common/Mat.h b/modules/core/misc/objc/common/Mat.h index ece6dd2..1542309 100644 --- a/modules/core/misc/objc/common/Mat.h +++ b/modules/core/misc/objc/common/Mat.h @@ -33,7 +33,6 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - Constructors - (instancetype)init; -- (void)dealloc; #ifdef __cplusplus - (instancetype)initWithNativeMat:(cv::Ptr)nativeMat; + (instancetype)fromNativePtr:(cv::Ptr)nativePtr; -- 2.7.4