Skip to content

Commit 26f3b2c

Browse files
rainylrainyl
authored
Merge pull request #142 from rainyl/fix-getter-setter
Fix getter setter, Clean code
2 parents 1e34a0a + 469dc44 commit 26f3b2c

15 files changed

+106
-179
lines changed

‎lib/opencv_dart.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ export 'src/core/rng.dart';
3333
export 'src/core/rng_async.dart';
3434
export 'src/core/scalar.dart';
3535
export 'src/core/size.dart';
36+
export 'src/core/termcriteria.dart';
3637
export 'src/core/vec.dart';
38+
3739
export 'src/dnn/dnn.dart';
3840
export 'src/dnn/dnn_async.dart';
3941
export 'src/features2d/features2d.dart';

‎lib/src/contrib/img_hash.dart

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -149,22 +149,6 @@ class BlockMeanHash extends CvStruct<cvg.BlockMeanHash> implements ImgHashBase {
149149
});
150150
}
151151

152-
/// STATIC Compare compares the hash value between a and b using BlockMeanHash.
153-
///
154-
/// For further information, see:
155-
/// https://docs.opencv.org/master/de/d29/classcv_1_1img__hash_1_1ImgHashBase.html#a444a3e9ec792cf029385809393f84ad5
156-
static double compareS(
157-
InputArray hashOne,
158-
InputArray hashTwo, [
159-
int mode = 0,
160-
]) {
161-
return using<double>((arena) {
162-
final p = arena<ffi.Double>();
163-
cvRun(() => CFFI.blockMeanHashCompare(hashOne.ref, hashTwo.ref, mode, p));
164-
return p.value;
165-
});
166-
}
167-
168152
/// Compute computes hash of the input image using BlockMeanHash.
169153
///
170154
/// For further information, see:
@@ -176,16 +160,6 @@ class BlockMeanHash extends CvStruct<cvg.BlockMeanHash> implements ImgHashBase {
176160
return outputArr ?? Mat.fromPointer(p);
177161
}
178162

