Skip to content

Commit 0c1d670

Browse files
rainylrainyl
committed
format code
1 parent 5ee9cc3 commit 0c1d670

36 files changed

+1345
-1275
lines changed

Diff for: ‎packages/dartcv/hook/build.dart

+3-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@ Future<void> _builder(BuildInput input, BuildOutputBuilder output) async {
2020
final packagePath = Uri.directory(await getPackagePath(packageName));
2121
final sourceDir = packagePath.resolve('src/');
2222
// final outDir = Uri.directory(packagePath).resolve('build/');
23-
final logger =
24-
Logger("")
25-
..level = Level.ALL
26-
..onRecord.listen((record) => stderr.writeln(record.message));
23+
final logger = Logger("")
24+
..level = Level.ALL
25+
..onRecord.listen((record) => stderr.writeln(record.message));
2726
// ..onRecord.listen((record) => print(record.message));
2827

2928
final exModsDefault = parseUserDefinedExcludeModules(packagePath.resolve("pubspec.yaml").toFilePath());

Diff for: ‎packages/dartcv/lib/src/calib3d/fisheye.dart

+36-38
Original file line numberDiff line numberDiff line change
@@ -107,25 +107,24 @@ class Fisheye {
107107
distorted ??= Mat.empty();
108108

109109
cvRun(
110-
() =>
111-
Kundistorted == null
112-
? ccalib3d.cv_fisheye_distortPoints(
113-
undistorted.ref,
114-
distorted!.ref,
115-
K.ref,
116-
D.ref,
117-
alpha,
118-
ffi.nullptr,
119-
)
120-
: ccalib3d.cv_fisheye_distortPoints_1(
121-
undistorted.ref,
122-
distorted!.ref,
123-
Kundistorted.ref,
124-
K.ref,
125-
D.ref,
126-
alpha,
127-
ffi.nullptr,
128-
),
110+
() => Kundistorted == null
111+
? ccalib3d.cv_fisheye_distortPoints(
112+
undistorted.ref,
113+
distorted!.ref,
114+
K.ref,
115+
D.ref,
116+
alpha,
117+
ffi.nullptr,
118+
)
119+
: ccalib3d.cv_fisheye_distortPoints_1(
120+
undistorted.ref,
121+
distorted!.ref,
122+
Kundistorted.ref,
123+
K.ref,
124+
D.ref,
125+
alpha,
126+
ffi.nullptr,
127+
),
129128
);
130129
return distorted;
131130
}
@@ -142,25 +141,24 @@ class Fisheye {
142141
distorted ??= Mat.empty();
143142

144143
return cvRunAsync0(
145-
(callback) =>
146-
Kundistorted == null
147-
? ccalib3d.cv_fisheye_distortPoints(
148-
undistorted.ref,
149-
distorted!.ref,
150-
K.ref,
151-
D.ref,
152-
alpha,
153-
callback,
154-
)
155-
: ccalib3d.cv_fisheye_distortPoints_1(
156-
undistorted.ref,
157-
distorted!.ref,
158-
Kundistorted.ref,
159-
K.ref,
160-
D.ref,
161-
alpha,
162-
callback,
163-
),
144+
(callback) => Kundistorted == null
145+
? ccalib3d.cv_fisheye_distortPoints(
146+
undistorted.ref,
147+
distorted!.ref,
148+
K.ref,
149+
D.ref,
150+
alpha,
151+
callback,
152+
)
153+
: ccalib3d.cv_fisheye_distortPoints_1(
154+
undistorted.ref,
155+
distorted!.ref,
156+
Kundistorted.ref,
157+
K.ref,
158+
D.ref,
159+
alpha,
160+
callback,
161+
),
164162
(c) => c.complete(distorted),
165163
);
166164
}

Diff for: ‎packages/dartcv/lib/src/calib3d/usac_params.dart

+14-15
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,20 @@ class UsacParams extends CvStruct<cvg.UsacParams> {
2626
int finalPolisher = NONE_POLISHER,
2727
int finalPolisherIterations = 0,
2828
}) {
29-
final p =
30-
calloc<cvg.UsacParams>()
31-
..ref.confidence = confidence
32-
..ref.isParallel = isParallel
33-
..ref.loIterations = loIterations
34-
..ref.loMethod = loMethod
35-
..ref.loSampleSize = loSampleSize
36-
..ref.maxIterations = maxIterations
37-
..ref.neighborsSearch = neighborsSearch
38-
..ref.randomGeneratorState = randomGeneratorState
39-
..ref.sampler = sampler
40-
..ref.score = score
41-
..ref.threshold = threshold
42-
..ref.final_polisher = finalPolisher
43-
..ref.final_polisher_iterations = finalPolisherIterations;
29+
final p = calloc<cvg.UsacParams>()
30+
..ref.confidence = confidence
31+
..ref.isParallel = isParallel
32+
..ref.loIterations = loIterations
33+
..ref.loMethod = loMethod
34+
..ref.loSampleSize = loSampleSize
35+
..ref.maxIterations = maxIterations
36+
..ref.neighborsSearch = neighborsSearch
37+
..ref.randomGeneratorState = randomGeneratorState
38+
..ref.sampler = sampler
39+
..ref.score = score
40+
..ref.threshold = threshold
41+
..ref.final_polisher = finalPolisher
42+
..ref.final_polisher_iterations = finalPolisherIterations;
4443
return UsacParams.fromPointer(p);
4544
}
4645

