List of included changes:

- Fix for 1D barcode display issue on swift version. - Update Podfiles to use the latest version of ML Kit. PiperOrigin-RevId: 410065179 Change-Id: I67e1b750262aec8f74d4f9ebd80869fd1591ba86
svenyonson · Nov 15, 2021 · 55e32cc · 55e32cc
1 parent e53e6ea
commit 55e32cc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/ios/quickstarts/vision/Podfile b/ios/quickstarts/vision/Podfile
@@ -3,20 +3,20 @@ use_frameworks!
 
 project 'VisionExample.xcodeproj'
 
-pod 'GoogleMLKit/BarcodeScanning', '2.4.0'
-pod 'GoogleMLKit/FaceDetection', '2.4.0'
-pod 'GoogleMLKit/ImageLabeling', '2.4.0'
-pod 'GoogleMLKit/ImageLabelingCustom', '2.4.0'
-pod 'GoogleMLKit/ObjectDetection', '2.4.0'
-pod 'GoogleMLKit/ObjectDetectionCustom', '2.4.0'
-pod 'GoogleMLKit/PoseDetection', '2.4.0'
-pod 'GoogleMLKit/PoseDetectionAccurate', '2.4.0'
-pod 'GoogleMLKit/SegmentationSelfie', '2.4.0'
-pod 'GoogleMLKit/TextRecognition', '2.4.0'
-pod 'GoogleMLKit/TextRecognitionChinese', '2.4.0'
-pod 'GoogleMLKit/TextRecognitionDevanagari', '2.4.0'
-pod 'GoogleMLKit/TextRecognitionJapanese', '2.4.0'
-pod 'GoogleMLKit/TextRecognitionKorean', '2.4.0'
+pod 'GoogleMLKit/BarcodeScanning', '2.5.0'
+pod 'GoogleMLKit/FaceDetection', '2.5.0'
+pod 'GoogleMLKit/ImageLabeling', '2.5.0'
+pod 'GoogleMLKit/ImageLabelingCustom', '2.5.0'
+pod 'GoogleMLKit/ObjectDetection', '2.5.0'
+pod 'GoogleMLKit/ObjectDetectionCustom', '2.5.0'
+pod 'GoogleMLKit/PoseDetection', '2.5.0'
+pod 'GoogleMLKit/PoseDetectionAccurate', '2.5.0'
+pod 'GoogleMLKit/SegmentationSelfie', '2.5.0'
+pod 'GoogleMLKit/TextRecognition', '2.5.0'
+pod 'GoogleMLKit/TextRecognitionChinese', '2.5.0'
+pod 'GoogleMLKit/TextRecognitionDevanagari', '2.5.0'
+pod 'GoogleMLKit/TextRecognitionJapanese', '2.5.0'
+pod 'GoogleMLKit/TextRecognitionKorean', '2.5.0'
 
 target 'VisionExample' do
 end

diff --git a/ios/quickstarts/vision/VisionExample.xcodeproj/project.pbxproj b/ios/quickstarts/vision/VisionExample.xcodeproj/project.pbxproj
@@ -48,6 +48,7 @@
 		BB287B3E20729CE90069707A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BB287B3C20729CE90069707A /* Main.storyboard */; };
 /* End PBXBuildFile section */
 
+
 /* Begin PBXFileReference section */
 		1001E6F620CEE0DD00445CB3 /* UIUtilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIUtilities.swift; sourceTree = "<group>"; };
 		1001E6F820CF021E00445CB3 /* CameraViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraViewController.swift; sourceTree = "<group>"; };
@@ -557,4 +558,4 @@
 /* End XCConfigurationList section */
 	};
 	rootObject = BB287B2D20729CE90069707A /* Project object */;
-}
+}
diff --git a/ios/quickstarts/vision/VisionExample/UIUtilities.swift b/ios/quickstarts/vision/VisionExample/UIUtilities.swift
@@ -549,7 +549,6 @@ extension CGRect {
   /// Returns a `Bool` indicating whether the rectangle's values are valid`.
   func isValid() -> Bool {
     return
-      !(origin.x.isNaN || origin.y.isNaN || width.isNaN || height.isNaN || width < 0 || height < 0
-      || origin.x < 0 || origin.y < 0)
+      !(origin.x.isNaN || origin.y.isNaN || width.isNaN || height.isNaN || width < 0 || height < 0)
   }
 }