179-
/// STATIC Compute computes hash of the input image using BlockMeanHash.
180-
///
181-
/// For further information, see:
182-
/// https://docs.opencv.org/master/de/d29/classcv_1_1img__hash_1_1ImgHashBase.html#ae2d9288db370089dfd8aab85d5e0b0f3
183-
static Mat computeS(InputArray inputArr, {OutputArray? outputArr, int mode = 0}) {
184-
final p = outputArr?.ptr ?? calloc<cvg.Mat>();
185-
cvRun(() => CFFI.blockMeanHashCompute(inputArr.ref, p, mode));
186-
return outputArr ?? Mat.fromPointer(p);
187-
}
188-
189163
/// https://docs.opencv.org/4.x/df/d55/classcv_1_1img__hash_1_1BlockMeanHash.html#ad5aef85f58315551cac14bcabe05f0c3
190164
List<double> getMean() {
191165
return using<List<double>>((arena) {
@@ -208,21 +182,6 @@ class BlockMeanHash extends CvStruct<cvg.BlockMeanHash> implements ImgHashBase {
208182
doubleCompleter,
209183
);
210184

211-
Future<double> compareSAsync(
212-
InputArray hashOne,
213-
InputArray hashTwo, [
214-
int mode = 0,
215-
]) async =>
216-
cvRunAsync<double>(
217-
(callback) => CFFI.BlockMeanHash_Compare_Async(
218-
ref,
219-
hashOne.ref,
220-
hashTwo.ref,
221-
callback,
222-
),
223-
doubleCompleter,
224-
);
225-
226185
@override
227186
Future<Mat> computeAsync(InputArray inputArr) async => cvRunAsync1<Mat>(
228187
(callback) => CFFI.BlockMeanHash_Compute_Async(
@@ -233,15 +192,6 @@ class BlockMeanHash extends CvStruct<cvg.BlockMeanHash> implements ImgHashBase {
233192
matCompleter,
234193
);
235194

236-
Future<Mat> computeSAsync(InputArray inputArr, [int mode = 0]) async => cvRunAsync<Mat>(
237-
(callback) => CFFI.BlockMeanHash_Compute_Async(
238-
ref,
239-
inputArr.ref,
240-
callback,
241-
),
242-
matCompleter,
243-
);
244-
245195
Future<VecDouble> getMeanAsync() async => cvRunAsync<VecDouble>(
246196
(callback) => CFFI.BlockMeanHash_GetMean_Async(ref, callback),
247197
vecDoubleCompleter,

‎lib/src/core/cv_vec.dart

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,3 +1244,15 @@ class VecVec6fIterator extends VecIterator<Vec6f> {
12441244
return Vec6f.fromPointer(p);
12451245
}
12461246
}
1247+
1248+
extension VecVec4iExtension on List<Vec4i> {
1249+
VecVec4i get cvd => VecVec4i.fromList(this);
1250+
}
1251+
1252+
extension VecVec4fExtension on List<Vec4f> {
1253+
VecVec4f get cvd => VecVec4f.fromList(this);
1254+
}
1255+
1256+
extension VecVec6fExtension on List<Vec6f> {
1257+
VecVec6f get cvd => VecVec6f.fromList(this);
1258+
}

‎lib/src/core/size.dart

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class Size2f extends CvStruct<cvg.Size2f> {
8383
}
8484

8585
@override
86-
List<Object?> get props => [width, height];
86+
List<double> get props => [width, height];
8787

8888
@override
8989
cvg.Size2f get ref => ptr.ref;
@@ -95,11 +95,9 @@ class Size2f extends CvStruct<cvg.Size2f> {
9595
}
9696

9797
extension RecordSizeExtension1 on (int, int) {
98-
Size toSize() => Size(this.$1, this.$2);
99-
Size get cvd => Size(this.$1, this.$2);
98+
Size get cvd => Size.fromRecord(this);
10099
}
101100

102101
extension RecordSize2fExtension1 on (double, double) {
103-
Size2f toSize2f() => Size2f(this.$1, this.$2);
104-
Size2f get cvd => Size2f(this.$1, this.$2);
102+
Size2f get cvd => Size2f.fromRecord(this);
105103
}

‎lib/src/core/termcriteria.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class TermCriteria extends CvStruct<cvg.TermCriteria> {
4141
double get eps => ref.epsilon;
4242

4343
@override
44-
List<Object?> get props => [type, maxCount, eps];
44+
List<num> get props => [type, maxCount, eps];
4545

4646
@override
4747
cvg.TermCriteria get ref => ptr.ref;

‎lib/src/dnn/dnn_async.dart

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// ignore_for_file: non_constant_identifier_names
2+
13
library cv;
24

35
import 'dart:ffi' as ffi;
@@ -16,30 +18,6 @@ import '../opencv.g.dart' as cvg;
1618
import './dnn.dart';
1719

1820
extension LayerAsync on Layer {
19-
Future<String> get nameAsync async {
20-
final rval = cvRunAsync<String>(
21-
(callback) => CFFI.Layer_GetName_Async(ref, callback),
22-
(c, p) {
23-
final rval = p.cast<ffi.Pointer<ffi.Char>>().value.toDartString();
24-
calloc.free(p);
25-
return c.complete(rval);
26-
},
27-
);
28-
return rval;
29-
}
30-
31-
Future<String> get typeAsync async {
32-
final rval = cvRunAsync<String>(
33-
(callback) => CFFI.Layer_GetType_Async(ref, callback),
34-
(c, p) {
35-
final rval = p.cast<ffi.Pointer<ffi.Char>>().value.toDartString();
36-
calloc.free(p);
37-
return c.complete(rval);
38-
},
39-
);
40-
return rval;
41-
}
42-
4321
Future<int> inputNameToIndexAsync(String name) async {
4422
final cName = name.toNativeUtf8().cast<ffi.Char>();
4523
final rval = await cvRunAsync<int>(

‎lib/src/objdetect/objdetect.dart

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -867,28 +867,9 @@ class FaceRecognizerSF extends CvStruct<cvg.FaceRecognizerSF> {
867867
finalizer.attach(this, ptr.cast(), detach: this);
868868
}
869869
}
870-
factory FaceRecognizerSF.fromPointer(
871-
cvg.FaceRecognizerSFPtr ptr, [
872-
bool attach = true,
873-
]) =>
870+
factory FaceRecognizerSF.fromPointer(cvg.FaceRecognizerSFPtr ptr, [bool attach = true]) =>
874871
FaceRecognizerSF._(ptr, attach);
875872

876-
@Deprecated("Use FaceRecognizerSF.fromFile instead, will be removed in 1.1.0")
877-
factory FaceRecognizerSF.newRecognizer(
878-
String model,
879-
String config,
880-
int backendId,
881-
int targetId,
882-
) {
883-
final p = calloc<cvg.FaceRecognizerSF>();
884-
final cModel = model.toNativeUtf8().cast<ffi.Char>();
885-
final cConfig = config.toNativeUtf8().cast<ffi.Char>();
886-
cvRun(() => CFFI.FaceRecognizerSF_New(cModel, cConfig, backendId, targetId, p));
887-
calloc.free(cModel);
888-
calloc.free(cConfig);
889-
return FaceRecognizerSF._(p);
890-
}
891-
892873
/// Creates an instance of this class with given parameters.
893874
///
894875
/// [model] the path of the onnx model used for face recognition

‎lib/src/opencv.g.dart

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -30224,46 +30224,6 @@ class CvNative {
3022430224
late final _averageHashCompute_Async = _averageHashCompute_AsyncPtr
3022530225
.asFunction<ffi.Pointer<CvStatus> Function(Mat, CvCallback_1)>();
3022630226

30227-
ffi.Pointer<CvStatus> blockMeanHashCompare(
30228-
Mat a,
30229-
Mat b,
30230-
int mode,
30231-
ffi.Pointer<ffi.Double> rval,
30232-
) {
30233-
return _blockMeanHashCompare(
30234-
a,
30235-
b,
30236-
mode,
30237-
rval,
30238-
);
30239-
}
30240-
30241-
late final _blockMeanHashComparePtr = _lookup<
30242-
ffi.NativeFunction<
30243-
ffi.Pointer<CvStatus> Function(Mat, Mat, ffi.Int,
30244-
ffi.Pointer<ffi.Double>)>>('blockMeanHashCompare');
30245-
late final _blockMeanHashCompare = _blockMeanHashComparePtr.asFunction<
30246-
ffi.Pointer<CvStatus> Function(Mat, Mat, int, ffi.Pointer<ffi.Double>)>();
30247-
30248-
ffi.Pointer<CvStatus> blockMeanHashCompute(
30249-
Mat inputArr,
30250-
ffi.Pointer<Mat> outputArr,
30251-
int mode,
30252-
) {
30253-
return _blockMeanHashCompute(
30254-
inputArr,
30255-
outputArr,
30256-
mode,
30257-
);
30258-
}
30259-
30260-
late final _blockMeanHashComputePtr = _lookup<
30261-
ffi.NativeFunction<
30262-
ffi.Pointer<CvStatus> Function(
30263-
Mat, ffi.Pointer<Mat>, ffi.Int)>>('blockMeanHashCompute');
30264-
late final _blockMeanHashCompute = _blockMeanHashComputePtr
30265-
.asFunction<ffi.Pointer<CvStatus> Function(Mat, ffi.Pointer<Mat>, int)>();
30266-
3026730227
ffi.Pointer<CvStatus> calibrateCamera_Async(
3026830228
VecVecPoint3f objectPoints,
3026930229
VecVecPoint2f imagePoints,

‎lib/src/video/videoio_async.dart

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,6 @@ extension VideoCaptureAsync on VideoCapture {
3535
(completer, p) => completer.complete(VideoCapture.fromPointer(p.cast<cvg.VideoCapture>())),
3636
);
3737

38-
/// Returns the specified [VideoCapture] property.
39-
///
40-
/// https://docs.opencv.org/4.x/d8/dfe/classcv_1_1VideoCapture.html#aa6480e6972ef4c00d74814ec841a2939
41-
Future<double> getAsync(int propId) async =>
42-
cvRunAsync((callback) => CFFI.VideoCapture_Get_Async(ref, propId, callback), doubleCompleter);
43-
44-
Future<bool> setAsync(int prop, double value) async => cvRunAsync(
45-
(callback) => CFFI.VideoCapture_Set_Async(ref, prop, value, callback),
46-
boolCompleter,
47-
);
48-
4938
// String getBackendName()=>CFFI.videocapture
5039

5140
/// Grabs the next frame from video file or capturing device.

‎src/extra/img_hash.cpp

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ CvStatus *BlockMeanHash_SetMode(BlockMeanHash self, int mode) {
4242
BEGIN_WRAP(*self.ptr)->setMode(mode);
4343
END_WRAP
4444
}
45+
4546
void BlockMeanHash_Close(BlockMeanHashPtr self) {
4647
self->ptr->reset();
4748
CVD_FREE(self);
@@ -59,18 +60,6 @@ CvStatus *BlockMeanHash_Compare(BlockMeanHash self, Mat hashOne, Mat hashTwo, do
5960
*rval = (self.ptr)->get()->compare(*hashOne.ptr, *hashTwo.ptr);
6061
END_WRAP
6162
}
62-
CvStatus *blockMeanHashCompute(Mat inputArr, Mat *outputArr, int mode) {
63-
BEGIN_WRAP
64-
cv::Mat dst;
65-
cv::img_hash::blockMeanHash(*inputArr.ptr, dst, mode);
66-
*outputArr = {new cv::Mat(dst)};
67-
END_WRAP
68-
}
69-
CvStatus *blockMeanHashCompare(Mat a, Mat b, int mode, double *rval) {
70-
BEGIN_WRAP
71-
*rval = cv::img_hash::BlockMeanHash::create(mode)->compare(*a.ptr, *b.ptr);
72-
END_WRAP
73-
}
7463

7564
CvStatus *colorMomentHashCompute(Mat inputArr, Mat *outputArr) {
7665
BEGIN_WRAP

‎src/extra/img_hash.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ CvStatus *BlockMeanHash_SetMode(BlockMeanHash self, int mode);
5050
void BlockMeanHash_Close(BlockMeanHashPtr self);
5151
CvStatus *BlockMeanHash_Compute(BlockMeanHash self, Mat inputArr, Mat *outputArr);
5252
CvStatus *BlockMeanHash_Compare(BlockMeanHash self, Mat hashOne, Mat hashTwo, double *rval);
53-
CvStatus *blockMeanHashCompute(Mat inputArr, Mat *outputArr, int mode);
54-
CvStatus *blockMeanHashCompare(Mat a, Mat b, int mode, double *rval);
5553

5654
CvStatus *colorMomentHashCompute(Mat inputArr, Mat *outputArr);
5755
CvStatus *colorMomentHashCompare(Mat a, Mat b, double *rval);

‎test/contrib/img_hash_async_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Future<void> testHashAsync(cv.ImgHashBase hashAlgorithm) async {
2929
}
3030

3131
void main() async {
32-
test('cv.PHash', () async => await testHashAsync(cv.PHash()));
32+
test('cv.PHash', () async => testHashAsync(cv.PHash()));
3333
test('cv.AverageHash', () async => testHashAsync(cv.AverageHash()));
3434
test('cv.BlockMeanHash', () async => testHashAsync(cv.BlockMeanHash()));
3535
test('cv.ColorMomentHash', () async => testHashAsync(cv.ColorMomentHash()));

‎test/core/others_test.dart

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,4 +270,80 @@ void main() {
270270

271271
vec.dispose();
272272
});
273+
274+
test('cv.VecVec4i', () {
275+
final v = [
276+
cv.Vec4i(1, 2, 3, 4),
277+
cv.Vec4i(5, 6, 7, 8),
278+
cv.Vec4i(9, 10, 11, 12),
279+
cv.Vec4i(13, 14, 15, 16),
280+
];
281+
final vv = v.cvd;
282+
expect(vv.length, v.length);
283+
expect(vv.first, cv.Vec4i(1, 2, 3, 4));
284+
expect(vv.last, cv.Vec4i(13, 14, 15, 16));
285+
286+
vv.dispose();
287+
});
288+
289+
test('cv.VecVec4f', () {
290+
final v = [
291+
cv.Vec4f(1, 2, 3, 4),
292+
cv.Vec4f(5, 6, 7, 8),
293+
cv.Vec4f(9, 10, 11, 12),
294+
cv.Vec4f(13, 14, 15, 16),
295+
];
296+
final vv = v.cvd;
297+
expect(vv.length, v.length);
298+
expect(vv.first, cv.Vec4f(1, 2, 3, 4));
299+
expect(vv.last, cv.Vec4f(13, 14, 15, 16));
300+
301+
vv.dispose();
302+
});
303+
304+
test('cv.VecVec6f', () {
305+
final v = [
306+
cv.Vec6f(1, 2, 3, 4, 5, 6),
307+
cv.Vec6f(5, 6, 7, 8, 9, 10),
308+
cv.Vec6f(9, 10, 11, 12, 13, 14),
309+
cv.Vec6f(13, 14, 15, 16, 17, 18),
310+
];
311+
final vv = v.cvd;
312+
expect(vv.length, v.length);
313+
expect(vv.first, cv.Vec6f(1, 2, 3, 4, 5, 6));
314+
expect(vv.last, cv.Vec6f(13, 14, 15, 16, 17, 18));
315+
316+
vv.dispose();
317+
});
318+
319+
test('cv.Size', () {
320+
const sz = (241, 241);
321+
final cvSize = sz.cvd;
322+
final cvSize1 = cv.Size.fromRecord(sz);
323+
expect(cvSize1, cvSize);
324+
325+
cvSize1.dispose();
326+
});
327+
328+
test('cv.Size2f', () {
329+
const sz0 = (241, 241);
330+
const sz = (241.0, 241.0);
331+
final cvSize = sz.cvd;
332+
final cvSize1 = cv.Size2f.fromRecord(sz);
333+
final cvSize2 = cv.Size2f.fromSize(sz0.cvd);
334+
expect(cvSize1, cvSize);
335+
expect(cvSize2.width, closeTo(sz0.$1, 1e-6));
336+
337+
cvSize2.dispose();
338+
});
339+
340+
test('cv.TermCriteria', () {
341+
const tc = (cv.TERM_COUNT, 10, 0.01);
342+
final cvTc = tc.cvd;
343+
expect(cvTc.type, tc.$1);
344+
expect(cvTc.maxCount, tc.$2);
345+
expect(cvTc.eps, closeTo(tc.$3, 1e-6));
346+
347+
cvTc.dispose();
348+
});
273349
}

0 commit comments

Comments
 (0)