Diff for: ‎packages/dartcv/lib/src/contrib/aruco.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Mat arucoGenerateImageMarker(
105105

106106
class ArucoDetectorParameters extends CvStruct<ccontrib.ArucoDetectorParams> {
107107
ArucoDetectorParameters._(ccontrib.ArucoDetectorParamsPtr ptr, [bool attach = true])
108-
: super.fromPointer(ptr) {
108+
: super.fromPointer(ptr) {
109109
if (attach) {
110110
finalizer.attach(this, ptr.cast(), detach: this);
111111
}

Diff for: ‎packages/dartcv/lib/src/contrib/img_hash.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ const int BLOCK_MEAN_HASH_MODE_1 = 1;
133133
/// BlockMeanHash is implementation of the BlockMeanHash algorithm.
134134
class BlockMeanHash extends CvStruct<ccontrib.BlockMeanHash> implements ImgHashBase {
135135
BlockMeanHash._(ccontrib.BlockMeanHashPtr ptr, [this._mode = BLOCK_MEAN_HASH_MODE_0, bool attach = true])
136-
: super.fromPointer(ptr) {
136+
: super.fromPointer(ptr) {
137137
if (attach) {
138138
finalizer.attach(this, ptr.cast(), detach: this);
139139
}

Diff for: ‎packages/dartcv/lib/src/contrib/quality.dart

+7-4
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,13 @@ class QualityBRISQUE extends CvStruct<ccontrib.QualityBRISQUE> {
9292
}
9393

9494
/// async version of [computeFeatures]
95-
static Future<Mat> computeFeaturesAsync(Mat img, {Mat? features}) async => cvRunAsync0<Mat>((callback) {
96-
features ??= Mat.empty();
97-
return ccontrib.cv_quality_QualityBRISQUE_computeFeatures_static(img.ref, features!.ref, callback);
98-
}, (c) => c.complete(features));
95+
static Future<Mat> computeFeaturesAsync(Mat img, {Mat? features}) async => cvRunAsync0<Mat>(
96+
(callback) {
97+
features ??= Mat.empty();
98+
return ccontrib.cv_quality_QualityBRISQUE_computeFeatures_static(img.ref, features!.ref, callback);
99+
},
100+
(c) => c.complete(features),
101+
);
99102

100103
static final finalizer = OcvFinalizer<ccontrib.QualityBRISQUEPtr>(
101104
ccontrib.addresses.cv_quality_QualityBRISQUE_close,

Diff for: ‎packages/dartcv/lib/src/contrib/ximgproc.dart

+41-42
Original file line numberDiff line numberDiff line change
@@ -377,19 +377,19 @@ class EdgeBoxes extends CvStruct<ccontrib.EdgeBoxes> {
377377

378378
@override
379379
List<num> get props => [
380-
alpha,
381-
beta,
382-
eta,
383-
minScore,
384-
maxBoxes,
385-
edgeMinMag,
386-
edgeMergeThr,
387-
clusterMinMag,
388-
maxAspectRatio,
389-
minBoxArea,
390-
gamma,
391-
kappa,
392-
];
380+
alpha,
381+
beta,
382+
eta,
383+
minScore,
384+
maxBoxes,
385+
edgeMinMag,
386+
edgeMergeThr,
387+
clusterMinMag,
388+
maxAspectRatio,
389+
minBoxArea,
390+
gamma,
391+
kappa,
392+
];
393393

394394
@override
395395
ccontrib.EdgeBoxes get ref => ptr.ref;
@@ -589,21 +589,20 @@ class EdgeDrawingParams extends CvStruct<ccontrib.EdgeDrawingParams> {
589589
double Sigma = 1.0,
590590
bool SumFlag = true,
591591
}) {
592-
final p =
593-
calloc<ccontrib.EdgeDrawingParams>()
594-
..ref.AnchorThresholdValue = AnchorThresholdValue
595-
..ref.EdgeDetectionOperator = EdgeDetectionOperator
596-
..ref.GradientThresholdValue = GradientThresholdValue
597-
..ref.LineFitErrorThreshold = LineFitErrorThreshold
598-
..ref.MaxDistanceBetweenTwoLines = MaxDistanceBetweenTwoLines
599-
..ref.MaxErrorThreshold = MaxErrorThreshold
600-
..ref.MinLineLength = MinLineLength
601-
..ref.MinPathLength = MinPathLength
602-
..ref.NFAValidation = NFAValidation
603-
..ref.PFmode = PFmode
604-
..ref.ScanInterval = ScanInterval
605-
..ref.Sigma = Sigma
606-
..ref.SumFlag = SumFlag;
592+
final p = calloc<ccontrib.EdgeDrawingParams>()
593+
..ref.AnchorThresholdValue = AnchorThresholdValue
594+
..ref.EdgeDetectionOperator = EdgeDetectionOperator
595+
..ref.GradientThresholdValue = GradientThresholdValue
596+
..ref.LineFitErrorThreshold = LineFitErrorThreshold
597+
..ref.MaxDistanceBetweenTwoLines = MaxDistanceBetweenTwoLines
598+
..ref.MaxErrorThreshold = MaxErrorThreshold
599+
..ref.MinLineLength = MinLineLength
600+
..ref.MinPathLength = MinPathLength
601+
..ref.NFAValidation = NFAValidation
602+
..ref.PFmode = PFmode
603+
..ref.ScanInterval = ScanInterval
604+
..ref.Sigma = Sigma
605+
..ref.SumFlag = SumFlag;
607606
return EdgeDrawingParams.fromPointer(p);
608607
}
609608

@@ -650,20 +649,20 @@ class EdgeDrawingParams extends CvStruct<ccontrib.EdgeDrawingParams> {
650649

651650
@override
652651
List<Object?> get props => [
653-
AnchorThresholdValue,
654-
EdgeDetectionOperator,
655-
GradientThresholdValue,
656-
LineFitErrorThreshold,
657-
MaxDistanceBetweenTwoLines,
658-
MaxErrorThreshold,
659-
MinLineLength,
660-
MinPathLength,
661-
NFAValidation,
662-
PFmode,
663-
ScanInterval,
664-
Sigma,
665-
SumFlag,
666-
];
652+
AnchorThresholdValue,
653+
EdgeDetectionOperator,
654+
GradientThresholdValue,
655+
LineFitErrorThreshold,
656+
MaxDistanceBetweenTwoLines,
657+
MaxErrorThreshold,
658+
MinLineLength,
659+
MinPathLength,
660+
NFAValidation,
661+
PFmode,
662+
ScanInterval,
663+
Sigma,
664+
SumFlag,
665+
];
667666

668667
@override
669668
ccontrib.EdgeDrawingParams get ref => ptr.ref;

Diff for: ‎packages/dartcv/lib/src/core/base.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,8 @@ void cvAssert(bool condition, [String? msg]) {
209209
}
210210

211211
// finalizers
212-
typedef NativeFinalizerFunctionT<T extends ffi.NativeType> =
213-
ffi.Pointer<ffi.NativeFunction<ffi.Void Function(T token)>>;
212+
typedef NativeFinalizerFunctionT<T extends ffi.NativeType>
213+
= ffi.Pointer<ffi.NativeFunction<ffi.Void Function(T token)>>;
214214

215215
ffi.NativeFinalizer OcvFinalizer<T extends ffi.NativeType>(NativeFinalizerFunctionT<T> func) =>
216216
ffi.NativeFinalizer(func.cast<ffi.NativeFinalizerFunction>());

Diff for: ‎packages/dartcv/lib/src/core/core_async.dart

+26-26
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,13 @@ Future<Mat> bitwiseANDAsync(InputArray src1, InputArray src2, {OutputArray? dst,
8080
dst ??= Mat.empty();
8181
return mask == null
8282
? cvRunAsync0((callback) => ccore.cv_bitwise_and(src1.ref, src2.ref, dst!.ref, callback), (c) {
83-
return c.complete(dst);
84-
})
83+
return c.complete(dst);
84+
})
8585
: cvRunAsync0((callback) => ccore.cv_bitwise_and_1(src1.ref, src2.ref, dst!.ref, mask.ref, callback), (
86-
c,
87-
) {
88-
return c.complete(dst);
89-
});
86+
c,
87+
) {
88+
return c.complete(dst);
89+
});
9090
}
9191

9292
/// BitwiseNot inverts every bit of an array.
@@ -97,11 +97,11 @@ Future<Mat> bitwiseNOTAsync(InputArray src, {OutputArray? dst, InputArray? mask}
9797
dst ??= Mat.empty();
9898
return mask == null
9999
? cvRunAsync0((callback) => ccore.cv_bitwise_not(src.ref, dst!.ref, callback), (c) {
100-
return c.complete(dst);
101-
})
100+
return c.complete(dst);
101+
})
102102
: cvRunAsync0((callback) => ccore.cv_bitwise_not_1(src.ref, dst!.ref, mask.ref, callback), (c) {
103-
return c.complete(dst);
104-
});
103+
return c.complete(dst);
104+
});
105105
}
106106

