mv_machine_learning: rename Preprocess header file

[Issue type] : code cleanup

Rename Preprocess.h to machine_learning_preprocess.h.
The header file name, Preprocess, is a generic one so let's change
the file name with specific one.

Change-Id: Ic497702eb27c00172159801757c16d1faf6896a4
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/mv_machine_learning/face_recognition/include/facenet.h b/mv_machine_learning/face_recognition/include/facenet.h
index c15e8d5..5602db8 100644 (file)
--- a/mv_machine_learning/face_recognition/include/facenet.h
+++ b/mv_machine_learning/face_recognition/include/facenet.h
@@ -26,7 +26,7 @@
 #include "Inference.h"
 #include "facenet_parser.h"
 #include "face_recognition_type.h"
-#include "Preprocess.h"
+#include "machine_learning_preprocess.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/image_classification/include/image_classification.h b/mv_machine_learning/image_classification/include/image_classification.h
index 1d9c9da..110c7e2 100644 (file)
--- a/mv_machine_learning/image_classification/include/image_classification.h
+++ b/mv_machine_learning/image_classification/include/image_classification.h
@@ -26,7 +26,7 @@
 #include "Inference.h"
 #include "image_classification_type.h"
 #include "ImageClassificationParser.h"
-#include "Preprocess.h"
+#include "machine_learning_preprocess.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/landmark_detection/include/landmark_detection.h b/mv_machine_learning/landmark_detection/include/landmark_detection.h
index 9d3c8f6..a73520d 100644 (file)
--- a/mv_machine_learning/landmark_detection/include/landmark_detection.h
+++ b/mv_machine_learning/landmark_detection/include/landmark_detection.h
@@ -26,7 +26,7 @@
 #include "Inference.h"
 #include "landmark_detection_type.h"
 #include "LandmarkDetectionParser.h"
-#include "Preprocess.h"
+#include "machine_learning_preprocess.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/meta/CMakeLists.txt b/mv_machine_learning/meta/CMakeLists.txt
index 03f842b..3c427bb 100644 (file)
--- a/mv_machine_learning/meta/CMakeLists.txt
+++ b/mv_machine_learning/meta/CMakeLists.txt
@@ -4,5 +4,5 @@ cmake_minimum_required(VERSION 2.6...3.13)
 install(
     DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include/media
     FILES_MATCHING
-    PATTERN "Preprocess.h"
+    PATTERN "machine_learning_preprocess.h"
     )
\ No newline at end of file

diff --git a/mv_machine_learning/meta/include/Preprocess.h b/mv_machine_learning/meta/include/machine_learning_preprocess.h
similarity index 94%
rename from mv_machine_learning/meta/include/Preprocess.h
rename to mv_machine_learning/meta/include/machine_learning_preprocess.h
index 4ef3dd0..080a39c 100644 (file)
--- a/mv_machine_learning/meta/include/Preprocess.h
+++ b/mv_machine_learning/meta/include/machine_learning_preprocess.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __PREPROCESS_H__
-#define __PREPORCESS_H__
+#ifndef __MACHINE_LEARNING_PREPROCESS_H__
+#define __MACHINE_LEARNING_PREPROCESS_H__
 
 #include <string>
 #include <map>
@@ -32,7 +32,7 @@
 #include <opencv2/imgproc.hpp>
 
 /**
- * @file Preprocess.h
+ * @file machine_learning_preprocess.h
  * @brief This file contains the Preprocess class definition which
  *        provides Preprocess before running inference.
  */
@@ -91,4 +91,4 @@ private:
 } /* machine_learning */
 } /* mediavision */
 
-#endif /* __PREPROCESS_H__ */
+#endif /* __MACHINE_LEARNING_PREPROCESS_H__ */

diff --git a/mv_machine_learning/meta/src/Preprocess.cpp b/mv_machine_learning/meta/src/machine_learning_preprocess.cpp
similarity index 99%
rename from mv_machine_learning/meta/src/Preprocess.cpp
rename to mv_machine_learning/meta/src/machine_learning_preprocess.cpp
index d611e06..919f70e 100644 (file)
--- a/mv_machine_learning/meta/src/Preprocess.cpp
+++ b/mv_machine_learning/meta/src/machine_learning_preprocess.cpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <queue>
 #include <algorithm>
-#include "Preprocess.h"
+#include "machine_learning_preprocess.h"
 #include "machine_learning_exception.h"
 
 constexpr int colorConvertTable[][12] = {

diff --git a/mv_machine_learning/object_detection/include/object_detection.h b/mv_machine_learning/object_detection/include/object_detection.h
index c552427..64ca00f 100644 (file)
--- a/mv_machine_learning/object_detection/include/object_detection.h
+++ b/mv_machine_learning/object_detection/include/object_detection.h
@@ -29,7 +29,7 @@
 #include "Inference.h"
 #include "object_detection_type.h"
 #include "ObjectDetectionParser.h"
-#include "Preprocess.h"
+#include "machine_learning_preprocess.h"
 #include "iobject_detection.h"
 
 namespace mediavision

diff --git a/mv_machine_learning/object_detection_3d/include/object_detection_3d.h b/mv_machine_learning/object_detection_3d/include/object_detection_3d.h
index 62e332d..e4401bb 100644 (file)
--- a/mv_machine_learning/object_detection_3d/include/object_detection_3d.h
+++ b/mv_machine_learning/object_detection_3d/include/object_detection_3d.h
@@ -26,7 +26,7 @@
 #include "Inference.h"
 #include "object_detection_3d_type.h"
 #include "ObjectDetection3dParser.h"
-#include "Preprocess.h"
+#include "machine_learning_preprocess.h"
 
 namespace mediavision
 {

diff --git a/packaging/capi-media-vision.spec b/packaging/capi-media-vision.spec
index c62219f..eaf6ed7 100644 (file)
--- a/packaging/capi-media-vision.spec
+++ b/packaging/capi-media-vision.spec
@@ -420,7 +420,7 @@ find . -name '*.gcno' -not -path "./test/*" -not -path "./mv_machine_learning/*"
 %files machine_learning-devel
 %{_includedir}/media/mv_infer*.h
 %{_includedir}/media/machine_learning_exception.h
-%{_includedir}/media/Preprocess.h
+%{_includedir}/media/machine_learning_preprocess.h
 %{_libdir}/pkgconfig/*inference.pc
 %if "%{enable_ml_face_recognition}" == "1"
 %{_includedir}/media/mv_face_recognition*.h