From 9d31827de84710e8d8aa09127c6d32b9b11bb525 Mon Sep 17 00:00:00 2001 From: Prianka Liz Kariat Date: Fri, 8 Sep 2023 20:06:47 +0530 Subject: [PATCH] Moved iOS MPPHandLandmark enum to MPPHandLandmarker.h --- .../tasks/ios/vision/hand_landmarker/BUILD | 6 -- .../hand_landmarker/sources/MPPHandLandmark.h | 65 ------------------- .../sources/MPPHandLandmarker.h | 47 ++++++++++++++ 3 files changed, 47 insertions(+), 71 deletions(-) delete mode 100644 mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmark.h diff --git a/mediapipe/tasks/ios/vision/hand_landmarker/BUILD b/mediapipe/tasks/ios/vision/hand_landmarker/BUILD index d228b8e0a..7ad483e9d 100644 --- a/mediapipe/tasks/ios/vision/hand_landmarker/BUILD +++ b/mediapipe/tasks/ios/vision/hand_landmarker/BUILD @@ -71,9 +71,3 @@ objc_library( "//mediapipe/tasks/ios/vision/hand_landmarker/utils:MPPHandLandmarkerResultHelpers", ], ) - -objc_library( - name = "MPPHandLandmark", - hdrs = ["sources/MPPHandLandmark.h"], - module_name = "MPPHandLandmark", -) diff --git a/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmark.h b/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmark.h deleted file mode 100644 index fe08bde7e..000000000 --- a/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmark.h +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright 2023 The MediaPipe Authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#import - -NS_ASSUME_NONNULL_BEGIN - -/** - * The enum containing the 21 hand landmarks. - */ -typedef NS_ENUM(NSUInteger, MPPHandLandmark) { - MPPHandLandmarkWrist, - - MPPHandLandmarkThumbCMC, - - MPPHandLandmarkThumbMCP, - - MPPHandLandmarkThumbIP, - - MPPHandLandmarkIndexFingerMCP, - - MPPHandLandmarkIndexFingerPIP, - - MPPHandLandmarkIndexFingerDIP, - - MPPHandLandmarkIndexFingerTIP, - - MPPHandLandmarkMiddleFingerMCP, - - MPPHandLandmarkMiddleFingerPIP, - - MPPHandLandmarkMiddleFingerDIP, - - MPPHandLandmarkMiddleFingerTIP, - - MPPHandLandmarkRingFingerMCP, - - MPPHandLandmarkRingFingerPIP, - - MPPHandLandmarkRingFingerDIP, - - MPPHandLandmarkRingFingerTIP, - - MPPHandLandmarkPinkyMCP, - - MPPHandLandmarkPinkyPIP, - - MPPHandLandmarkPinkyDIP, - - MPPHandLandmarkPinkyTIP, - -} NS_SWIFT_NAME(HandLandmark); - -NS_ASSUME_NONNULL_END diff --git a/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmarker.h b/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmarker.h index a405c0fa4..bc222aa3a 100644 --- a/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmarker.h +++ b/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmarker.h @@ -21,6 +21,53 @@ NS_ASSUME_NONNULL_BEGIN + +/** + * The enum containing the 21 hand landmarks. + */ +typedef NS_ENUM(NSUInteger, MPPHandLandmark) { + MPPHandLandmarkWrist, + + MPPHandLandmarkThumbCMC, + + MPPHandLandmarkThumbMCP, + + MPPHandLandmarkThumbIP, + + MPPHandLandmarkIndexFingerMCP, + + MPPHandLandmarkIndexFingerPIP, + + MPPHandLandmarkIndexFingerDIP, + + MPPHandLandmarkIndexFingerTIP, + + MPPHandLandmarkMiddleFingerMCP, + + MPPHandLandmarkMiddleFingerPIP, + + MPPHandLandmarkMiddleFingerDIP, + + MPPHandLandmarkMiddleFingerTIP, + + MPPHandLandmarkRingFingerMCP, + + MPPHandLandmarkRingFingerPIP, + + MPPHandLandmarkRingFingerDIP, + + MPPHandLandmarkRingFingerTIP, + + MPPHandLandmarkPinkyMCP, + + MPPHandLandmarkPinkyPIP, + + MPPHandLandmarkPinkyDIP, + + MPPHandLandmarkPinkyTIP, + +} NS_SWIFT_NAME(HandLandmark); + /** * @brief Performs hand landmarks detection on images. *