107107
/// BitwiseOr calculates the per-element bit-wise disjunction of two arrays
@@ -113,13 +113,13 @@ Future<Mat> bitwiseORAsync(InputArray src1, InputArray src2, {OutputArray? dst,
113113
dst ??= Mat.empty();
114114
return mask == null
115115
? cvRunAsync0((callback) => ccore.cv_bitwise_or(src1.ref, src2.ref, dst!.ref, callback), (c) {
116-
return c.complete(dst);
117-
})
116+
return c.complete(dst);
117+
})
118118
: cvRunAsync0((callback) => ccore.cv_bitwise_or_1(src1.ref, src2.ref, dst!.ref, mask.ref, callback), (
119-
c,
120-
) {
121-
return c.complete(dst);
122-
});
119+
c,
120+
) {
121+
return c.complete(dst);
122+
});
123123
}
124124

125125
/// BitwiseXor calculates the per-element bit-wise "exclusive or" operation
@@ -131,13 +131,13 @@ Future<Mat> bitwiseXORAsync(InputArray src1, InputArray src2, {OutputArray? dst,
131131
dst ??= Mat.empty();
132132
return mask == null
133133
? cvRunAsync0((callback) => ccore.cv_bitwise_xor(src1.ref, src2.ref, dst!.ref, callback), (c) {
134-
return c.complete(dst);
135-
})
134+
return c.complete(dst);
135+
})
136136
: cvRunAsync0((callback) => ccore.cv_bitwise_xor_1(src1.ref, src2.ref, dst!.ref, mask.ref, callback), (
137-
c,
138-
) {
139-
return c.complete(dst);
140-
});
137+
c,
138+
) {
139+
return c.complete(dst);
140+
});
141141
}
142142

143143
/// BatchDistance is a naive nearest neighbor finder.
@@ -855,11 +855,11 @@ Future<(Scalar mean, Scalar stddev)> meanStdDevAsync(InputArray src, {InputArray
855855
final stddev = calloc<ccore.Scalar>();
856856
return mask == null
857857
? cvRunAsync0((callback) => ccore.cv_meanStdDev(src.ref, mean, stddev, callback), (c) {
858-
return c.complete((Scalar.fromPointer(mean), Scalar.fromPointer(stddev)));
859-
})
858+
return c.complete((Scalar.fromPointer(mean), Scalar.fromPointer(stddev)));
859+
})
860860
: cvRunAsync0((callback) => ccore.cv_meanStdDev_1(src.ref, mean, stddev, mask.ref, callback), (c) {
861-
return c.complete((Scalar.fromPointer(mean), Scalar.fromPointer(stddev)));
862-
});
861+
return c.complete((Scalar.fromPointer(mean), Scalar.fromPointer(stddev)));
862+
});
863863
}
864864

865865
/// Merge creates one multi-channel array out of several single-channel ones.

0 commit comments

Comments
 (0)