Skip to content

Commit cf6ead3

Browse files
committed
migrate ios: refactor detector init and image orientation
1 parent d633e22 commit cf6ead3

3 files changed

Lines changed: 11 additions & 13 deletions

File tree

ios/RN/BarcodeDetectorManagerMlkit.m

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
@interface BarcodeDetectorManagerMlkit ()
77
@property(nonatomic, strong) MLKBarcodeScanner *barcodeRecognizer;
8-
@property(nonatomic, strong) MLK *vision;
98
@property(nonatomic, assign) MLKBarcodeFormat setOption;
109
@property(nonatomic, assign) NSInteger detectionMode;
1110
@property(nonatomic, assign) float scaleX;
@@ -17,8 +16,7 @@ @implementation BarcodeDetectorManagerMlkit
1716
- (instancetype)init
1817
{
1918
if (self = [super init]) {
20-
self.vision = [MLK vision];
21-
self.barcodeRecognizer = [_vision barcodeDetector];
19+
self.barcodeRecognizer = [MLKBarcodeScanner barcodeScanner];
2220
}
2321
return self;
2422
}
@@ -64,7 +62,7 @@ - (void)setType:(id)json queue:(dispatch_queue_t)sessionQueue
6462
[[MLKBarcodeScannerOptions alloc]
6563
initWithFormats: requestedValue];
6664
self.barcodeRecognizer =
67-
[self.vision barcodeDetectorWithOptions:options];
65+
[MLKBarcodeScanner barcodeScannerWithOptions:options]
6866
});
6967
}
7068
}
@@ -84,6 +82,7 @@ - (void)findBarcodesInFrame:(UIImage *)uiImage
8482
self.scaleX = scaleX;
8583
self.scaleY = scaleY;
8684
MLKVisionImage *image = [[MLKVisionImage alloc] initWithImage:uiImage];
85+
image.orientation = uiImage.imageOrientation;
8786
NSMutableArray *emptyResult = [[NSMutableArray alloc] init];
8887
[_barcodeRecognizer processImage:image
8988
completion:^(NSArray<MLKBarcode *> *barcodes, NSError *error) {

ios/RN/FaceDetectorManagerMlkit.m

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
@interface FaceDetectorManagerMlkit ()
66
@property(nonatomic, strong) MLKFaceDetector *faceRecognizer;
7-
@property(nonatomic, strong) MLK *vision;
87
@property(nonatomic, strong) MLKFaceDetectorOptions *options;
98
@property(nonatomic, assign) float scaleX;
109
@property(nonatomic, assign) float scaleY;
@@ -19,9 +18,8 @@ - (instancetype)init
1918
self.options.performanceMode = MLKFaceDetectorPerformanceModeFast;
2019
self.options.landmarkMode = MLKFaceDetectorLandmarkModeNone;
2120
self.options.classificationMode = MLKFaceDetectorClassificationModeNone;
22-
23-
self.vision = [MLK vision];
24-
self.faceRecognizer = [_vision faceDetectorWithOptions:_options];
21+
22+
self.faceRecognizer = [MLKFaceDetector faceDetectorWithOptions:options];
2523
}
2624
return self;
2725
}
@@ -57,7 +55,7 @@ - (void)setTracking:(id)json queue:(dispatch_queue_t)sessionQueue
5755
dispatch_async(sessionQueue, ^{
5856
self.options.trackingEnabled = requestedValue;
5957
self.faceRecognizer =
60-
[self.vision faceDetectorWithOptions:self.options];
58+
[MLKFaceDetector faceDetectorWithOptions:self.options];
6159
});
6260
}
6361
}
@@ -71,7 +69,7 @@ - (void)setLandmarksMode:(id)json queue:(dispatch_queue_t)sessionQueue
7169
dispatch_async(sessionQueue, ^{
7270
self.options.landmarkMode = requestedValue;
7371
self.faceRecognizer =
74-
[self.vision faceDetectorWithOptions:self.options];
72+
[MLKFaceDetector faceDetectorWithOptions:self.options];
7573
});
7674
}
7775
}
@@ -85,7 +83,7 @@ - (void)setPerformanceMode:(id)json queue:(dispatch_queue_t)sessionQueue
8583
dispatch_async(sessionQueue, ^{
8684
self.options.performanceMode = requestedValue;
8785
self.faceRecognizer =
88-
[self.vision faceDetectorWithOptions:self.options];
86+
[MLKFaceDetector faceDetectorWithOptions:self.options];
8987
});
9088
}
9189
}

ios/RN/TextDetectorManager.m

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ @implementation TextDetectorManager
1212
- (instancetype)init
1313
{
1414
if (self = [super init]) {
15-
MLK *vision = [MLK vision];
16-
self.textRecognizer = [vision onDeviceTextRecognizer];
15+
self.textRecognizer = [MLKTextRecognizer textRecognizer];
16+
1717
}
1818
return self;
1919
}
@@ -28,6 +28,7 @@ - (void)findTextBlocksInFrame:(UIImage *)uiImage scaleX:(float)scaleX scaleY:(fl
2828
self.scaleX = scaleX;
2929
self.scaleY = scaleY;
3030
MLKVisionImage *image = [[MLKVisionImage alloc] initWithImage:uiImage];
31+
image.orientation = uiImage.imageOrientation;
3132
NSMutableArray *textBlocks = [[NSMutableArray alloc] init];
3233
[_textRecognizer processImage:image
3334
completion:^(MLKText *_Nullable result,

0 commit comments

Comments
 (0)