Apply clang-format sort include

Change-Id: If9201c73eec2ac6ac09439f8d5ae54e1d202bda0
Signed-off-by: Kwanghoon Son <k.son@samsung.com>

diff --git a/.clang-format b/.clang-format
index 123aae0..18f3e38 100644 (file)
--- a/.clang-format
+++ b/.clang-format
@@ -7,7 +7,6 @@ Language:        Cpp
 # Turn off build breakable
 FixNamespaceComments: false
 ReflowComments:  false
-SortIncludes:    false # can break build; turning off
 
 # Enterprise guide
 # M08

diff --git a/include/mv_3d.h b/include/mv_3d.h
index e912ae6..a643a78 100644 (file)
--- a/include/mv_3d.h
+++ b/include/mv_3d.h
@@ -17,9 +17,9 @@
 #ifndef __TIZEN_MEDIAVISION_3D_H__
 #define __TIZEN_MEDIAVISION_3D_H__
 
-#include <stdbool.h>
-#include <mv_common.h>
 #include <mv_3d_type.h>
+#include <mv_common.h>
+#include <stdbool.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/mv_3d_private.h b/include/mv_3d_private.h
index 33880e1..1b526e6 100644 (file)
--- a/include/mv_3d_private.h
+++ b/include/mv_3d_private.h
@@ -17,8 +17,8 @@
 #ifndef __TIZEN_MEDIAVISION_3D_PRIVATE_H__
 #define __TIZEN_MEDIAVISION_3D_PRIVATE_H__
 
-#include <cstdio>
 #include "mv_3d_type.h"
+#include <cstdio>
 
 #ifdef MV_3D_POINTCLOUD_IS_AVAILABLE
 #include <open3d/Open3D.h>

diff --git a/include/mv_barcode.h b/include/mv_barcode.h
index c71b12c..4f1d960 100644 (file)
--- a/include/mv_barcode.h
+++ b/include/mv_barcode.h
@@ -17,9 +17,9 @@
 #ifndef __TIZEN_MEDIAVISION_BARCODE_H__
 #define __TIZEN_MEDIAVISION_BARCODE_H__
 
-#include <mv_common.h>
 #include <mv_barcode_detect.h>
 #include <mv_barcode_generate.h>
+#include <mv_common.h>
 
 /**
  * @file  mv_barcode.h

diff --git a/include/mv_barcode_detect.h b/include/mv_barcode_detect.h
index c8e89bf..1c47a69 100644 (file)
--- a/include/mv_barcode_detect.h
+++ b/include/mv_barcode_detect.h
@@ -17,8 +17,8 @@
 #ifndef __TIZEN_MEDIAVISION_BARCODE_DETECT_H__
 #define __TIZEN_MEDIAVISION_BARCODE_DETECT_H__
 
-#include <mv_common.h>
 #include <mv_barcode_type.h>
+#include <mv_common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/mv_barcode_generate.h b/include/mv_barcode_generate.h
index e3e281e..2515e72 100644 (file)
--- a/include/mv_barcode_generate.h
+++ b/include/mv_barcode_generate.h
@@ -17,8 +17,8 @@
 #ifndef __TIZEN_MEDIAVISION_BARCODE_GENERATE_H__
 #define __TIZEN_MEDIAVISION_BARCODE_GENERATE_H__
 
-#include <mv_common.h>
 #include <mv_barcode_type.h>
+#include <mv_common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/mv_3d/3d/include/Mv3d.h b/mv_3d/3d/include/Mv3d.h
index 8a0e437..ed475e6 100644 (file)
--- a/mv_3d/3d/include/Mv3d.h
+++ b/mv_3d/3d/include/Mv3d.h
@@ -17,13 +17,13 @@
 #ifndef __MEDIA_VISION_3D_H__
 #define __MEDIA_VISION_3D_H__
 
-#include <cstddef>
-#include <glib.h>
-#include "dfs_parameter.h"
 #include "dfs_adaptation_impl.h"
+#include "dfs_parameter.h"
 #include "mv_3d.h"
-#include "mv_3d_type.h"
 #include "mv_3d_private.h"
+#include "mv_3d_type.h"
+#include <cstddef>
+#include <glib.h>
 
 /**
  * @file Depth.h

diff --git a/mv_3d/3d/src/Mv3d.cpp b/mv_3d/3d/src/Mv3d.cpp
index c1c960c..c3adb3b 100644 (file)
--- a/mv_3d/3d/src/Mv3d.cpp
+++ b/mv_3d/3d/src/Mv3d.cpp
@@ -15,13 +15,13 @@
  */
 
 #include "mv_private.h"
-#include <mv_common.h>
 #include <MediaSource.h>
 #include <memory>
-#include <unistd.h>
+#include <mv_common.h>
 #include <opencv2/core.hpp>
 #include <opencv2/imgcodecs.hpp>
 #include <opencv2/imgproc.hpp>
+#include <unistd.h>
 
 #ifdef MV_3D_POINTCLOUD_IS_AVAILABLE
 #include <open3d/Open3D.h>

diff --git a/mv_3d/3d/src/mv_3d.cpp b/mv_3d/3d/src/mv_3d.cpp
index a9ff00f..282a4b5 100644 (file)
--- a/mv_3d/3d/src/mv_3d.cpp
+++ b/mv_3d/3d/src/mv_3d.cpp
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#include <new>
-#include <exception>
 #include <cstddef>
+#include <exception>
+#include <new>
 
-#include "mv_private.h"
-#include "mv_feature_key.h"
-#include "mv_common.h"
-#include "mv_3d.h"
 #include "Mv3d.h"
+#include "mv_3d.h"
+#include "mv_common.h"
+#include "mv_feature_key.h"
+#include "mv_private.h"
 
 using namespace mediavision::mv3d;
 

diff --git a/mv_3d/3d/src/mv_3d_internal.cpp b/mv_3d/3d/src/mv_3d_internal.cpp
index a2d57f0..746a8f1 100644 (file)
--- a/mv_3d/3d/src/mv_3d_internal.cpp
+++ b/mv_3d/3d/src/mv_3d_internal.cpp
@@ -19,10 +19,10 @@
 #include <open3d/Open3D.h>
 #endif
 
+#include "Mv3d.h"
 #include "mv_3d_internal.h"
-#include "mv_private.h"
 #include "mv_3d_private.h"
-#include "Mv3d.h"
+#include "mv_private.h"
 
 #define DISTANCE_THRESHOLD 0.01
 #define RANSAC_NUMBER 3

diff --git a/mv_barcode/barcode_detector/src/mv_barcode_detect.cpp b/mv_barcode/barcode_detector/src/mv_barcode_detect.cpp
index 725ef18..807e091 100644 (file)
--- a/mv_barcode/barcode_detector/src/mv_barcode_detect.cpp
+++ b/mv_barcode/barcode_detector/src/mv_barcode_detect.cpp
@@ -16,9 +16,9 @@
 
 #include <system_info.h>
 
-#include "mv_private.h"
-#include "mv_feature_key.h"
 #include "mv_barcode_detect.h"
+#include "mv_feature_key.h"
+#include "mv_private.h"
 
 /* Include headers of open barcode detect module here. */
 #include "mv_barcode_detect_open.h"

diff --git a/mv_barcode/barcode_detector/src/mv_barcode_detect_open.cpp b/mv_barcode/barcode_detector/src/mv_barcode_detect_open.cpp
index d375e53..d5e7a87 100644 (file)
--- a/mv_barcode/barcode_detector/src/mv_barcode_detect_open.cpp
+++ b/mv_barcode/barcode_detector/src/mv_barcode_detect_open.cpp
@@ -19,12 +19,12 @@
 #include "Barcode.h"
 #include "BarcodeUtils.h"
 
+#include <CommonUtils.h>
 #include <mv_private.h>
-#include <vector>
 #include <opencv2/core/core.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
+#include <vector>
 #include <zbar.h>
-#include <CommonUtils.h>
 
 using namespace MediaVision::Barcode;
 

diff --git a/mv_barcode/barcode_generator/include/BarcodeGenerator.h b/mv_barcode/barcode_generator/include/BarcodeGenerator.h
index 4aa0ec2..77d8093 100644 (file)
--- a/mv_barcode/barcode_generator/include/BarcodeGenerator.h
+++ b/mv_barcode/barcode_generator/include/BarcodeGenerator.h
@@ -18,11 +18,11 @@
 #define __MEDIA_VISION_BARCODE_GENERATOR_H__
 
 #include "BarcodeOptions.h"
-#include <zint.h>
-#include <string>
 #include <EngineConfig.h>
-#include <opencv2/core/mat.hpp>
 #include <mv_barcode_type.h>
+#include <opencv2/core/mat.hpp>
+#include <string>
+#include <zint.h>
 
 /**
  * @file BarcodeGenerator.h

diff --git a/mv_barcode/barcode_generator/include/mv_barcode_generate_open.h b/mv_barcode/barcode_generator/include/mv_barcode_generate_open.h
index 8ecd486..45336d9 100644 (file)
--- a/mv_barcode/barcode_generator/include/mv_barcode_generate_open.h
+++ b/mv_barcode/barcode_generator/include/mv_barcode_generate_open.h
@@ -17,8 +17,8 @@
 #ifndef __MEDIA_VISION_BARCODE_GENERATE_OPEN_H__
 #define __MEDIA_VISION_BARCODE_GENERATE_OPEN_H__
 
-#include "mv_barcode_generate.h"
 #include "BarcodeGenerator.h"
+#include "mv_barcode_generate.h"
 #include <zint.h>
 
 /**

diff --git a/mv_barcode/barcode_generator/src/BarcodeGenerator.cpp b/mv_barcode/barcode_generator/src/BarcodeGenerator.cpp
index 2ad8be8..bb036dc 100644 (file)
--- a/mv_barcode/barcode_generator/src/BarcodeGenerator.cpp
+++ b/mv_barcode/barcode_generator/src/BarcodeGenerator.cpp
@@ -21,14 +21,14 @@
 #include <zint.h>
 
 #include <opencv2/core.hpp>
-#include <opencv2/imgproc.hpp>
 #include <opencv2/highgui.hpp>
 #include <opencv2/imgcodecs/legacy/constants_c.h>
+#include <opencv2/imgproc.hpp>
 
 #include <cstring>
-#include <vector>
-#include <unistd.h>
 #include <mv_barcode_generate.h>
+#include <unistd.h>
+#include <vector>
 
 #define ZINT_COLOUR_SIZE 10
 

diff --git a/mv_barcode/barcode_generator/src/mv_barcode_generate.cpp b/mv_barcode/barcode_generator/src/mv_barcode_generate.cpp
index 3bdaed5..84fd5de 100644 (file)
--- a/mv_barcode/barcode_generator/src/mv_barcode_generate.cpp
+++ b/mv_barcode/barcode_generator/src/mv_barcode_generate.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
+#include "mv_barcode_generate.h"
+#include "mv_feature_key.h"
+#include "mv_private.h"
 #include <string>
 #include <system_info.h>
 #include <zint.h>
-#include "mv_private.h"
-#include "mv_feature_key.h"
-#include "mv_barcode_generate.h"
 
 /* Include headers of open barcode generate module here. */
 #include "mv_barcode_generate_open.h"

diff --git a/mv_barcode/barcode_generator/src/mv_barcode_generate_open.cpp b/mv_barcode/barcode_generator/src/mv_barcode_generate_open.cpp
index 7dc507e..edb71f8 100644 (file)
--- a/mv_barcode/barcode_generator/src/mv_barcode_generate_open.cpp
+++ b/mv_barcode/barcode_generator/src/mv_barcode_generate_open.cpp
@@ -16,8 +16,8 @@
 
 #include "mv_barcode_generate_open.h"
 
-#include "mv_common.h"
 #include "BarcodeGenerator.h"
+#include "mv_common.h"
 
 #include <mv_private.h>
 

diff --git a/mv_common/include/EngineConfig.h b/mv_common/include/EngineConfig.h
index dabf18a..ac111ea 100644 (file)
--- a/mv_common/include/EngineConfig.h
+++ b/mv_common/include/EngineConfig.h
@@ -17,8 +17,8 @@
 #ifndef __MEDIA_VISION_ENGINE_CONFIG_H__
 #define __MEDIA_VISION_ENGINE_CONFIG_H__
 
-#include <string>
 #include <map>
+#include <string>
 #include <vector>
 
 #include "mv_common.h"

diff --git a/mv_common/include/mv_private.h b/mv_common/include/mv_private.h
index 93813db..63ad0b3 100644 (file)
--- a/mv_common/include/mv_private.h
+++ b/mv_common/include/mv_private.h
@@ -21,8 +21,8 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include <stdbool.h>
 #include <dlog.h>
+#include <stdbool.h>
 
 #ifdef LOG_TAG
 #undef LOG_TAG

diff --git a/mv_common/src/mv_common.cpp b/mv_common/src/mv_common.cpp
index 313436b..a80d526 100644 (file)
--- a/mv_common/src/mv_common.cpp
+++ b/mv_common/src/mv_common.cpp
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-#include <new>
 #include <memory>
-#include <string.h>
-#include <stdlib.h>
+#include <new>
 #include <stdexcept>
+#include <stdlib.h>
+#include <string.h>
 
+#include "mv_feature_key.h"
 #include <media_packet.h>
 #include <mv_common.h>
 #include <mv_common_internal.h>
 #include <mv_private.h>
-#include "mv_feature_key.h"
 
-#include "MediaSource.h"
 #include "EngineConfig.h"
+#include "MediaSource.h"
 
 static const char *feature_keys[] = {
        "http://tizen.org/feature/vision.barcode_detection", "http://tizen.org/feature/vision.barcode_generation",

diff --git a/mv_face/face/include/FaceDetector.h b/mv_face/face/include/FaceDetector.h
index 19176a6..b428171 100644 (file)
--- a/mv_face/face/include/FaceDetector.h
+++ b/mv_face/face/include/FaceDetector.h
@@ -18,8 +18,8 @@
 #define __MEDIA_VISION_FACE_DETECTOR_H__
 
 #include <opencv2/objdetect.hpp>
-#include <vector>
 #include <string>
+#include <vector>
 
 /**
  * @file FaceDetector.h

diff --git a/mv_face/face/include/FaceRecognitionModel.h b/mv_face/face/include/FaceRecognitionModel.h
index 6ae4008..5ae7c91 100644 (file)
--- a/mv_face/face/include/FaceRecognitionModel.h
+++ b/mv_face/face/include/FaceRecognitionModel.h
@@ -24,8 +24,8 @@
 #include <opencv2/imgproc.hpp>
 
 #include <cstring>
-#include <vector>
 #include <set>
+#include <vector>
 
 /**
  * @file FaceRecognitionModel.h

diff --git a/mv_face/face/include/FaceTrackingModel.h b/mv_face/face/include/FaceTrackingModel.h
index ce9a5f8..f4e9fd9 100644 (file)
--- a/mv_face/face/include/FaceTrackingModel.h
+++ b/mv_face/face/include/FaceTrackingModel.h
@@ -17,8 +17,8 @@
 #ifndef __MEDIA_VISION_FACE_TRACKING_MODEL_H__
 #define __MEDIA_VISION_FACE_TRACKING_MODEL_H__
 
-#include <opencv2/core.hpp>
 #include "FaceTracker.h"
+#include <opencv2/core.hpp>
 
 /**
  * @file FaceTrackingModel.h

diff --git a/mv_face/face/src/FaceEyeCondition.cpp b/mv_face/face/src/FaceEyeCondition.cpp
index a0cf7b4..7312d15 100644 (file)
--- a/mv_face/face/src/FaceEyeCondition.cpp
+++ b/mv_face/face/src/FaceEyeCondition.cpp
@@ -18,8 +18,8 @@
 
 #include <mv_private.h>
 
-#include <vector>
 #include <opencv2/imgproc/imgproc_c.h>
+#include <vector>
 
 namespace MediaVision
 {

diff --git a/mv_face/face/src/FaceRecognitionModel.cpp b/mv_face/face/src/FaceRecognitionModel.cpp
index c926dab..1cb5b13 100644 (file)
--- a/mv_face/face/src/FaceRecognitionModel.cpp
+++ b/mv_face/face/src/FaceRecognitionModel.cpp
@@ -16,14 +16,14 @@
 
 #include "FaceRecognitionModel.h"
 
-#include "mv_private.h"
 #include "mv_common.h"
+#include "mv_private.h"
 
 #include <map>
 
+#include <fstream>
 #include <stdio.h>
 #include <unistd.h>
-#include <fstream>
 
 namespace MediaVision
 {

diff --git a/mv_face/face/src/FaceTracker.cpp b/mv_face/face/src/FaceTracker.cpp
index 30cdf64..56e4ddd 100644 (file)
--- a/mv_face/face/src/FaceTracker.cpp
+++ b/mv_face/face/src/FaceTracker.cpp
@@ -41,8 +41,8 @@
 
 #include "FaceTracker.h"
 
-#include "opencv2/video/tracking.hpp"
 #include "opencv2/imgproc.hpp"
+#include "opencv2/video/tracking.hpp"
 
 #include <algorithm>
 #include <cmath>

diff --git a/mv_face/face/src/FaceTrackingModel.cpp b/mv_face/face/src/FaceTrackingModel.cpp
index af20651..185d139 100644 (file)
--- a/mv_face/face/src/FaceTrackingModel.cpp
+++ b/mv_face/face/src/FaceTrackingModel.cpp
@@ -16,8 +16,8 @@
 
 #include "FaceTrackingModel.h"
 
-#include "mv_private.h"
 #include "mv_common.h"
+#include "mv_private.h"
 
 #include <unistd.h>
 

diff --git a/mv_face/face/src/mv_face.c b/mv_face/face/src/mv_face.c
index d4e669d..15a3c00 100644 (file)
--- a/mv_face/face/src/mv_face.c
+++ b/mv_face/face/src/mv_face.c
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "mv_private.h"
-#include "mv_feature_key.h"
 #include "mv_face.h"
 #include "mv_face_open.h"
+#include "mv_feature_key.h"
+#include "mv_private.h"
 
 /**
  * @file  mv_face.c

diff --git a/mv_face/face/src/mv_face_open.cpp b/mv_face/face/src/mv_face_open.cpp
index 34e2d99..3eb1e48 100644 (file)
--- a/mv_face/face/src/mv_face_open.cpp
+++ b/mv_face/face/src/mv_face_open.cpp
@@ -17,17 +17,17 @@
 #include "mv_face_open.h"
 
 #include "FaceDetector.h"
-#include "FaceUtil.h"
+#include "FaceExpressionRecognizer.h"
+#include "FaceEyeCondition.h"
 #include "FaceRecognitionModel.h"
 #include "FaceTrackingModel.h"
-#include "FaceEyeCondition.h"
-#include "FaceExpressionRecognizer.h"
+#include "FaceUtil.h"
 
 #include "mv_private.h"
 
-#include <vector>
-#include <set>
 #include <cstring>
+#include <set>
+#include <vector>
 
 #include <CommonUtils.h>
 

diff --git a/mv_image/image/include/Features/FeaturePack.h b/mv_image/image/include/Features/FeaturePack.h
index 746dac6..1675157 100644 (file)
--- a/mv_image/image/include/Features/FeaturePack.h
+++ b/mv_image/image/include/Features/FeaturePack.h
@@ -17,15 +17,15 @@
 #ifndef __MEDIA_VISION_FEATUREPACK_H__
 #define __MEDIA_VISION_FEATUREPACK_H__
 
-#include "mv_private.h"
 #include "ImageConfig.h"
+#include "mv_private.h"
 
-#include <vector>
+#include <opencv2/calib3d.hpp>
 #include <opencv2/core.hpp>
-#include <opencv2/imgproc.hpp>
 #include <opencv2/features2d.hpp>
+#include <opencv2/imgproc.hpp>
 #include <opencv2/xfeatures2d.hpp>
-#include <opencv2/calib3d.hpp>
+#include <vector>
 
 namespace MediaVision
 {

diff --git a/mv_image/image/include/Recognition/ImageRecognizer.h b/mv_image/image/include/Recognition/ImageRecognizer.h
index a549e16..226880e 100644 (file)
--- a/mv_image/image/include/Recognition/ImageRecognizer.h
+++ b/mv_image/image/include/Recognition/ImageRecognizer.h
@@ -17,8 +17,8 @@
 #ifndef __MEDIA_VISION_IMAGERECOGNIZER_H__
 #define __MEDIA_VISION_IMAGERECOGNIZER_H__
 
-#include "ImageMathUtil.h"
 #include "ImageConfig.h"
+#include "ImageMathUtil.h"
 
 #include "Recognition/ImageObject.h"
 

diff --git a/mv_image/image/include/Tracking/ImageContourStabilizator.h b/mv_image/image/include/Tracking/ImageContourStabilizator.h
index 3e42d08..5b01937 100644 (file)
--- a/mv_image/image/include/Tracking/ImageContourStabilizator.h
+++ b/mv_image/image/include/Tracking/ImageContourStabilizator.h
@@ -17,8 +17,8 @@
 #ifndef __MEDIA_VISION_IMAGECONTOURSTABILIZATOR_H__
 #define __MEDIA_VISION_IMAGECONTOURSTABILIZATOR_H__
 
-#include <deque>
 #include "ImageConfig.h"
+#include <deque>
 
 /**
  * @file  ImageContourStabilizator.h

diff --git a/mv_image/image/include/Tracking/ImageTrackingModel.h b/mv_image/image/include/Tracking/ImageTrackingModel.h
index f3a22b3..fcd4f6e 100644 (file)
--- a/mv_image/image/include/Tracking/ImageTrackingModel.h
+++ b/mv_image/image/include/Tracking/ImageTrackingModel.h
@@ -19,8 +19,8 @@
 
 #include "Recognition/ImageObject.h"
 
-#include "Tracking/ObjectTracker.h"
 #include "Tracking/ImageContourStabilizator.h"
+#include "Tracking/ObjectTracker.h"
 
 /**
  * @file  ImageTrackingModel.h

diff --git a/mv_image/image/src/Features/FeatureMatcher.cpp b/mv_image/image/src/Features/FeatureMatcher.cpp
index 31e3e0e..fce7716 100644 (file)
--- a/mv_image/image/src/Features/FeatureMatcher.cpp
+++ b/mv_image/image/src/Features/FeatureMatcher.cpp
@@ -18,8 +18,8 @@
 
 #include "ImageMathUtil.h"
 
-#include <opencv2/core.hpp>
 #include <opencv2/calib3d/calib3d_c.h>
+#include <opencv2/core.hpp>
 
 namespace MediaVision
 {

diff --git a/mv_image/image/src/Recognition/ImageObject.cpp b/mv_image/image/src/Recognition/ImageObject.cpp
index a13d599..ce1e8a3 100644 (file)
--- a/mv_image/image/src/Recognition/ImageObject.cpp
+++ b/mv_image/image/src/Recognition/ImageObject.cpp
@@ -18,18 +18,18 @@
 
 #include "ImageMathUtil.h"
 
-#include "Features/FeatureExtractor.h"
 #include "Features/BasicExtractorFactory.h"
+#include "Features/FeatureExtractor.h"
 #include "Features/ORBExtractorFactory.h"
 
-#include "mv_private.h"
 #include "mv_common.h"
+#include "mv_private.h"
 
 #include <opencv2/features2d.hpp>
 
 #include <fstream>
-#include <unistd.h>
 #include <iomanip>
+#include <unistd.h>
 
 namespace MediaVision
 {

diff --git a/mv_image/image/src/Tracking/ImageTrackingModel.cpp b/mv_image/image/src/Tracking/ImageTrackingModel.cpp
index e7d167b..fde4c14 100644 (file)
--- a/mv_image/image/src/Tracking/ImageTrackingModel.cpp
+++ b/mv_image/image/src/Tracking/ImageTrackingModel.cpp
@@ -16,19 +16,19 @@
 
 #include "Tracking/ImageTrackingModel.h"
 
+#include "Tracking/AsyncTracker.h"
 #include "Tracking/CascadeTracker.h"
-#include "Tracking/RecognitionBasedTracker.h"
 #include "Tracking/FeatureSubstitutionTracker.h"
-#include "Tracking/AsyncTracker.h"
 #include "Tracking/MFTracker.h"
+#include "Tracking/RecognitionBasedTracker.h"
 
-#include "mv_private.h"
 #include "mv_common.h"
+#include "mv_private.h"
 
 #include <fstream>
-#include <unistd.h>
-#include <new>
 #include <iomanip>
+#include <new>
+#include <unistd.h>
 
 namespace MediaVision
 {

diff --git a/mv_image/image/src/Tracking/MFTracker.cpp b/mv_image/image/src/Tracking/MFTracker.cpp
index 969f00d..2f2f55c 100644 (file)
--- a/mv_image/image/src/Tracking/MFTracker.cpp
+++ b/mv_image/image/src/Tracking/MFTracker.cpp
@@ -16,8 +16,8 @@
 
 #include "Tracking/MFTracker.h"
 
-#include "opencv2/video/tracking.hpp"
 #include "opencv2/imgproc.hpp"
+#include "opencv2/video/tracking.hpp"
 
 namespace MediaVision
 {

diff --git a/mv_image/image/src/mv_image.c b/mv_image/image/src/mv_image.c
index d39eb61..c06e46f 100644 (file)
--- a/mv_image/image/src/mv_image.c
+++ b/mv_image/image/src/mv_image.c
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "mv_private.h"
-#include "mv_feature_key.h"
 #include "mv_image.h"
+#include "mv_feature_key.h"
 #include "mv_image_open.h"
+#include "mv_private.h"
 
 /**
  * @file  mv_image.c

diff --git a/mv_image/image/src/mv_image_open.cpp b/mv_image/image/src/mv_image_open.cpp
index 8f732ea..0638eb2 100644 (file)
--- a/mv_image/image/src/mv_image_open.cpp
+++ b/mv_image/image/src/mv_image_open.cpp
@@ -16,12 +16,12 @@
 
 #include "mv_image_open.h"
 
-#include "mv_private.h"
 #include "mv_common.h"
+#include "mv_private.h"
 
-#include "ImageConfig.h"
 #include "Features/FeatureExtractor.h"
 #include "Features/ORBExtractorFactory.h"
+#include "ImageConfig.h"
 #include "Recognition/ImageObject.h"
 #include "Recognition/ImageRecognizer.h"
 #include "Tracking/ImageTrackingModel.h"

diff --git a/mv_machine_learning/common/include/AsyncManager.h b/mv_machine_learning/common/include/AsyncManager.h
index 4e02752..0f70c37 100644 (file)
--- a/mv_machine_learning/common/include/AsyncManager.h
+++ b/mv_machine_learning/common/include/AsyncManager.h
@@ -17,18 +17,18 @@
 #ifndef __ASYNC_MANAGER_H__
 #define __ASYNC_MANAGER_H__
 
-#include <queue>
-#include <thread>
-#include <mutex>
-#include <condition_variable>
-#include <atomic>
-#include <functional>
 #include <algorithm>
+#include <atomic>
 #include <chrono>
+#include <condition_variable>
+#include <functional>
+#include <mutex>
+#include <queue>
+#include <thread>
 
+#include "MvMlException.h"
 #include <mv_common.h>
 #include <mv_inference_type.h>
-#include "MvMlException.h"
 
 #ifdef LOG_TAG
 #undef LOG_TAG

diff --git a/mv_machine_learning/common/include/Context.h b/mv_machine_learning/common/include/Context.h
index ea6c654..82825c0 100644 (file)
--- a/mv_machine_learning/common/include/Context.h
+++ b/mv_machine_learning/common/include/Context.h
@@ -17,8 +17,8 @@
 #ifndef __CONTEXT_H__
 #define __CONTEXT_H__
 
-#include <map>
 #include "ITask.h"
+#include <map>
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/common/include/MvMlConfig.h b/mv_machine_learning/common/include/MvMlConfig.h
index 6778a7e..99f5593 100644 (file)
--- a/mv_machine_learning/common/include/MvMlConfig.h
+++ b/mv_machine_learning/common/include/MvMlConfig.h
@@ -17,9 +17,9 @@
 #ifndef __MV_ML_CONFIG_H__
 #define __MV_ML_CONFIG_H__
 
-#include <mv_common.h>
-#include "mv_private.h"
 #include "EngineConfig.h"
+#include "mv_private.h"
+#include <mv_common.h>
 
 #include "MetaParser.h"
 

diff --git a/mv_machine_learning/common/include/common.h b/mv_machine_learning/common/include/common.h
index 0cebba2..f0093a3 100644 (file)
--- a/mv_machine_learning/common/include/common.h
+++ b/mv_machine_learning/common/include/common.h
@@ -17,9 +17,9 @@
 #ifndef __COMMON_H__
 #define __COMMON_H__
 
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
 
 #include "mv_inference_type.h"
 

diff --git a/mv_machine_learning/common/include/native_capi.h b/mv_machine_learning/common/include/native_capi.h
index bd13f94..b9be505 100644 (file)
--- a/mv_machine_learning/common/include/native_capi.h
+++ b/mv_machine_learning/common/include/native_capi.h
@@ -22,8 +22,8 @@
 
 #include "Context.h"
 #include "ITask.h"
-#include "mv_private.h"
 #include "mv_ml_types.h"
+#include "mv_private.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/common/meta/include/AnchorParser.h b/mv_machine_learning/common/meta/include/AnchorParser.h
index 1239d92..b748467 100644 (file)
--- a/mv_machine_learning/common/meta/include/AnchorParser.h
+++ b/mv_machine_learning/common/meta/include/AnchorParser.h
@@ -17,15 +17,15 @@
 #ifndef __ANCHOR_PARSER_H__
 #define __ANCHOR_PARSER_H__
 
-#include <string>
 #include <memory>
+#include <string>
 #include <vector>
 
 #include <json-glib/json-glib.h>
 
-#include <dlog.h>
-#include "mv_private.h"
 #include "mv_common.h"
+#include "mv_private.h"
+#include <dlog.h>
 
 #include "types.h"
 

diff --git a/mv_machine_learning/common/meta/include/MetaParser.h b/mv_machine_learning/common/meta/include/MetaParser.h
index 6e9dc02..fe5db0a 100644 (file)
--- a/mv_machine_learning/common/meta/include/MetaParser.h
+++ b/mv_machine_learning/common/meta/include/MetaParser.h
@@ -17,13 +17,13 @@
 #ifndef __META_PARSER_H__
 #define __META_PARSER_H__
 
-#include <string>
+#include "types.h"
+#include <dlog.h>
+#include <json-glib/json-glib.h>
 #include <memory>
 #include <mv_common.h>
 #include <mv_private.h>
-#include <json-glib/json-glib.h>
-#include <dlog.h>
-#include "types.h"
+#include <string>
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/common/meta/include/MvMlPreprocess.h b/mv_machine_learning/common/meta/include/MvMlPreprocess.h
index abbd041..1d2f58d 100644 (file)
--- a/mv_machine_learning/common/meta/include/MvMlPreprocess.h
+++ b/mv_machine_learning/common/meta/include/MvMlPreprocess.h
@@ -17,9 +17,9 @@
 #ifndef __MV_ML_PREPROCESS_H__
 #define __MV_ML_PREPROCESS_H__
 
-#include <string>
 #include <map>
 #include <memory>
+#include <string>
 #include <vector>
 
 #include <inference_engine_type.h>

diff --git a/mv_machine_learning/common/meta/include/PostprocessParser.h b/mv_machine_learning/common/meta/include/PostprocessParser.h
index 018d504..e0c7842 100644 (file)
--- a/mv_machine_learning/common/meta/include/PostprocessParser.h
+++ b/mv_machine_learning/common/meta/include/PostprocessParser.h
@@ -17,18 +17,18 @@
 #ifndef __POSTPROCESS_PARSER_H__
 #define __POSTPROCESS_PARSER_H__
 
-#include <string>
 #include <map>
 #include <memory>
+#include <string>
 #include <vector>
 
-#include <dlog.h>
-#include "mv_private.h"
 #include "mv_common.h"
+#include "mv_private.h"
+#include <dlog.h>
 
+#include "AnchorParser.h"
 #include "MetaParser.h"
 #include "types.h"
-#include "AnchorParser.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/common/meta/include/meta_common.h b/mv_machine_learning/common/meta/include/meta_common.h
index 24caaf3..386df4d 100644 (file)
--- a/mv_machine_learning/common/meta/include/meta_common.h
+++ b/mv_machine_learning/common/meta/include/meta_common.h
@@ -17,15 +17,15 @@
 #ifndef __COMMON_H__
 #define __COMMON_H__
 
-#include <string>
-#include <mv_common.h>
-#include <mv_private.h>
-#include <json-glib/json-glib.h>
-#include <inference_engine_type.h>
-#include <dlog.h>
 #include "MvMlException.h"
 #include "mv_inference_type.h"
 #include "types.h"
+#include <dlog.h>
+#include <inference_engine_type.h>
+#include <json-glib/json-glib.h>
+#include <mv_common.h>
+#include <mv_private.h>
+#include <string>
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/common/meta/include/types.h b/mv_machine_learning/common/meta/include/types.h
index e8112ba..7569983 100644 (file)
--- a/mv_machine_learning/common/meta/include/types.h
+++ b/mv_machine_learning/common/meta/include/types.h
@@ -17,10 +17,10 @@
 #ifndef __TYPES_H__
 #define __TYPES_H__
 
-#include <string>
 #include <map>
 #include <memory>
 #include <opencv2/core/types.hpp>
+#include <string>
 
 #include <inference_engine_type.h>
 #include <mv_inference_type.h>

diff --git a/mv_machine_learning/common/meta/src/MetaParser.cpp b/mv_machine_learning/common/meta/src/MetaParser.cpp
index 56aebae..e85056f 100644 (file)
--- a/mv_machine_learning/common/meta/src/MetaParser.cpp
+++ b/mv_machine_learning/common/meta/src/MetaParser.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <unistd.h>
-#include <fstream>
 #include <algorithm>
+#include <fstream>
+#include <unistd.h>
 
-#include "MvMlException.h"
 #include "MetaParser.h"
+#include "MvMlException.h"
 #include "meta_common.h"
 
 using namespace std;

diff --git a/mv_machine_learning/common/meta/src/MvMlPreprocess.cpp b/mv_machine_learning/common/meta/src/MvMlPreprocess.cpp
index 0aa57c0..fe84999 100644 (file)
--- a/mv_machine_learning/common/meta/src/MvMlPreprocess.cpp
+++ b/mv_machine_learning/common/meta/src/MvMlPreprocess.cpp
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include <unistd.h>
-#include <fstream>
-#include <string>
-#include <queue>
-#include <algorithm>
-#include "mv_private.h"
 #include "MvMlPreprocess.h"
 #include "MvMlException.h"
+#include "mv_private.h"
+#include <algorithm>
+#include <fstream>
+#include <queue>
+#include <string>
+#include <unistd.h>
 
 constexpr int colorConvertTable[][12] = {
        { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },

diff --git a/mv_machine_learning/common/meta/src/Postprocess.cpp b/mv_machine_learning/common/meta/src/Postprocess.cpp
index 084d69b..54f87c9 100644 (file)
--- a/mv_machine_learning/common/meta/src/Postprocess.cpp
+++ b/mv_machine_learning/common/meta/src/Postprocess.cpp
@@ -16,8 +16,8 @@
 
 #include <cmath>
 
-#include "mv_private.h"
 #include "Postprocess.h"
+#include "mv_private.h"
 
 using namespace std;
 

diff --git a/mv_machine_learning/common/meta/src/PostprocessParser.cpp b/mv_machine_learning/common/meta/src/PostprocessParser.cpp
index cacc2f6..984acf5 100644 (file)
--- a/mv_machine_learning/common/meta/src/PostprocessParser.cpp
+++ b/mv_machine_learning/common/meta/src/PostprocessParser.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <unistd.h>
-#include <string>
-#include <queue>
-#include <algorithm>
-#include "MvMlException.h"
 #include "PostprocessParser.h"
+#include "MvMlException.h"
 #include "meta_common.h"
+#include <algorithm>
+#include <queue>
+#include <string>
+#include <unistd.h>
 
 using namespace std;
 using namespace mediavision::machine_learning::exception;

diff --git a/mv_machine_learning/common/src/MvMlConfig.cpp b/mv_machine_learning/common/src/MvMlConfig.cpp
index e44a3d3..1623326 100644 (file)
--- a/mv_machine_learning/common/src/MvMlConfig.cpp
+++ b/mv_machine_learning/common/src/MvMlConfig.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "MvMlException.h"
 #include "MvMlConfig.h"
+#include "MvMlException.h"
 #include "keys.h"
 
 using namespace std;

diff --git a/mv_machine_learning/common/src/native_capi.cpp b/mv_machine_learning/common/src/native_capi.cpp
index 25fc5eb..868f8e3 100644 (file)
--- a/mv_machine_learning/common/src/native_capi.cpp
+++ b/mv_machine_learning/common/src/native_capi.cpp
@@ -16,8 +16,8 @@
 
 #include "mv_private.h"
 
-#include "native_capi.h"
 #include "MvMlException.h"
+#include "native_capi.h"
 
 using namespace std;
 using namespace mediavision::common;

diff --git a/mv_machine_learning/face_recognition/include/FaceRecognition.h b/mv_machine_learning/face_recognition/include/FaceRecognition.h
index 5f2bdfa..895034b 100644 (file)
--- a/mv_machine_learning/face_recognition/include/FaceRecognition.h
+++ b/mv_machine_learning/face_recognition/include/FaceRecognition.h
@@ -17,19 +17,19 @@
 #ifndef __FACE_RECOGNITION_H__
 #define __FACE_RECOGNITION_H__
 
-#include <unordered_map>
 #include <mv_common.h>
 #include <mv_inference_type.h>
+#include <unordered_map>
 
-#include "training_engine_error.h"
-#include "training_engine_common_impl.h"
-#include "inference_engine_common_impl.h"
-#include "mv_ml_types.h"
+#include "DataSetManager.h"
+#include "FeatureVectorManager.h"
 #include "Inference.h"
 #include "LabelManager.h"
-#include "FeatureVectorManager.h"
-#include "DataSetManager.h"
 #include "SimpleShot.h"
+#include "inference_engine_common_impl.h"
+#include "mv_ml_types.h"
+#include "training_engine_common_impl.h"
+#include "training_engine_error.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/face_recognition/include/FaceRecognitionAdapter.h b/mv_machine_learning/face_recognition/include/FaceRecognitionAdapter.h
index f45a565..777d407 100644 (file)
--- a/mv_machine_learning/face_recognition/include/FaceRecognitionAdapter.h
+++ b/mv_machine_learning/face_recognition/include/FaceRecognitionAdapter.h
@@ -20,8 +20,8 @@
 #include <dlog.h>
 
 #include "EngineConfig.h"
-#include "ITask.h"
 #include "FaceRecognition.h"
+#include "ITask.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/face_recognition/include/FaceRecognitionDSM.h b/mv_machine_learning/face_recognition/include/FaceRecognitionDSM.h
index 196b965..4446ef4 100644 (file)
--- a/mv_machine_learning/face_recognition/include/FaceRecognitionDSM.h
+++ b/mv_machine_learning/face_recognition/include/FaceRecognitionDSM.h
@@ -19,8 +19,8 @@
 
 #include <string>
 
-#include "FeatureVectorManager.h"
 #include "DataSetManager.h"
+#include "FeatureVectorManager.h"
 
 class FaceRecognitionDSM : public DataSetManager
 {

diff --git a/mv_machine_learning/face_recognition/include/Facenet.h b/mv_machine_learning/face_recognition/include/Facenet.h
index c9d0ac3..19fa937 100644 (file)
--- a/mv_machine_learning/face_recognition/include/Facenet.h
+++ b/mv_machine_learning/face_recognition/include/Facenet.h
@@ -21,11 +21,11 @@
 #include <mv_inference_type.h>
 
 #include "EngineConfig.h"
-#include "inference_engine_common_impl.h"
-#include "Inference.h"
 #include "FacenetParser.h"
-#include "face_recognition_type.h"
+#include "Inference.h"
 #include "MvMlPreprocess.h"
+#include "face_recognition_type.h"
+#include "inference_engine_common_impl.h"
 #include "mv_ml_types.h"
 
 namespace mediavision

diff --git a/mv_machine_learning/face_recognition/include/FacenetAdapter.h b/mv_machine_learning/face_recognition/include/FacenetAdapter.h
index b2ef514..67cd661 100644 (file)
--- a/mv_machine_learning/face_recognition/include/FacenetAdapter.h
+++ b/mv_machine_learning/face_recognition/include/FacenetAdapter.h
@@ -20,9 +20,9 @@
 #include <dlog.h>
 
 #include "EngineConfig.h"
+#include "Facenet.h"
 #include "ITask.h"
 #include "mv_ml_types.h"
-#include "Facenet.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/face_recognition/include/SimpleShot.h b/mv_machine_learning/face_recognition/include/SimpleShot.h
index 48ef349..0eb91cc 100644 (file)
--- a/mv_machine_learning/face_recognition/include/SimpleShot.h
+++ b/mv_machine_learning/face_recognition/include/SimpleShot.h
@@ -17,8 +17,8 @@
 #ifndef __SIMPLE_SHOT_H__
 #define __SIMPLE_SHOT_H__
 
-#include <mv_inference_type.h>
 #include "TrainingModel.h"
+#include <mv_inference_type.h>
 
 class SimpleShot : public TrainingModel
 {

diff --git a/mv_machine_learning/face_recognition/src/FaceRecognition.cpp b/mv_machine_learning/face_recognition/src/FaceRecognition.cpp
index 2af63a2..7b8773b 100644 (file)
--- a/mv_machine_learning/face_recognition/src/FaceRecognition.cpp
+++ b/mv_machine_learning/face_recognition/src/FaceRecognition.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <string.h>
+#include <algorithm>
 #include <fstream>
 #include <istream>
-#include <tuple>
 #include <map>
-#include <algorithm>
+#include <string.h>
+#include <tuple>
 
 #include <sys/stat.h>
 
@@ -27,11 +27,11 @@
 #include <mv_common.h>
 #include <mv_private.h>
 
-#include "MvMlException.h"
-#include "TensorBuffer.h"
 #include "FaceRecognition.h"
-#include "FaceRecognitionFVM.h"
 #include "FaceRecognitionDSM.h"
+#include "FaceRecognitionFVM.h"
+#include "MvMlException.h"
+#include "TensorBuffer.h"
 #include "file_util.h"
 
 using namespace std;

diff --git a/mv_machine_learning/face_recognition/src/FaceRecognitionAdapter.cpp b/mv_machine_learning/face_recognition/src/FaceRecognitionAdapter.cpp
index 3e0ae4d..e263e2e 100644 (file)
--- a/mv_machine_learning/face_recognition/src/FaceRecognitionAdapter.cpp
+++ b/mv_machine_learning/face_recognition/src/FaceRecognitionAdapter.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "MvMlException.h"
 #include "FaceRecognitionAdapter.h"
+#include "MvMlException.h"
 #include "face_recognition_type.h"
 #include <app_common.h>
 

diff --git a/mv_machine_learning/face_recognition/src/FaceRecognitionDSM.cpp b/mv_machine_learning/face_recognition/src/FaceRecognitionDSM.cpp
index a13a998..38cb6e0 100644 (file)
--- a/mv_machine_learning/face_recognition/src/FaceRecognitionDSM.cpp
+++ b/mv_machine_learning/face_recognition/src/FaceRecognitionDSM.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
+#include <algorithm>
 #include <dlog.h>
 #include <mv_private.h>
-#include <algorithm>
 
-#include "MvMlException.h"
 #include "FaceRecognitionDSM.h"
+#include "MvMlException.h"
 
 #define MAX_FEATURE_VECTOR_CNT 5
 #define MAX_FEATURE_SIZE 1024

diff --git a/mv_machine_learning/face_recognition/src/FaceRecognitionFVM.cpp b/mv_machine_learning/face_recognition/src/FaceRecognitionFVM.cpp
index e93326f..34ec24e 100644 (file)
--- a/mv_machine_learning/face_recognition/src/FaceRecognitionFVM.cpp
+++ b/mv_machine_learning/face_recognition/src/FaceRecognitionFVM.cpp
@@ -17,8 +17,8 @@
 #include <fstream>
 #include <unistd.h>
 
-#include "MvMlException.h"
 #include "FaceRecognitionFVM.h"
+#include "MvMlException.h"
 
 using namespace std;
 using namespace mediavision::machine_learning::exception;

diff --git a/mv_machine_learning/face_recognition/src/Facenet.cpp b/mv_machine_learning/face_recognition/src/Facenet.cpp
index 5b1c48e..09abf0b 100644 (file)
--- a/mv_machine_learning/face_recognition/src/Facenet.cpp
+++ b/mv_machine_learning/face_recognition/src/Facenet.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <string.h>
+#include <algorithm>
 #include <map>
 #include <memory>
-#include <algorithm>
+#include <string.h>
 
-#include "MvMlException.h"
 #include "Facenet.h"
+#include "MvMlException.h"
 #include "face_recognition_type.h"
 
 using namespace std;

diff --git a/mv_machine_learning/face_recognition/src/FacenetAdapter.cpp b/mv_machine_learning/face_recognition/src/FacenetAdapter.cpp
index 842b665..c3c0df6 100644 (file)
--- a/mv_machine_learning/face_recognition/src/FacenetAdapter.cpp
+++ b/mv_machine_learning/face_recognition/src/FacenetAdapter.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "MvMlException.h"
 #include "FacenetAdapter.h"
+#include "MvMlException.h"
 
 using namespace std;
 using namespace MediaVision::Common;

diff --git a/mv_machine_learning/face_recognition/src/FacenetParser.cpp b/mv_machine_learning/face_recognition/src/FacenetParser.cpp
index 6789e4d..9b816a3 100644 (file)
--- a/mv_machine_learning/face_recognition/src/FacenetParser.cpp
+++ b/mv_machine_learning/face_recognition/src/FacenetParser.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "MvMlException.h"
 #include "FacenetParser.h"
+#include "MvMlException.h"
 
 using namespace std;
 using namespace mediavision::machine_learning::exception;

diff --git a/mv_machine_learning/face_recognition/src/mv_face_recognition.cpp b/mv_machine_learning/face_recognition/src/mv_face_recognition.cpp
index 8a5a663..8f21dd1 100644 (file)
--- a/mv_machine_learning/face_recognition/src/mv_face_recognition.cpp
+++ b/mv_machine_learning/face_recognition/src/mv_face_recognition.cpp
@@ -19,15 +19,15 @@
 #include <memory>
 #include <mutex>
 
-#include "mv_private.h"
-#include "mv_feature_key.h"
 #include "Context.h"
-#include "MvMlException.h"
 #include "FaceRecognitionAdapter.h"
 #include "FacenetAdapter.h"
-#include "native_capi.h"
+#include "MvMlException.h"
 #include "mv_face_recognition.h"
 #include "mv_face_recognition_internal.h"
+#include "mv_feature_key.h"
+#include "mv_private.h"
+#include "native_capi.h"
 
 using namespace std;
 using namespace mediavision::common;

diff --git a/mv_machine_learning/face_recognition/src/simple_shot.cpp b/mv_machine_learning/face_recognition/src/simple_shot.cpp
index d508ac5..34de412 100644 (file)
--- a/mv_machine_learning/face_recognition/src/simple_shot.cpp
+++ b/mv_machine_learning/face_recognition/src/simple_shot.cpp
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-#include <string.h>
+#include <algorithm>
 #include <fstream>
 #include <istream>
-#include <tuple>
 #include <map>
-#include <algorithm>
+#include <string.h>
+#include <tuple>
 
 #include <sys/stat.h>
 
-#include "MvMlException.h"
-#include "SimpleShot.h"
 #include "DataSetManager.h"
 #include "FeatureVectorManager.h"
+#include "MvMlException.h"
+#include "SimpleShot.h"
 #include "file_util.h"
 
 using namespace std;

diff --git a/mv_machine_learning/image_classification/include/ImageClassification.h b/mv_machine_learning/image_classification/include/ImageClassification.h
index f4d99d4..985be82 100644 (file)
--- a/mv_machine_learning/image_classification/include/ImageClassification.h
+++ b/mv_machine_learning/image_classification/include/ImageClassification.h
@@ -17,20 +17,20 @@
 #ifndef __IMAGE_CLASSIFICATION_H__
 #define __IMAGE_CLASSIFICATION_H__
 
+#include "mv_private.h"
 #include <mv_common.h>
 #include <mv_inference_type.h>
-#include "mv_private.h"
 
+#include "AsyncManager.h"
 #include "EngineConfig.h"
-#include "inference_engine_common_impl.h"
+#include "IImageClassification.h"
+#include "ImageClassificationParser.h"
 #include "Inference.h"
-#include "image_classification_type.h"
 #include "MetaParser.h"
 #include "MvMlConfig.h"
-#include "ImageClassificationParser.h"
 #include "MvMlPreprocess.h"
-#include "AsyncManager.h"
-#include "IImageClassification.h"
+#include "image_classification_type.h"
+#include "inference_engine_common_impl.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/image_classification/include/ImageClassificationAdapter.h b/mv_machine_learning/image_classification/include/ImageClassificationAdapter.h
index 23deb88..412f97e 100644 (file)
--- a/mv_machine_learning/image_classification/include/ImageClassificationAdapter.h
+++ b/mv_machine_learning/image_classification/include/ImageClassificationAdapter.h
@@ -20,10 +20,10 @@
 #include <dlog.h>
 
 #include "EngineConfig.h"
+#include "IImageClassification.h"
 #include "ITask.h"
-#include "MvMlConfig.h"
 #include "ImageClassificationDefault.h"
-#include "IImageClassification.h"
+#include "MvMlConfig.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/image_classification/include/ImageClassificationDefault.h b/mv_machine_learning/image_classification/include/ImageClassificationDefault.h
index 04f27a9..5538907 100644 (file)
--- a/mv_machine_learning/image_classification/include/ImageClassificationDefault.h
+++ b/mv_machine_learning/image_classification/include/ImageClassificationDefault.h
@@ -17,13 +17,13 @@
 #ifndef __IMAGE_CLASSIFICATION_FLOAT_H__
 #define __IMAGE_CLASSIFICATION_FLOAT_H__
 
+#include "mv_private.h"
 #include <memory>
 #include <mv_common.h>
-#include "mv_private.h"
 
+#include "EngineConfig.h"
 #include "ImageClassification.h"
 #include <mv_inference_type.h>
-#include "EngineConfig.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/image_classification/include/image_classification_type.h b/mv_machine_learning/image_classification/include/image_classification_type.h
index db663b5..1730017 100644 (file)
--- a/mv_machine_learning/image_classification/include/image_classification_type.h
+++ b/mv_machine_learning/image_classification/include/image_classification_type.h
@@ -19,9 +19,9 @@
 
 #include <string>
 
+#include "mv_ml_types.h"
 #include <mv_common.h>
 #include <mv_inference_type.h>
-#include "mv_ml_types.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/image_classification/src/ImageClassification.cpp b/mv_machine_learning/image_classification/src/ImageClassification.cpp
index 0976f91..f61b2de 100644 (file)
--- a/mv_machine_learning/image_classification/src/ImageClassification.cpp
+++ b/mv_machine_learning/image_classification/src/ImageClassification.cpp
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-#include <string.h>
+#include <algorithm>
 #include <fstream>
 #include <map>
 #include <memory>
-#include <algorithm>
+#include <string.h>
 
+#include "ImageClassification.h"
 #include "MvMlException.h"
 #include "common.h"
 #include "mv_image_classification_config.h"
-#include "ImageClassification.h"
 
 using namespace std;
 using namespace mediavision::inference;

diff --git a/mv_machine_learning/image_classification/src/ImageClassificationAdapter.cpp b/mv_machine_learning/image_classification/src/ImageClassificationAdapter.cpp
index 9a445ab..69a5198 100644 (file)
--- a/mv_machine_learning/image_classification/src/ImageClassificationAdapter.cpp
+++ b/mv_machine_learning/image_classification/src/ImageClassificationAdapter.cpp
@@ -16,9 +16,9 @@
 
 #include <string>
 
+#include "ImageClassificationAdapter.h"
 #include "MvMlException.h"
 #include "mv_image_classification_config.h"
-#include "ImageClassificationAdapter.h"
 
 using namespace std;
 using namespace MediaVision::Common;

diff --git a/mv_machine_learning/image_classification/src/ImageClassificationDefault.cpp b/mv_machine_learning/image_classification/src/ImageClassificationDefault.cpp
index 36e48ec..648db60 100644 (file)
--- a/mv_machine_learning/image_classification/src/ImageClassificationDefault.cpp
+++ b/mv_machine_learning/image_classification/src/ImageClassificationDefault.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <string.h>
+#include <algorithm>
 #include <map>
 #include <set>
-#include <algorithm>
+#include <string.h>
 
-#include "MvMlException.h"
 #include "ImageClassificationDefault.h"
+#include "MvMlException.h"
 #include "Postprocess.h"
 
 using namespace std;

diff --git a/mv_machine_learning/image_classification/src/ImageClassificationParser.cpp b/mv_machine_learning/image_classification/src/ImageClassificationParser.cpp
index 965ff5c..effa790 100644 (file)
--- a/mv_machine_learning/image_classification/src/ImageClassificationParser.cpp
+++ b/mv_machine_learning/image_classification/src/ImageClassificationParser.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "MvMlException.h"
 #include "ImageClassificationParser.h"
+#include "MvMlException.h"
 
 using namespace std;
 using namespace mediavision::machine_learning::exception;

diff --git a/mv_machine_learning/image_classification/src/mv_image_classification.cpp b/mv_machine_learning/image_classification/src/mv_image_classification.cpp
index aca756f..104a9e2 100644 (file)
--- a/mv_machine_learning/image_classification/src/mv_image_classification.cpp
+++ b/mv_machine_learning/image_classification/src/mv_image_classification.cpp
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-#include "mv_private.h"
-#include "mv_feature_key.h"
+#include "Context.h"
 #include "ITask.h"
-#include "mv_image_classification_internal.h"
 #include "ImageClassificationAdapter.h"
 #include "MvMlException.h"
-#include "native_capi.h"
 #include "image_classification_type.h"
-#include "Context.h"
+#include "mv_feature_key.h"
+#include "mv_image_classification_internal.h"
+#include "mv_private.h"
+#include "native_capi.h"
 
+#include <algorithm>
 #include <new>
-#include <unistd.h>
 #include <string>
-#include <algorithm>
+#include <unistd.h>
 
 #define TASK_NAME "image_classification"
 

diff --git a/mv_machine_learning/image_segmentation/include/ImageSegmentation.h b/mv_machine_learning/image_segmentation/include/ImageSegmentation.h
index 31095be..4f48595 100644 (file)
--- a/mv_machine_learning/image_segmentation/include/ImageSegmentation.h
+++ b/mv_machine_learning/image_segmentation/include/ImageSegmentation.h
@@ -17,25 +17,25 @@
 #ifndef __IMAGE_SEGMENTATION_H__
 #define __IMAGE_SEGMENTATION_H__
 
+#include <atomic>
+#include <mutex>
 #include <queue>
 #include <thread>
-#include <mutex>
-#include <atomic>
 
+#include "mv_private.h"
 #include <mv_common.h>
 #include <mv_inference_type.h>
-#include "mv_private.h"
 
+#include "AsyncManager.h"
 #include "EngineConfig.h"
-#include "inference_engine_common_impl.h"
+#include "IImageSegmentation.h"
+#include "ImageSegmentationParser.h"
 #include "Inference.h"
-#include "image_segmentation_type.h"
 #include "MetaParser.h"
 #include "MvMlConfig.h"
-#include "ImageSegmentationParser.h"
 #include "MvMlPreprocess.h"
-#include "IImageSegmentation.h"
-#include "AsyncManager.h"
+#include "image_segmentation_type.h"
+#include "inference_engine_common_impl.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/image_segmentation/include/ImageSegmentationAdapter.h b/mv_machine_learning/image_segmentation/include/ImageSegmentationAdapter.h
index 0f7968f..2c388a0 100644 (file)
--- a/mv_machine_learning/image_segmentation/include/ImageSegmentationAdapter.h
+++ b/mv_machine_learning/image_segmentation/include/ImageSegmentationAdapter.h
@@ -20,9 +20,9 @@
 #include <dlog.h>
 
 #include "EngineConfig.h"
+#include "IImageSegmentation.h"
 #include "ITask.h"
 #include "ImageSegmentation.h"
-#include "IImageSegmentation.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/image_segmentation/include/ImageSegmentationExternal.h b/mv_machine_learning/image_segmentation/include/ImageSegmentationExternal.h
index e662e48..89fb947 100644 (file)
--- a/mv_machine_learning/image_segmentation/include/ImageSegmentationExternal.h
+++ b/mv_machine_learning/image_segmentation/include/ImageSegmentationExternal.h
@@ -23,8 +23,8 @@
 #include <opencv2/core.hpp>
 #include <opencv2/imgproc.hpp>
 
-#include "image_segmentation_type.h"
 #include "IImageSegmentation.h"
+#include "image_segmentation_type.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/image_segmentation/include/image_segmentation_type.h b/mv_machine_learning/image_segmentation/include/image_segmentation_type.h
index 0b9f688..df1d68d 100644 (file)
--- a/mv_machine_learning/image_segmentation/include/image_segmentation_type.h
+++ b/mv_machine_learning/image_segmentation/include/image_segmentation_type.h
@@ -19,9 +19,9 @@
 
 #include <opencv2/core.hpp>
 
+#include "mv_ml_types.h"
 #include <mv_common.h>
 #include <mv_inference_type.h>
-#include "mv_ml_types.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/image_segmentation/src/ImageSegmentation.cpp b/mv_machine_learning/image_segmentation/src/ImageSegmentation.cpp
index 7fecb32..55870eb 100644 (file)
--- a/mv_machine_learning/image_segmentation/src/ImageSegmentation.cpp
+++ b/mv_machine_learning/image_segmentation/src/ImageSegmentation.cpp
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#include <string.h>
 #include <fstream>
 #include <map>
 #include <memory>
+#include <string.h>
 
+#include "ImageSegmentation.h"
 #include "MvMlException.h"
 #include "common.h"
 #include "mv_image_segmentation_config.h"
-#include "ImageSegmentation.h"
 
 using namespace std;
 using namespace mediavision::inference;

diff --git a/mv_machine_learning/image_segmentation/src/ImageSegmentationAdapter.cpp b/mv_machine_learning/image_segmentation/src/ImageSegmentationAdapter.cpp
index 381ba6c..ad7c127 100644 (file)
--- a/mv_machine_learning/image_segmentation/src/ImageSegmentationAdapter.cpp
+++ b/mv_machine_learning/image_segmentation/src/ImageSegmentationAdapter.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "MvMlException.h"
 #include "ImageSegmentationAdapter.h"
 #include "ImageSegmentationExternal.h"
+#include "MvMlException.h"
 #include "mv_image_segmentation_config.h"
 
 using namespace std;

diff --git a/mv_machine_learning/image_segmentation/src/ImageSegmentationExternal.cpp b/mv_machine_learning/image_segmentation/src/ImageSegmentationExternal.cpp
index 267f3ed..73fac4a 100644 (file)
--- a/mv_machine_learning/image_segmentation/src/ImageSegmentationExternal.cpp
+++ b/mv_machine_learning/image_segmentation/src/ImageSegmentationExternal.cpp
@@ -19,8 +19,8 @@
 
 #include "mv_private.h"
 
-#include "MvMlException.h"
 #include "ImageSegmentationExternal.h"
+#include "MvMlException.h"
 
 using namespace std;
 using namespace mediavision::machine_learning::exception;

diff --git a/mv_machine_learning/image_segmentation/src/ImageSegmentationParser.cpp b/mv_machine_learning/image_segmentation/src/ImageSegmentationParser.cpp
index a3e56ca..b23e6f3 100644 (file)
--- a/mv_machine_learning/image_segmentation/src/ImageSegmentationParser.cpp
+++ b/mv_machine_learning/image_segmentation/src/ImageSegmentationParser.cpp
@@ -15,8 +15,8 @@
  */
 #include <memory>
 
-#include "MvMlException.h"
 #include "ImageSegmentationParser.h"
+#include "MvMlException.h"
 #include "image_segmentation_type.h"
 
 using namespace std;

diff --git a/mv_machine_learning/image_segmentation/src/mv_selfie_segmentation.cpp b/mv_machine_learning/image_segmentation/src/mv_selfie_segmentation.cpp
index edf0ea2..f9e366a 100644 (file)
--- a/mv_machine_learning/image_segmentation/src/mv_selfie_segmentation.cpp
+++ b/mv_machine_learning/image_segmentation/src/mv_selfie_segmentation.cpp
@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-#include "mv_private.h"
-#include "mv_feature_key.h"
+#include "Context.h"
 #include "ITask.h"
-#include "mv_selfie_segmentation_type.h"
-#include "mv_selfie_segmentation_internal.h"
 #include "ImageSegmentationAdapter.h"
 #include "MvMlException.h"
-#include "native_capi.h"
 #include "image_segmentation_type.h"
-#include "Context.h"
+#include "mv_feature_key.h"
+#include "mv_private.h"
+#include "mv_selfie_segmentation_internal.h"
+#include "mv_selfie_segmentation_type.h"
+#include "native_capi.h"
 
-#include <new>
-#include <unistd.h>
-#include <string>
 #include <algorithm>
-#include <mutex>
 #include <iostream>
+#include <mutex>
+#include <new>
+#include <string>
+#include <unistd.h>
 
 #define TASK_NAME "selfie_segmentation"
 

diff --git a/mv_machine_learning/inference/include/BoxInfo.h b/mv_machine_learning/inference/include/BoxInfo.h
index 1414bfb..b64d258 100644 (file)
--- a/mv_machine_learning/inference/include/BoxInfo.h
+++ b/mv_machine_learning/inference/include/BoxInfo.h
@@ -17,14 +17,14 @@
 #ifndef __BOX_INFO_H__
 #define __BOX_INFO_H__
 
-#include <string>
-#include <vector>
 #include <map>
 #include <memory>
+#include <string>
+#include <vector>
 
+#include <inference_engine_type.h>
 #include <json-glib/json-glib.h>
 #include <mv_inference_type.h>
-#include <inference_engine_type.h>
 
 #include "DecodeInfo.h"
 #include "DimInfo.h"

diff --git a/mv_machine_learning/inference/include/Bvh.h b/mv_machine_learning/inference/include/Bvh.h
index 150671e..9186c4d 100644 (file)
--- a/mv_machine_learning/inference/include/Bvh.h
+++ b/mv_machine_learning/inference/include/Bvh.h
@@ -1,10 +1,10 @@
 #ifndef __MEDIA_VISION_BVH_H__
 #define __MEDIA_VISION_BVH_H__
 
-#include <opencv2/core.hpp>
-#include <opencv2/imgproc.hpp>
 #include "Joint.h"
 #include <memory>
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc.hpp>
 #include <vector>
 
 namespace mediavision

diff --git a/mv_machine_learning/inference/include/DecodeInfo.h b/mv_machine_learning/inference/include/DecodeInfo.h
index f3b2afe..9e4817e 100644 (file)
--- a/mv_machine_learning/inference/include/DecodeInfo.h
+++ b/mv_machine_learning/inference/include/DecodeInfo.h
@@ -17,15 +17,15 @@
 #ifndef __DECODE_INFO_H__
 #define __DECODE_INFO_H__
 
-#include <string>
-#include <vector>
 #include <map>
 #include <memory>
+#include <string>
+#include <vector>
 
+#include "Utils.h"
 #include <MetadataType.h>
 #include <mv_inference_type.h>
 #include <opencv2/core.hpp>
-#include "Utils.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/inference/include/DimInfo.h b/mv_machine_learning/inference/include/DimInfo.h
index 68c3df7..744d9a4 100644 (file)
--- a/mv_machine_learning/inference/include/DimInfo.h
+++ b/mv_machine_learning/inference/include/DimInfo.h
@@ -17,8 +17,8 @@
 #ifndef __DIM_INFO_H__
 #define __DIM_INFO_H__
 
-#include <vector>
 #include <dlog.h>
+#include <vector>
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/inference/include/DispVec.h b/mv_machine_learning/inference/include/DispVec.h
index 996d897..7147ad4 100644 (file)
--- a/mv_machine_learning/inference/include/DispVec.h
+++ b/mv_machine_learning/inference/include/DispVec.h
@@ -17,16 +17,16 @@
 #ifndef __DISP_VEC_H__
 #define __DISP_VEC_H__
 
-#include "MetadataType.h"
 #include "DimInfo.h"
+#include "MetadataType.h"
 #include "Utils.h"
 
 #include <mv_inference_type.h>
 
-#include <string>
-#include <vector>
 #include <map>
 #include <memory>
+#include <string>
+#include <vector>
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/inference/include/Inference.h b/mv_machine_learning/inference/include/Inference.h
index 576a630..bf4e472 100644 (file)
--- a/mv_machine_learning/inference/include/Inference.h
+++ b/mv_machine_learning/inference/include/Inference.h
@@ -17,23 +17,23 @@
 #ifndef __MEDIA_VISION_INFERENCE_H__
 #define __MEDIA_VISION_INFERENCE_H__
 
-#include <string>
 #include <map>
 #include <memory>
+#include <string>
 
-#include "mv_common.h"
-#include "inference_engine_error.h"
+#include "MetaParser.h"
+#include "Metadata.h"
+#include "PostProcess.h"
+#include "PreProcess.h"
+#include "TensorBuffer.h"
 #include "inference_engine_common_impl.h"
+#include "inference_engine_error.h"
+#include "mv_common.h"
 #include "mv_inference_private.h"
+#include "types.h"
 #include <mv_inference_type.h>
 #include <opencv2/core.hpp>
 #include <opencv2/imgproc.hpp>
-#include "types.h"
-#include "Metadata.h"
-#include "MetaParser.h"
-#include "PreProcess.h"
-#include "PostProcess.h"
-#include "TensorBuffer.h"
 
 #include "Landmark.h"
 

diff --git a/mv_machine_learning/inference/include/InferenceIni.h b/mv_machine_learning/inference/include/InferenceIni.h
index 6f95a0a..b1ca63b 100644 (file)
--- a/mv_machine_learning/inference/include/InferenceIni.h
+++ b/mv_machine_learning/inference/include/InferenceIni.h
@@ -17,9 +17,9 @@
 #ifndef __MEDIA_VISION_INFERENCE_INI_H__
 #define __MEDIA_VISION_INFERENCE_INI_H__
 
+#include <mv_inference_type.h>
 #include <string>
 #include <vector>
-#include <mv_inference_type.h>
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/inference/include/InputMetadata.h b/mv_machine_learning/inference/include/InputMetadata.h
index b7f45b5..fc9b3ee 100644 (file)
--- a/mv_machine_learning/inference/include/InputMetadata.h
+++ b/mv_machine_learning/inference/include/InputMetadata.h
@@ -17,9 +17,9 @@
 #ifndef __MEDIA_VISION_INPUTMETADATA_H__
 #define __MEDIA_VISION_INPUTMETADATA_H__
 
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
 
 #include "MetadataType.h"
 #include <inference_engine_type.h>

diff --git a/mv_machine_learning/inference/include/Joint.h b/mv_machine_learning/inference/include/Joint.h
index 6632f97..4c805f7 100644 (file)
--- a/mv_machine_learning/inference/include/Joint.h
+++ b/mv_machine_learning/inference/include/Joint.h
@@ -1,8 +1,8 @@
 #ifndef __MEDIA_VISION_JOINT_H__
 #define __MEDIA_VISION_JOINT_H__
 
-#include <opencv2/core.hpp>
 #include <memory>
+#include <opencv2/core.hpp>
 #include <string>
 #include <vector>
 

diff --git a/mv_machine_learning/inference/include/LabelInfo.h b/mv_machine_learning/inference/include/LabelInfo.h
index 81cd66f..dc4dfab 100644 (file)
--- a/mv_machine_learning/inference/include/LabelInfo.h
+++ b/mv_machine_learning/inference/include/LabelInfo.h
@@ -17,14 +17,14 @@
 #ifndef __LABEL_INFO_H__
 #define __LABEL_INFO_H__
 
-#include <string>
-#include <vector>
 #include <map>
 #include <memory>
+#include <string>
+#include <vector>
 
+#include <inference_engine_type.h>
 #include <json-glib/json-glib.h>
 #include <mv_inference_type.h>
-#include <inference_engine_type.h>
 
 #include "DecodeInfo.h"
 #include "DimInfo.h"

diff --git a/mv_machine_learning/inference/include/Landmark.h b/mv_machine_learning/inference/include/Landmark.h
index f604094..8f2c6d8 100644 (file)
--- a/mv_machine_learning/inference/include/Landmark.h
+++ b/mv_machine_learning/inference/include/Landmark.h
@@ -17,17 +17,17 @@
 #ifndef __LANDMARK_H__
 #define __LANDMARK_H__
 
-#include "Edge.h"
 #include "DimInfo.h"
 #include "DispVec.h"
+#include "Edge.h"
 #include "Utils.h"
 
-#include <opencv2/core.hpp>
 #include <json-glib/json-glib.h>
+#include <opencv2/core.hpp>
 
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
 
 /**
  * @file Landmark.h

diff --git a/mv_machine_learning/inference/include/Metadata.h b/mv_machine_learning/inference/include/Metadata.h
index b12fc75..3d653f5 100644 (file)
--- a/mv_machine_learning/inference/include/Metadata.h
+++ b/mv_machine_learning/inference/include/Metadata.h
@@ -17,15 +17,15 @@
 #ifndef __MEDIA_VISION_METADATA_H__
 #define __MEDIA_VISION_METADATA_H__
 
-#include <string>
 #include <map>
+#include <string>
 
-#include "mv_common.h"
-#include "mv_inference_private.h"
-#include <mv_inference_type.h>
 #include "InputMetadata.h"
 #include "OutputMetadata.h"
+#include "mv_common.h"
+#include "mv_inference_private.h"
 #include <json-glib/json-glib.h>
+#include <mv_inference_type.h>
 
 /**
  * @file Metadata.h

diff --git a/mv_machine_learning/inference/include/MetadataType.h b/mv_machine_learning/inference/include/MetadataType.h
index 6b76140..f5483b4 100644 (file)
--- a/mv_machine_learning/inference/include/MetadataType.h
+++ b/mv_machine_learning/inference/include/MetadataType.h
@@ -17,9 +17,9 @@
 #ifndef __MEDIA_VISION_OUTPUTMETADATA_TYPES_H__
 #define __MEDIA_VISION_OUTPUTMETADATA_TYPES_H__
 
+#include <inference_engine_type.h>
 #include <mv_common.h>
 #include <mv_inference_type.h>
-#include <inference_engine_type.h>
 
 /**
  * @file OutputMetadataTypes.h

diff --git a/mv_machine_learning/inference/include/NumberInfo.h b/mv_machine_learning/inference/include/NumberInfo.h
index 7c51799..6a0451f 100644 (file)
--- a/mv_machine_learning/inference/include/NumberInfo.h
+++ b/mv_machine_learning/inference/include/NumberInfo.h
@@ -17,14 +17,14 @@
 #ifndef __NUMBER_INFO_H__
 #define __NUMBER_INFO_H__
 
-#include <string>
-#include <vector>
 #include <map>
 #include <memory>
+#include <string>
+#include <vector>
 
+#include <inference_engine_type.h>
 #include <json-glib/json-glib.h>
 #include <mv_inference_type.h>
-#include <inference_engine_type.h>
 
 #include "DecodeInfo.h"
 #include "DimInfo.h"

diff --git a/mv_machine_learning/inference/include/ObjectDecoder.h b/mv_machine_learning/inference/include/ObjectDecoder.h
index bbc33a4..feff65c 100644 (file)
--- a/mv_machine_learning/inference/include/ObjectDecoder.h
+++ b/mv_machine_learning/inference/include/ObjectDecoder.h
@@ -17,15 +17,15 @@
 #ifndef __MEDIA_VISION_OBJECTDECODER_H__
 #define __MEDIA_VISION_OBJECTDECODER_H__
 
-#include <string>
-#include <vector>
-#include <map>
 #include <list>
+#include <map>
 #include <opencv2/core.hpp>
+#include <string>
+#include <vector>
 
-#include "TensorBuffer.h"
 #include "OutputMetadata.h"
 #include "PostProcess.h"
+#include "TensorBuffer.h"
 
 /**
  * @file ObjectDecoder.h

diff --git a/mv_machine_learning/inference/include/OffsetVec.h b/mv_machine_learning/inference/include/OffsetVec.h
index 6b3746e..b714725 100644 (file)
--- a/mv_machine_learning/inference/include/OffsetVec.h
+++ b/mv_machine_learning/inference/include/OffsetVec.h
@@ -17,13 +17,13 @@
 #ifndef __OFFSET_VEC_H__
 #define __OFFSET_VEC_H__
 
+#include <memory>
 #include <string>
 #include <vector>
-#include <memory>
 
-#include <mv_inference_type.h>
 #include "DimInfo.h"
 #include "Utils.h"
+#include <mv_inference_type.h>
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/inference/include/OutputMetadata.h b/mv_machine_learning/inference/include/OutputMetadata.h
index f04bc23..9d9ebcc 100644 (file)
--- a/mv_machine_learning/inference/include/OutputMetadata.h
+++ b/mv_machine_learning/inference/include/OutputMetadata.h
@@ -17,26 +17,26 @@
 #ifndef __MEDIA_VISION_OUTPUTMETADATA_H__
 #define __MEDIA_VISION_OUTPUTMETADATA_H__
 
-#include <string>
-#include <vector>
 #include <map>
 #include <memory>
+#include <string>
+#include <vector>
 
-#include <mv_inference_type.h>
-#include <inference_engine_type.h>
-#include <json-glib/json-glib.h>
-#include <opencv2/core.hpp>
-#include "MetadataType.h"
+#include "BoxInfo.h"
 #include "DecodeInfo.h"
-#include "Edge.h"
-#include "DispVec.h"
 #include "DimInfo.h"
-#include "OffsetVec.h"
-#include "Landmark.h"
-#include "BoxInfo.h"
+#include "DispVec.h"
+#include "Edge.h"
 #include "LabelInfo.h"
+#include "Landmark.h"
+#include "MetadataType.h"
 #include "NumberInfo.h"
+#include "OffsetVec.h"
 #include "ScoreInfo.h"
+#include <inference_engine_type.h>
+#include <json-glib/json-glib.h>
+#include <mv_inference_type.h>
+#include <opencv2/core.hpp>
 
 /**
  * @file OutputMetadata.h

diff --git a/mv_machine_learning/inference/include/PoseDecoder.h b/mv_machine_learning/inference/include/PoseDecoder.h
index 22e3fc1..dbe12a2 100644 (file)
--- a/mv_machine_learning/inference/include/PoseDecoder.h
+++ b/mv_machine_learning/inference/include/PoseDecoder.h
@@ -17,14 +17,14 @@
 #ifndef __MEDIA_VISION_POSEDECODER_H__
 #define __MEDIA_VISION_POSEDECODER_H__
 
+#include <list>
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
-#include <list>
 
-#include "TensorBuffer.h"
-#include "OutputMetadata.h"
 #include "Landmark.h"
+#include "OutputMetadata.h"
+#include "TensorBuffer.h"
 
 /**
  * @file PoseDecoder.h

diff --git a/mv_machine_learning/inference/include/PostProcess.h b/mv_machine_learning/inference/include/PostProcess.h
index 8a097d7..0d00d66 100644 (file)
--- a/mv_machine_learning/inference/include/PostProcess.h
+++ b/mv_machine_learning/inference/include/PostProcess.h
@@ -17,12 +17,12 @@
 #ifndef __MEDIA_VISION_POSTPROCESS_H__
 #define __MEDIA_VISION_POSTPROCESS_H__
 
-#include <string>
 #include <map>
 #include <queue>
+#include <string>
 
-#include "mv_common.h"
 #include "OutputMetadata.h"
+#include "mv_common.h"
 
 #include <opencv2/core.hpp>
 #include <opencv2/imgproc.hpp>

diff --git a/mv_machine_learning/inference/include/Posture.h b/mv_machine_learning/inference/include/Posture.h
index 0359d70..6dbb4b3 100644 (file)
--- a/mv_machine_learning/inference/include/Posture.h
+++ b/mv_machine_learning/inference/include/Posture.h
@@ -17,13 +17,13 @@
 #ifndef __MEDIA_VISION_POSE_H__
 #define __MEDIA_VISION_POSE_H__
 
-#include <string>
 #include <map>
+#include <string>
 
-#include "mv_common.h"
-#include "Inference.h"
 #include "Bvh.h"
 #include "BvhParser.h"
+#include "Inference.h"
+#include "mv_common.h"
 #include <mv_inference_type.h>
 #include <opencv2/core.hpp>
 #include <opencv2/imgproc.hpp>

diff --git a/mv_machine_learning/inference/include/PreProcess.h b/mv_machine_learning/inference/include/PreProcess.h
index 979c4ba..18c0ef6 100644 (file)
--- a/mv_machine_learning/inference/include/PreProcess.h
+++ b/mv_machine_learning/inference/include/PreProcess.h
@@ -17,11 +17,11 @@
 #ifndef __MEDIA_VISION_PREPROCESS_H__
 #define __MEDIA_VISION_PREPROCESS_H__
 
-#include <string>
 #include <map>
+#include <string>
 
-#include "mv_common.h"
 #include "InputMetadata.h"
+#include "mv_common.h"
 
 #include <opencv2/core.hpp>
 #include <opencv2/imgproc.hpp>

diff --git a/mv_machine_learning/inference/include/ScoreInfo.h b/mv_machine_learning/inference/include/ScoreInfo.h
index 2ebeddc..2b993bf 100644 (file)
--- a/mv_machine_learning/inference/include/ScoreInfo.h
+++ b/mv_machine_learning/inference/include/ScoreInfo.h
@@ -17,16 +17,16 @@
 #ifndef __SCORE_INFO_H__
 #define __SCORE_INFO_H__
 
-#include <string>
-#include <vector>
 #include <map>
 #include <memory>
+#include <string>
+#include <vector>
 
-#include <mv_inference_type.h>
-#include <mv_private.h>
-#include <MetadataType.h>
 #include "DimInfo.h"
 #include "Utils.h"
+#include <MetadataType.h>
+#include <mv_inference_type.h>
+#include <mv_private.h>
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/inference/include/TensorBuffer.h b/mv_machine_learning/inference/include/TensorBuffer.h
index c4654cd..36e4271 100644 (file)
--- a/mv_machine_learning/inference/include/TensorBuffer.h
+++ b/mv_machine_learning/inference/include/TensorBuffer.h
@@ -17,13 +17,13 @@
 #ifndef __MEDIA_VISION_TENSORBUFFER_H__
 #define __MEDIA_VISION_TENSORBUFFER_H__
 
-#include <string>
-#include <map>
-#include <variant>
 #include "mv_common.h"
 #include "mv_inference_private.h"
 #include <inference_engine_type.h>
+#include <map>
 #include <mv_inference_type.h>
+#include <string>
+#include <variant>
 
 /**
  * @file TensorBuffer.h

diff --git a/mv_machine_learning/inference/include/Utils.h b/mv_machine_learning/inference/include/Utils.h
index 404924b..949cace 100644 (file)
--- a/mv_machine_learning/inference/include/Utils.h
+++ b/mv_machine_learning/inference/include/Utils.h
@@ -17,14 +17,14 @@
 #ifndef __UTILS_H__
 #define __UTILS_H__
 
-#include <string>
-#include <vector>
 #include <map>
 #include <memory>
+#include <string>
+#include <vector>
 
+#include <dlog.h>
 #include <json-glib/json-glib.h>
 #include <stdexcept>
-#include <dlog.h>
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/inference/src/BvhParser.cpp b/mv_machine_learning/inference/src/BvhParser.cpp
index 9f7431e..ea46c6e 100644 (file)
--- a/mv_machine_learning/inference/src/BvhParser.cpp
+++ b/mv_machine_learning/inference/src/BvhParser.cpp
@@ -17,8 +17,8 @@
 #include "BvhParser.h"
 #include "mv_private.h"
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 #include <sstream>
 #include <string>
 

diff --git a/mv_machine_learning/inference/src/DecodeInfo.cpp b/mv_machine_learning/inference/src/DecodeInfo.cpp
index 680f89f..9259167 100644 (file)
--- a/mv_machine_learning/inference/src/DecodeInfo.cpp
+++ b/mv_machine_learning/inference/src/DecodeInfo.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <mv_private.h>
 #include <DecodeInfo.h>
 #include <Utils.h>
+#include <mv_private.h>
 
 using namespace mediavision::inference;
 using namespace mediavision::inference::box;

diff --git a/mv_machine_learning/inference/src/Inference.cpp b/mv_machine_learning/inference/src/Inference.cpp
index e3372c6..69145f3 100644 (file)
--- a/mv_machine_learning/inference/src/Inference.cpp
+++ b/mv_machine_learning/inference/src/Inference.cpp
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-#include "mv_private.h"
 #include "Inference.h"
 #include "InferenceIni.h"
 #include "ObjectDecoder.h"
 #include "PoseDecoder.h"
+#include "mv_private.h"
 #include "util.h"
-#include <map>
 #include <list>
+#include <map>
 
-#include <unistd.h>
+#include <algorithm>
 #include <fstream>
-#include <string>
 #include <queue>
-#include <algorithm>
+#include <string>
+#include <unistd.h>
 
 #define MV_INFERENCE_OUTPUT_NUMBERS_MAX 10
 #define MV_INFERENCE_OUTPUT_NUMBERS_MIN 1

diff --git a/mv_machine_learning/inference/src/InferenceIni.cpp b/mv_machine_learning/inference/src/InferenceIni.cpp
index 9498e81..9d01f44 100644 (file)
--- a/mv_machine_learning/inference/src/InferenceIni.cpp
+++ b/mv_machine_learning/inference/src/InferenceIni.cpp
@@ -15,11 +15,11 @@
  */
 
 #include <iniparser.h>
-#include <unistd.h>
 #include <map>
+#include <unistd.h>
 
-#include "mv_private.h"
 #include "InferenceIni.h"
+#include "mv_private.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/inference/src/InputMetadata.cpp b/mv_machine_learning/inference/src/InputMetadata.cpp
index 8d488b6..21c9be6 100644 (file)
--- a/mv_machine_learning/inference/src/InputMetadata.cpp
+++ b/mv_machine_learning/inference/src/InputMetadata.cpp
@@ -16,14 +16,14 @@
 
 #include "mv_private.h"
 
-#include <unistd.h>
-#include <fstream>
-#include <string>
-#include <queue>
-#include <algorithm>
 #include "InputMetadata.h"
-#include <mv_common.h>
 #include "Utils.h"
+#include <algorithm>
+#include <fstream>
+#include <mv_common.h>
+#include <queue>
+#include <string>
+#include <unistd.h>
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/inference/src/LabelInfo.cpp b/mv_machine_learning/inference/src/LabelInfo.cpp
index 57b31c4..9ba8488 100644 (file)
--- a/mv_machine_learning/inference/src/LabelInfo.cpp
+++ b/mv_machine_learning/inference/src/LabelInfo.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <mv_private.h>
 #include "LabelInfo.h"
+#include <mv_private.h>
 
 using namespace mediavision::inference::label;
 

diff --git a/mv_machine_learning/inference/src/Metadata.cpp b/mv_machine_learning/inference/src/Metadata.cpp
index 74c6ae5..9a9a040 100644 (file)
--- a/mv_machine_learning/inference/src/Metadata.cpp
+++ b/mv_machine_learning/inference/src/Metadata.cpp
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-#include "mv_private.h"
 #include "Metadata.h"
+#include "mv_private.h"
 
 #include <map>
 
-#include <unistd.h>
+#include <algorithm>
 #include <fstream>
-#include <string>
 #include <queue>
-#include <algorithm>
+#include <string>
+#include <unistd.h>
 
 using namespace std;
 

diff --git a/mv_machine_learning/inference/src/NumberInfo.cpp b/mv_machine_learning/inference/src/NumberInfo.cpp
index cdc3fcb..c459302 100644 (file)
--- a/mv_machine_learning/inference/src/NumberInfo.cpp
+++ b/mv_machine_learning/inference/src/NumberInfo.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <mv_private.h>
 #include "NumberInfo.h"
+#include <mv_private.h>
 
 using namespace mediavision::inference::number;
 

diff --git a/mv_machine_learning/inference/src/ObjectDecoder.cpp b/mv_machine_learning/inference/src/ObjectDecoder.cpp
index 43a0156..3ff2785 100644 (file)
--- a/mv_machine_learning/inference/src/ObjectDecoder.cpp
+++ b/mv_machine_learning/inference/src/ObjectDecoder.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include "mv_private.h"
 #include "ObjectDecoder.h"
+#include "mv_private.h"
 
-#include <unistd.h>
 #include <fstream>
 #include <string>
+#include <unistd.h>
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/inference/src/OutputMetadata.cpp b/mv_machine_learning/inference/src/OutputMetadata.cpp
index 01600bf..b8663ed 100644 (file)
--- a/mv_machine_learning/inference/src/OutputMetadata.cpp
+++ b/mv_machine_learning/inference/src/OutputMetadata.cpp
@@ -16,11 +16,11 @@
 
 #include "mv_private.h"
 
-#include <unistd.h>
+#include <algorithm>
 #include <fstream>
-#include <string>
 #include <queue>
-#include <algorithm>
+#include <string>
+#include <unistd.h>
 
 #include "OutputMetadata.h"
 #include "Utils.h"

diff --git a/mv_machine_learning/inference/src/PoseDecoder.cpp b/mv_machine_learning/inference/src/PoseDecoder.cpp
index 832077f..9d89964 100644 (file)
--- a/mv_machine_learning/inference/src/PoseDecoder.cpp
+++ b/mv_machine_learning/inference/src/PoseDecoder.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include "mv_private.h"
 #include "PoseDecoder.h"
 #include "PostProcess.h"
+#include "mv_private.h"
 
-#include <unistd.h>
 #include <fstream>
 #include <string>
+#include <unistd.h>
 
 #define MAX_NUMBER_OF_CORRECTION 3
 

diff --git a/mv_machine_learning/inference/src/PostProcess.cpp b/mv_machine_learning/inference/src/PostProcess.cpp
index 7060da7..96b7f73 100644 (file)
--- a/mv_machine_learning/inference/src/PostProcess.cpp
+++ b/mv_machine_learning/inference/src/PostProcess.cpp
@@ -16,11 +16,11 @@
 
 #include "mv_private.h"
 
-#include <unistd.h>
+#include "PostProcess.h"
+#include <cmath>
 #include <fstream>
 #include <string>
-#include <cmath>
-#include "PostProcess.h"
+#include <unistd.h>
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/inference/src/Posture.cpp b/mv_machine_learning/inference/src/Posture.cpp
index 3601b25..a0c8a79 100644 (file)
--- a/mv_machine_learning/inference/src/Posture.cpp
+++ b/mv_machine_learning/inference/src/Posture.cpp
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#include "mv_private.h"
 #include "Posture.h"
+#include "mv_private.h"
 
-#include <ios>
+#include <cfloat>
 #include <fstream>
+#include <ios>
 #include <sstream>
 #include <string>
 #include <unistd.h>
-#include <cfloat>
 
 #define POSE_OFFSET_VALUE 20
 

diff --git a/mv_machine_learning/inference/src/PreProcess.cpp b/mv_machine_learning/inference/src/PreProcess.cpp
index b0a17e9..ed89e0e 100644 (file)
--- a/mv_machine_learning/inference/src/PreProcess.cpp
+++ b/mv_machine_learning/inference/src/PreProcess.cpp
@@ -16,12 +16,12 @@
 
 #include "mv_private.h"
 
-#include <unistd.h>
+#include "PreProcess.h"
+#include <algorithm>
 #include <fstream>
-#include <string>
 #include <queue>
-#include <algorithm>
-#include "PreProcess.h"
+#include <string>
+#include <unistd.h>
 
 const int colorConvertTable[][12] = {
        { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },

diff --git a/mv_machine_learning/inference/src/TensorBuffer.cpp b/mv_machine_learning/inference/src/TensorBuffer.cpp
index 2510549..afb0b40 100644 (file)
--- a/mv_machine_learning/inference/src/TensorBuffer.cpp
+++ b/mv_machine_learning/inference/src/TensorBuffer.cpp
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#include "mv_private.h"
 #include "TensorBuffer.h"
+#include "mv_private.h"
 
 #include <map>
 
-#include <unistd.h>
 #include <fstream>
-#include <string>
 #include <stdexcept>
+#include <string>
+#include <unistd.h>
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/inference/src/mv_inference.cpp b/mv_machine_learning/inference/src/mv_inference.cpp
index d9f7668..d500a63 100644 (file)
--- a/mv_machine_learning/inference/src/mv_inference.cpp
+++ b/mv_machine_learning/inference/src/mv_inference.cpp
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-#include "mv_private.h"
-#include "mv_feature_key.h"
 #include "mv_inference.h"
 #include "Inference.h"
 #include "Posture.h"
+#include "mv_feature_key.h"
+#include "mv_private.h"
 
-#include <new>
-#include <unistd.h>
-#include <string>
 #include <mv_common.h>
-#include <mv_inference_type.h>
 #include <mv_inference.h>
+#include <mv_inference_type.h>
+#include <new>
+#include <string>
+#include <unistd.h>
 
 /**
  * @file  mv_inference.cpp

diff --git a/mv_machine_learning/landmark_detection/include/FacialLandmarkAdapter.h b/mv_machine_learning/landmark_detection/include/FacialLandmarkAdapter.h
index 5ec7ee1..3307042 100644 (file)
--- a/mv_machine_learning/landmark_detection/include/FacialLandmarkAdapter.h
+++ b/mv_machine_learning/landmark_detection/include/FacialLandmarkAdapter.h
@@ -20,10 +20,10 @@
 #include <dlog.h>
 
 #include "EngineConfig.h"
-#include "ITask.h"
-#include "MvMlConfig.h"
 #include "FldTweakCnn.h"
 #include "ILandmarkDetection.h"
+#include "ITask.h"
+#include "MvMlConfig.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/landmark_detection/include/FldTweakCnn.h b/mv_machine_learning/landmark_detection/include/FldTweakCnn.h
index b6e13bb..c37e39c 100644 (file)
--- a/mv_machine_learning/landmark_detection/include/FldTweakCnn.h
+++ b/mv_machine_learning/landmark_detection/include/FldTweakCnn.h
@@ -17,10 +17,10 @@
 #ifndef __FLD_TWEAK_CNN_H__
 #define __FLD_TWEAK_CNN_H__
 
-#include <string>
+#include "mv_private.h"
 #include <memory>
 #include <mv_common.h>
-#include "mv_private.h"
+#include <string>
 
 #include "LandmarkDetection.h"
 #include <mv_inference_type.h>

diff --git a/mv_machine_learning/landmark_detection/include/LandmarkDetection.h b/mv_machine_learning/landmark_detection/include/LandmarkDetection.h
index 33b0137..0fb5774 100644 (file)
--- a/mv_machine_learning/landmark_detection/include/LandmarkDetection.h
+++ b/mv_machine_learning/landmark_detection/include/LandmarkDetection.h
@@ -17,20 +17,20 @@
 #ifndef __LANDMARK_DETECTION_H__
 #define __LANDMARK_DETECTION_H__
 
+#include "mv_private.h"
 #include <mv_common.h>
 #include <mv_inference_type.h>
-#include "mv_private.h"
 
+#include "AsyncManager.h"
 #include "EngineConfig.h"
-#include "inference_engine_common_impl.h"
+#include "ILandmarkDetection.h"
 #include "Inference.h"
-#include "landmark_detection_type.h"
-#include "MetaParser.h"
 #include "LandmarkDetectionParser.h"
+#include "MetaParser.h"
 #include "MvMlConfig.h"
 #include "MvMlPreprocess.h"
-#include "AsyncManager.h"
-#include "ILandmarkDetection.h"
+#include "inference_engine_common_impl.h"
+#include "landmark_detection_type.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/landmark_detection/include/PldCpm.h b/mv_machine_learning/landmark_detection/include/PldCpm.h
index 3a06e26..b29d954 100644 (file)
--- a/mv_machine_learning/landmark_detection/include/PldCpm.h
+++ b/mv_machine_learning/landmark_detection/include/PldCpm.h
@@ -17,10 +17,10 @@
 #ifndef __PLD_CPM_H__
 #define __PLD_CPM_H__
 
-#include <string>
+#include "mv_private.h"
 #include <memory>
 #include <mv_common.h>
-#include "mv_private.h"
+#include <string>
 
 #include "LandmarkDetection.h"
 #include <mv_inference_type.h>

diff --git a/mv_machine_learning/landmark_detection/include/PoseLandmarkAdapter.h b/mv_machine_learning/landmark_detection/include/PoseLandmarkAdapter.h
index d4d1505..01f225d 100644 (file)
--- a/mv_machine_learning/landmark_detection/include/PoseLandmarkAdapter.h
+++ b/mv_machine_learning/landmark_detection/include/PoseLandmarkAdapter.h
@@ -20,10 +20,10 @@
 #include <dlog.h>
 
 #include "EngineConfig.h"
+#include "ILandmarkDetection.h"
 #include "ITask.h"
 #include "MvMlConfig.h"
 #include "PldCpm.h"
-#include "ILandmarkDetection.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/landmark_detection/include/landmark_detection_type.h b/mv_machine_learning/landmark_detection/include/landmark_detection_type.h
index 80a947b..fe20397 100644 (file)
--- a/mv_machine_learning/landmark_detection/include/landmark_detection_type.h
+++ b/mv_machine_learning/landmark_detection/include/landmark_detection_type.h
@@ -19,9 +19,9 @@
 
 #include <vector>
 
+#include "mv_ml_types.h"
 #include <mv_common.h>
 #include <mv_inference_type.h>
-#include "mv_ml_types.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/landmark_detection/src/FacialLandmarkAdapter.cpp b/mv_machine_learning/landmark_detection/src/FacialLandmarkAdapter.cpp
index 53ffe79..a4ba0ad 100644 (file)
--- a/mv_machine_learning/landmark_detection/src/FacialLandmarkAdapter.cpp
+++ b/mv_machine_learning/landmark_detection/src/FacialLandmarkAdapter.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "MvMlException.h"
 #include "FacialLandmarkAdapter.h"
+#include "MvMlException.h"
 #include "mv_landmark_detection_config.h"
 
 using namespace std;

diff --git a/mv_machine_learning/landmark_detection/src/FldTweakCnn.cpp b/mv_machine_learning/landmark_detection/src/FldTweakCnn.cpp
index 512b3be..9742169 100644 (file)
--- a/mv_machine_learning/landmark_detection/src/FldTweakCnn.cpp
+++ b/mv_machine_learning/landmark_detection/src/FldTweakCnn.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <string.h>
-#include <map>
 #include <algorithm>
+#include <map>
+#include <string.h>
 
-#include "MvMlException.h"
 #include "FldTweakCnn.h"
+#include "MvMlException.h"
 #include "Postprocess.h"
 
 using namespace std;

diff --git a/mv_machine_learning/landmark_detection/src/LandmarkDetection.cpp b/mv_machine_learning/landmark_detection/src/LandmarkDetection.cpp
index 86caa04..54bbf4b 100644 (file)
--- a/mv_machine_learning/landmark_detection/src/LandmarkDetection.cpp
+++ b/mv_machine_learning/landmark_detection/src/LandmarkDetection.cpp
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#include <string.h>
+#include <algorithm>
 #include <fstream>
 #include <map>
 #include <memory>
-#include <algorithm>
+#include <string.h>
 
+#include "LandmarkDetection.h"
 #include "MvMlException.h"
 #include "common.h"
-#include "LandmarkDetection.h"
 
 using namespace std;
 using namespace mediavision::inference;

diff --git a/mv_machine_learning/landmark_detection/src/LandmarkDetectionParser.cpp b/mv_machine_learning/landmark_detection/src/LandmarkDetectionParser.cpp
index d47c6ee..a9593f2 100644 (file)
--- a/mv_machine_learning/landmark_detection/src/LandmarkDetectionParser.cpp
+++ b/mv_machine_learning/landmark_detection/src/LandmarkDetectionParser.cpp
@@ -15,8 +15,8 @@
  */
 #include <memory>
 
-#include "MvMlException.h"
 #include "LandmarkDetectionParser.h"
+#include "MvMlException.h"
 #include "landmark_detection_type.h"
 
 using namespace std;

diff --git a/mv_machine_learning/landmark_detection/src/PldCpm.cpp b/mv_machine_learning/landmark_detection/src/PldCpm.cpp
index b871490..89b0f99 100644 (file)
--- a/mv_machine_learning/landmark_detection/src/PldCpm.cpp
+++ b/mv_machine_learning/landmark_detection/src/PldCpm.cpp
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include <string.h>
-#include <map>
 #include <algorithm>
+#include <map>
+#include <string.h>
 
 #include "MvMlException.h"
-#include "mv_landmark_detection_config.h"
 #include "PldCpm.h"
 #include "Postprocess.h"
+#include "mv_landmark_detection_config.h"
 
 using namespace std;
 using namespace mediavision::inference;

diff --git a/mv_machine_learning/landmark_detection/src/PoseLandmarkAdapter.cpp b/mv_machine_learning/landmark_detection/src/PoseLandmarkAdapter.cpp
index 3203c49..b934f71 100644 (file)
--- a/mv_machine_learning/landmark_detection/src/PoseLandmarkAdapter.cpp
+++ b/mv_machine_learning/landmark_detection/src/PoseLandmarkAdapter.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "MvMlException.h"
 #include "PoseLandmarkAdapter.h"
+#include "MvMlException.h"
 #include "mv_landmark_detection_config.h"
 
 using namespace std;

diff --git a/mv_machine_learning/landmark_detection/src/mv_facial_landmark.cpp b/mv_machine_learning/landmark_detection/src/mv_facial_landmark.cpp
index 08e3353..8020ab0 100644 (file)
--- a/mv_machine_learning/landmark_detection/src/mv_facial_landmark.cpp
+++ b/mv_machine_learning/landmark_detection/src/mv_facial_landmark.cpp
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-#include "mv_private.h"
-#include "mv_feature_key.h"
-#include "ITask.h"
-#include "mv_facial_landmark_internal.h"
+#include "Context.h"
 #include "FacialLandmarkAdapter.h"
+#include "ITask.h"
 #include "MvMlException.h"
-#include "native_capi.h"
 #include "landmark_detection_type.h"
-#include "Context.h"
+#include "mv_facial_landmark_internal.h"
+#include "mv_feature_key.h"
+#include "mv_private.h"
+#include "native_capi.h"
 
+#include <algorithm>
 #include <new>
-#include <unistd.h>
 #include <string>
-#include <algorithm>
+#include <unistd.h>
 
 #define TASK_NAME "facial_landmark"
 

diff --git a/mv_machine_learning/landmark_detection/src/mv_pose_landmark.cpp b/mv_machine_learning/landmark_detection/src/mv_pose_landmark.cpp
index 8cd22ce..e7fe6d9 100644 (file)
--- a/mv_machine_learning/landmark_detection/src/mv_pose_landmark.cpp
+++ b/mv_machine_learning/landmark_detection/src/mv_pose_landmark.cpp
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-#include "mv_private.h"
-#include "mv_feature_key.h"
+#include "Context.h"
 #include "ITask.h"
-#include "mv_pose_landmark_internal.h"
-#include "PoseLandmarkAdapter.h"
 #include "MvMlException.h"
-#include "native_capi.h"
+#include "PoseLandmarkAdapter.h"
 #include "landmark_detection_type.h"
-#include "Context.h"
+#include "mv_feature_key.h"
+#include "mv_pose_landmark_internal.h"
+#include "mv_private.h"
+#include "native_capi.h"
 
+#include <algorithm>
 #include <new>
-#include <unistd.h>
 #include <string>
-#include <algorithm>
+#include <unistd.h>
 
 #define TASK_NAME "pose_landmark"
 

diff --git a/mv_machine_learning/object_detection/include/FaceDetectionAdapter.h b/mv_machine_learning/object_detection/include/FaceDetectionAdapter.h
index 2ebb7a8..f285b99 100644 (file)
--- a/mv_machine_learning/object_detection/include/FaceDetectionAdapter.h
+++ b/mv_machine_learning/object_detection/include/FaceDetectionAdapter.h
@@ -21,8 +21,8 @@
 
 #include "EngineConfig.h"
 #include "ITask.h"
-#include "MvMlConfig.h"
 #include "MobilenetV1Ssd.h"
+#include "MvMlConfig.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/object_detection/include/MobilenetV1Ssd.h b/mv_machine_learning/object_detection/include/MobilenetV1Ssd.h
index e8e9d38..b9017fd 100644 (file)
--- a/mv_machine_learning/object_detection/include/MobilenetV1Ssd.h
+++ b/mv_machine_learning/object_detection/include/MobilenetV1Ssd.h
@@ -17,10 +17,10 @@
 #ifndef __MOBILENET_V1_SSD_H__
 #define __MOBILENET_V1_SSD_H__
 
-#include <string>
+#include "mv_private.h"
 #include <memory>
 #include <mv_common.h>
-#include "mv_private.h"
+#include <string>
 
 #include "ObjectDetection.h"
 #include <mv_inference_type.h>

diff --git a/mv_machine_learning/object_detection/include/MobilenetV2Ssd.h b/mv_machine_learning/object_detection/include/MobilenetV2Ssd.h
index 1f6f789..0df2beb 100644 (file)
--- a/mv_machine_learning/object_detection/include/MobilenetV2Ssd.h
+++ b/mv_machine_learning/object_detection/include/MobilenetV2Ssd.h
@@ -17,10 +17,10 @@
 #ifndef __MOBILENET_V2_SSD_H__
 #define __MOBILENET_V2_SSD_H__
 
-#include <string>
+#include "mv_private.h"
 #include <memory>
 #include <mv_common.h>
-#include "mv_private.h"
+#include <string>
 
 #include "ObjectDetection.h"
 #include <mv_inference_type.h>

diff --git a/mv_machine_learning/object_detection/include/ObjectDetection.h b/mv_machine_learning/object_detection/include/ObjectDetection.h
index ad3b71d..0ee398c 100644 (file)
--- a/mv_machine_learning/object_detection/include/ObjectDetection.h
+++ b/mv_machine_learning/object_detection/include/ObjectDetection.h
@@ -17,25 +17,25 @@
 #ifndef __OBJECT_DETECTION_H__
 #define __OBJECT_DETECTION_H__
 
+#include <atomic>
+#include <mutex>
 #include <queue>
 #include <thread>
-#include <mutex>
-#include <atomic>
 
+#include "mv_private.h"
 #include <mv_common.h>
 #include <mv_inference_type.h>
-#include "mv_private.h"
 
+#include "AsyncManager.h"
 #include "EngineConfig.h"
-#include "inference_engine_common_impl.h"
+#include "IObjectDetection.h"
 #include "Inference.h"
-#include "object_detection_type.h"
 #include "MetaParser.h"
-#include "ObjectDetectionParser.h"
 #include "MvMlConfig.h"
 #include "MvMlPreprocess.h"
-#include "IObjectDetection.h"
-#include "AsyncManager.h"
+#include "ObjectDetectionParser.h"
+#include "inference_engine_common_impl.h"
+#include "object_detection_type.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/object_detection/include/ObjectDetectionAdapter.h b/mv_machine_learning/object_detection/include/ObjectDetectionAdapter.h
index e62c4b1..6a43f99 100644 (file)
--- a/mv_machine_learning/object_detection/include/ObjectDetectionAdapter.h
+++ b/mv_machine_learning/object_detection/include/ObjectDetectionAdapter.h
@@ -21,9 +21,9 @@
 
 #include "EngineConfig.h"
 #include "ITask.h"
-#include "MvMlConfig.h"
 #include "MobilenetV1Ssd.h"
 #include "MobilenetV2Ssd.h"
+#include "MvMlConfig.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/object_detection/include/ObjectDetectionExternal.h b/mv_machine_learning/object_detection/include/ObjectDetectionExternal.h
index e82f0bb..12f3537 100644 (file)
--- a/mv_machine_learning/object_detection/include/ObjectDetectionExternal.h
+++ b/mv_machine_learning/object_detection/include/ObjectDetectionExternal.h
@@ -23,8 +23,8 @@
 #include <opencv2/core.hpp>
 #include <opencv2/imgproc.hpp>
 
-#include "object_detection_type.h"
 #include "IObjectDetection.h"
+#include "object_detection_type.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/object_detection/include/object_detection_type.h b/mv_machine_learning/object_detection/include/object_detection_type.h
index b5e3b94..98fe59b 100644 (file)
--- a/mv_machine_learning/object_detection/include/object_detection_type.h
+++ b/mv_machine_learning/object_detection/include/object_detection_type.h
@@ -19,9 +19,9 @@
 
 #include <opencv2/core.hpp>
 
+#include "mv_ml_types.h"
 #include <mv_common.h>
 #include <mv_inference_type.h>
-#include "mv_ml_types.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/object_detection/src/FaceDetectionAdapter.cpp b/mv_machine_learning/object_detection/src/FaceDetectionAdapter.cpp
index 3018844..4441eb7 100644 (file)
--- a/mv_machine_learning/object_detection/src/FaceDetectionAdapter.cpp
+++ b/mv_machine_learning/object_detection/src/FaceDetectionAdapter.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "MvMlException.h"
 #include "FaceDetectionAdapter.h"
+#include "MvMlException.h"
 #include "ObjectDetectionExternal.h"
 #include "mv_object_detection_config.h"
 

diff --git a/mv_machine_learning/object_detection/src/MobilenetV1Ssd.cpp b/mv_machine_learning/object_detection/src/MobilenetV1Ssd.cpp
index cb3c7ef..6034025 100644 (file)
--- a/mv_machine_learning/object_detection/src/MobilenetV1Ssd.cpp
+++ b/mv_machine_learning/object_detection/src/MobilenetV1Ssd.cpp
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include <string.h>
-#include <map>
 #include <algorithm>
+#include <map>
+#include <string.h>
 
-#include "MvMlException.h"
-#include "mv_object_detection_config.h"
 #include "MobilenetV1Ssd.h"
+#include "MvMlException.h"
 #include "Postprocess.h"
+#include "mv_object_detection_config.h"
 
 using namespace std;
 using namespace mediavision::inference;

diff --git a/mv_machine_learning/object_detection/src/MobilenetV2AnchorParser.cpp b/mv_machine_learning/object_detection/src/MobilenetV2AnchorParser.cpp
index 42c3526..e68eeb6 100644 (file)
--- a/mv_machine_learning/object_detection/src/MobilenetV2AnchorParser.cpp
+++ b/mv_machine_learning/object_detection/src/MobilenetV2AnchorParser.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <unistd.h>
-#include <string>
-#include <queue>
-#include <algorithm>
-#include "MvMlException.h"
 #include "MobilenetV2AnchorParser.h"
+#include "MvMlException.h"
 #include "meta_common.h"
+#include <algorithm>
+#include <queue>
+#include <string>
+#include <unistd.h>
 
 using namespace std;
 using namespace mediavision::machine_learning::exception;

diff --git a/mv_machine_learning/object_detection/src/MobilenetV2Ssd.cpp b/mv_machine_learning/object_detection/src/MobilenetV2Ssd.cpp
index 47ed03a..fe1c999 100644 (file)
--- a/mv_machine_learning/object_detection/src/MobilenetV2Ssd.cpp
+++ b/mv_machine_learning/object_detection/src/MobilenetV2Ssd.cpp
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#include <string.h>
-#include <map>
 #include <algorithm>
 #include <iostream>
+#include <map>
+#include <string.h>
 
-#include "MvMlException.h"
-#include "mv_object_detection_config.h"
 #include "MobilenetV2Ssd.h"
+#include "MvMlException.h"
 #include "Postprocess.h"
+#include "mv_object_detection_config.h"
 
 using namespace std;
 using namespace mediavision::inference;

diff --git a/mv_machine_learning/object_detection/src/ObjectDetection.cpp b/mv_machine_learning/object_detection/src/ObjectDetection.cpp
index ddf9ab1..d2d346e 100644 (file)
--- a/mv_machine_learning/object_detection/src/ObjectDetection.cpp
+++ b/mv_machine_learning/object_detection/src/ObjectDetection.cpp
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#include <string.h>
 #include <fstream>
 #include <map>
 #include <memory>
+#include <string.h>
 
 #include "MvMlException.h"
+#include "ObjectDetection.h"
 #include "common.h"
 #include "mv_object_detection_config.h"
-#include "ObjectDetection.h"
 
 using namespace std;
 using namespace mediavision::inference;

diff --git a/mv_machine_learning/object_detection/src/ObjectDetectionAdapter.cpp b/mv_machine_learning/object_detection/src/ObjectDetectionAdapter.cpp
index d089f05..6e685b2 100644 (file)
--- a/mv_machine_learning/object_detection/src/ObjectDetectionAdapter.cpp
+++ b/mv_machine_learning/object_detection/src/ObjectDetectionAdapter.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "MvMlException.h"
 #include "ObjectDetectionAdapter.h"
+#include "MvMlException.h"
 #include "ObjectDetectionExternal.h"
 #include "mv_object_detection_config.h"
 

diff --git a/mv_machine_learning/object_detection/src/ObjectDetectionParser.cpp b/mv_machine_learning/object_detection/src/ObjectDetectionParser.cpp
index d440042..31eed1b 100644 (file)
--- a/mv_machine_learning/object_detection/src/ObjectDetectionParser.cpp
+++ b/mv_machine_learning/object_detection/src/ObjectDetectionParser.cpp
@@ -15,10 +15,10 @@
  */
 #include <memory>
 
+#include "MobilenetV2AnchorParser.h"
 #include "MvMlException.h"
 #include "ObjectDetectionParser.h"
 #include "object_detection_type.h"
-#include "MobilenetV2AnchorParser.h"
 
 using namespace std;
 using namespace mediavision::machine_learning::exception;

diff --git a/mv_machine_learning/object_detection/src/mv_face_detection.cpp b/mv_machine_learning/object_detection/src/mv_face_detection.cpp
index a8e0b71..e07cd52 100644 (file)
--- a/mv_machine_learning/object_detection/src/mv_face_detection.cpp
+++ b/mv_machine_learning/object_detection/src/mv_face_detection.cpp
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-#include "mv_private.h"
-#include "mv_feature_key.h"
-#include "ITask.h"
-#include "mv_face_detection_internal.h"
+#include "Context.h"
 #include "FaceDetectionAdapter.h"
+#include "ITask.h"
 #include "MvMlException.h"
+#include "mv_face_detection_internal.h"
+#include "mv_feature_key.h"
+#include "mv_private.h"
 #include "native_capi.h"
 #include "object_detection_type.h"
-#include "Context.h"
 
-#include <new>
-#include <unistd.h>
-#include <string>
 #include <algorithm>
-#include <mutex>
 #include <iostream>
+#include <mutex>
+#include <new>
+#include <string>
+#include <unistd.h>
 
 #define TASK_NAME "face_detection"
 

diff --git a/mv_machine_learning/object_detection/src/mv_object_detection.cpp b/mv_machine_learning/object_detection/src/mv_object_detection.cpp
index 384be07..3e2be8a 100644 (file)
--- a/mv_machine_learning/object_detection/src/mv_object_detection.cpp
+++ b/mv_machine_learning/object_detection/src/mv_object_detection.cpp
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-#include "mv_private.h"
-#include "mv_feature_key.h"
+#include "Context.h"
 #include "ITask.h"
-#include "mv_object_detection_internal.h"
-#include "ObjectDetectionAdapter.h"
 #include "MvMlException.h"
+#include "ObjectDetectionAdapter.h"
+#include "mv_feature_key.h"
+#include "mv_object_detection_internal.h"
+#include "mv_private.h"
 #include "native_capi.h"
 #include "object_detection_type.h"
-#include "Context.h"
 
-#include <new>
-#include <unistd.h>
-#include <string>
 #include <algorithm>
-#include <mutex>
 #include <iostream>
+#include <mutex>
+#include <new>
+#include <string>
+#include <unistd.h>
 
 #define TASK_NAME "object_detection"
 

diff --git a/mv_machine_learning/object_detection_3d/include/ObjectDetection3d.h b/mv_machine_learning/object_detection_3d/include/ObjectDetection3d.h
index 7fcf809..fb941d6 100644 (file)
--- a/mv_machine_learning/object_detection_3d/include/ObjectDetection3d.h
+++ b/mv_machine_learning/object_detection_3d/include/ObjectDetection3d.h
@@ -17,19 +17,19 @@
 #ifndef __OBJECT_DETECTION_3D_H__
 #define __OBJECT_DETECTION_3D_H__
 
+#include "mv_private.h"
 #include <mv_common.h>
 #include <mv_inference_type.h>
-#include "mv_private.h"
 
 #include "EngineConfig.h"
-#include "inference_engine_common_impl.h"
-#include "Inference.h"
-#include "object_detection_3d_type.h"
 #include "IObjectDetection3d.h"
+#include "Inference.h"
 #include "MetaParser.h"
 #include "MvMlConfig.h"
-#include "ObjectDetection3dParser.h"
 #include "MvMlPreprocess.h"
+#include "ObjectDetection3dParser.h"
+#include "inference_engine_common_impl.h"
+#include "object_detection_3d_type.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/object_detection_3d/include/ObjectDetection3dAdapter.h b/mv_machine_learning/object_detection_3d/include/ObjectDetection3dAdapter.h
index dbb89b6..a922ab8 100644 (file)
--- a/mv_machine_learning/object_detection_3d/include/ObjectDetection3dAdapter.h
+++ b/mv_machine_learning/object_detection_3d/include/ObjectDetection3dAdapter.h
@@ -20,10 +20,10 @@
 #include <dlog.h>
 
 #include "EngineConfig.h"
+#include "IObjectDetection3d.h"
 #include "ITask.h"
 #include "MvMlConfig.h"
 #include "Objectron.h"
-#include "IObjectDetection3d.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/object_detection_3d/include/Objectron.h b/mv_machine_learning/object_detection_3d/include/Objectron.h
index 3fa8875..5166c2d 100644 (file)
--- a/mv_machine_learning/object_detection_3d/include/Objectron.h
+++ b/mv_machine_learning/object_detection_3d/include/Objectron.h
@@ -17,10 +17,10 @@
 #ifndef __OBJECTRON_H__
 #define __OBJECTRON_H__
 
+#include "MvMlConfig.h"
+#include "mv_private.h"
 #include <memory>
 #include <mv_common.h>
-#include "mv_private.h"
-#include "MvMlConfig.h"
 
 #include "ObjectDetection3d.h"
 #include <mv_inference_type.h>

diff --git a/mv_machine_learning/object_detection_3d/include/mv_object_detection_3d_open.h b/mv_machine_learning/object_detection_3d/include/mv_object_detection_3d_open.h
index a0a2260..e10036d 100644 (file)
--- a/mv_machine_learning/object_detection_3d/include/mv_object_detection_3d_open.h
+++ b/mv_machine_learning/object_detection_3d/include/mv_object_detection_3d_open.h
@@ -18,8 +18,8 @@
 #define __MEDIA_VISION_OBJECT_DETECTION_3D_OPEN_H__
 
 #include <mv_common.h>
-#include <mv_private.h>
 #include <mv_object_detection_3d_type.h>
+#include <mv_private.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/mv_machine_learning/object_detection_3d/include/object_detection_3d_type.h b/mv_machine_learning/object_detection_3d/include/object_detection_3d_type.h
index ecbfd0b..215791d 100644 (file)
--- a/mv_machine_learning/object_detection_3d/include/object_detection_3d_type.h
+++ b/mv_machine_learning/object_detection_3d/include/object_detection_3d_type.h
@@ -17,9 +17,9 @@
 #ifndef __OBJECT_DETECTION_3D_TYPE_H__
 #define __OBJECT_DETECTION_3D_TYPE_H__
 
+#include "mv_ml_types.h"
 #include <mv_common.h>
 #include <mv_inference_type.h>
-#include "mv_ml_types.h"
 
 namespace mediavision
 {

diff --git a/mv_machine_learning/object_detection_3d/src/ObjectDetection3d.cpp b/mv_machine_learning/object_detection_3d/src/ObjectDetection3d.cpp
index 0c2772a..abc8f6b 100644 (file)
--- a/mv_machine_learning/object_detection_3d/src/ObjectDetection3d.cpp
+++ b/mv_machine_learning/object_detection_3d/src/ObjectDetection3d.cpp
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#include <string.h>
+#include <algorithm>
 #include <fstream>
 #include <map>
 #include <memory>
-#include <algorithm>
+#include <string.h>
 
 #include "MvMlException.h"
-#include "common.h"
 #include "ObjectDetection3d.h"
+#include "common.h"
 
 using namespace std;
 using namespace mediavision::inference;

diff --git a/mv_machine_learning/object_detection_3d/src/ObjectDetection3dAdapter.cpp b/mv_machine_learning/object_detection_3d/src/ObjectDetection3dAdapter.cpp
index 80a7065..540da0b 100644 (file)
--- a/mv_machine_learning/object_detection_3d/src/ObjectDetection3dAdapter.cpp
+++ b/mv_machine_learning/object_detection_3d/src/ObjectDetection3dAdapter.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "MvMlException.h"
 #include "ObjectDetection3dAdapter.h"
+#include "MvMlException.h"
 
 using namespace std;
 using namespace MediaVision::Common;

diff --git a/mv_machine_learning/object_detection_3d/src/ObjectDetection3dParser.cpp b/mv_machine_learning/object_detection_3d/src/ObjectDetection3dParser.cpp
index 37d2bf9..fa2dbca 100644 (file)
--- a/mv_machine_learning/object_detection_3d/src/ObjectDetection3dParser.cpp
+++ b/mv_machine_learning/object_detection_3d/src/ObjectDetection3dParser.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <iostream>
-#include "MvMlException.h"
 #include "ObjectDetection3dParser.h"
+#include "MvMlException.h"
+#include <iostream>
 
 using namespace std;
 using namespace mediavision::machine_learning::exception;

diff --git a/mv_machine_learning/object_detection_3d/src/Objectron.cpp b/mv_machine_learning/object_detection_3d/src/Objectron.cpp
index cc0bdb1..a47deb3 100644 (file)
--- a/mv_machine_learning/object_detection_3d/src/Objectron.cpp
+++ b/mv_machine_learning/object_detection_3d/src/Objectron.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <string.h>
-#include <map>
 #include <algorithm>
+#include <map>
+#include <string.h>
 
 #include "MvMlException.h"
 #include "Objectron.h"

diff --git a/mv_machine_learning/object_detection_3d/src/mv_object_detection_3d.cpp b/mv_machine_learning/object_detection_3d/src/mv_object_detection_3d.cpp
index 48224a5..7419246 100644 (file)
--- a/mv_machine_learning/object_detection_3d/src/mv_object_detection_3d.cpp
+++ b/mv_machine_learning/object_detection_3d/src/mv_object_detection_3d.cpp
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-#include "mv_private.h"
-#include "mv_feature_key.h"
+#include "Context.h"
 #include "ITask.h"
-#include "mv_object_detection_3d_internal.h"
-#include "ObjectDetection3dAdapter.h"
 #include "MvMlException.h"
+#include "ObjectDetection3dAdapter.h"
+#include "mv_feature_key.h"
+#include "mv_object_detection_3d_internal.h"
+#include "mv_private.h"
 #include "native_capi.h"
 #include "object_detection_3d_type.h"
-#include "Context.h"
 
-#include <new>
-#include <unistd.h>
-#include <string>
 #include <algorithm>
 #include <mutex>
+#include <new>
+#include <string>
+#include <unistd.h>
 
 #define TASK_NAME "object_detection_3d"
 

diff --git a/mv_machine_learning/training/include/DataSetManager.h b/mv_machine_learning/training/include/DataSetManager.h
index b526e7e..4ee2ee2 100644 (file)
--- a/mv_machine_learning/training/include/DataSetManager.h
+++ b/mv_machine_learning/training/include/DataSetManager.h
@@ -18,8 +18,8 @@
 #define __DATA_SET_MANAGER_H__
 
 #include <fstream>
-#include <vector>
 #include <map>
+#include <vector>
 
 #include "FeatureVectorManager.h"
 

diff --git a/mv_machine_learning/training/include/FeatureVectorManager.h b/mv_machine_learning/training/include/FeatureVectorManager.h
index 5dce36f..2b4860c 100644 (file)
--- a/mv_machine_learning/training/include/FeatureVectorManager.h
+++ b/mv_machine_learning/training/include/FeatureVectorManager.h
@@ -20,8 +20,8 @@
 #include <string>
 #include <vector>
 
-#include <opencv2/opencv.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/opencv.hpp>
 
 #include "file_util.h"
 

diff --git a/mv_machine_learning/training/include/LabelManager.h b/mv_machine_learning/training/include/LabelManager.h
index 325c1ab..e6f4932 100644 (file)
--- a/mv_machine_learning/training/include/LabelManager.h
+++ b/mv_machine_learning/training/include/LabelManager.h
@@ -17,13 +17,13 @@
 #ifndef __LABEL_MANAGER_H__
 #define __LABEL_MANAGER_H__
 
-#include <string.h>
-#include <iostream>
+#include <algorithm>
 #include <fstream>
+#include <iostream>
 #include <istream>
-#include <algorithm>
-#include <vector>
 #include <map>
+#include <string.h>
+#include <vector>
 
 #include "file_util.h"
 

diff --git a/mv_machine_learning/training/include/TrainingModel.h b/mv_machine_learning/training/include/TrainingModel.h
index f153fc6..847bfac 100644 (file)
--- a/mv_machine_learning/training/include/TrainingModel.h
+++ b/mv_machine_learning/training/include/TrainingModel.h
@@ -22,11 +22,11 @@
 
 #include <mv_inference_type.h>
 
-#include "training_engine_error.h"
-#include "training_engine_common_impl.h"
-#include "inference_engine_common_impl.h"
 #include "DataSetManager.h"
 #include "FeatureVectorManager.h"
+#include "inference_engine_common_impl.h"
+#include "training_engine_common_impl.h"
+#include "training_engine_error.h"
 
 struct TrainingEngineBackendInfo {
        std::vector<std::string> input_layer_names;

diff --git a/mv_machine_learning/training/src/FeatureVectorManager.cpp b/mv_machine_learning/training/src/FeatureVectorManager.cpp
index eb24340..e0a3615 100644 (file)
--- a/mv_machine_learning/training/src/FeatureVectorManager.cpp
+++ b/mv_machine_learning/training/src/FeatureVectorManager.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <opencv2/opencv.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/opencv.hpp>
 
-#include "MvMlException.h"
 #include "FeatureVectorManager.h"
+#include "MvMlException.h"
 
 using namespace std;
 using namespace mediavision::machine_learning::exception;

diff --git a/mv_machine_learning/training/src/LabelManager.cpp b/mv_machine_learning/training/src/LabelManager.cpp
index b033541..a7d57af 100644 (file)
--- a/mv_machine_learning/training/src/LabelManager.cpp
+++ b/mv_machine_learning/training/src/LabelManager.cpp
@@ -17,8 +17,8 @@
 #include <dlog.h>
 #include <mv_private.h>
 
-#include "MvMlException.h"
 #include "LabelManager.h"
+#include "MvMlException.h"
 
 using namespace std;
 using namespace mediavision::machine_learning::exception;

diff --git a/mv_machine_learning/training/src/TrainingModel.cpp b/mv_machine_learning/training/src/TrainingModel.cpp
index e35adf7..4a98137 100644 (file)
--- a/mv_machine_learning/training/src/TrainingModel.cpp
+++ b/mv_machine_learning/training/src/TrainingModel.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <string.h>
+#include <algorithm>
 #include <fstream>
 #include <istream>
-#include <tuple>
 #include <map>
-#include <algorithm>
+#include <string.h>
+#include <tuple>
 
 #include <sys/stat.h>
 

diff --git a/mv_roi_tracker/roi_tracker/src/ROITracker.cpp b/mv_roi_tracker/roi_tracker/src/ROITracker.cpp
index 52e8aae..c93760b 100644 (file)
--- a/mv_roi_tracker/roi_tracker/src/ROITracker.cpp
+++ b/mv_roi_tracker/roi_tracker/src/ROITracker.cpp
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-#include <string.h>
+#include <algorithm>
 #include <fstream>
 #include <istream>
-#include <tuple>
 #include <map>
-#include <algorithm>
+#include <string.h>
+#include <tuple>
 
 #include <sys/stat.h>
 
-#include <dlog.h>
 #include "mv_common.h"
 #include "mv_private.h"
+#include <dlog.h>
 
 #include <opencv2/core/core.hpp>
 #include <opencv2/core/utility.hpp>

diff --git a/mv_roi_tracker/roi_tracker/src/ROITrackerUtil.cpp b/mv_roi_tracker/roi_tracker/src/ROITrackerUtil.cpp
index 6e41c3f..5e96329 100644 (file)
--- a/mv_roi_tracker/roi_tracker/src/ROITrackerUtil.cpp
+++ b/mv_roi_tracker/roi_tracker/src/ROITrackerUtil.cpp
@@ -16,9 +16,9 @@
 
 #include "ROITrackerUtil.h"
 
+#include <iostream>
 #include <opencv2/tracking.hpp>
 #include <opencv2/tracking/tracking_legacy.hpp>
-#include <iostream>
 
 namespace MediaVision
 {

diff --git a/mv_roi_tracker/roi_tracker/src/mv_roi_tracker.c b/mv_roi_tracker/roi_tracker/src/mv_roi_tracker.c
index 4e53cf8..e27064b 100644 (file)
--- a/mv_roi_tracker/roi_tracker/src/mv_roi_tracker.c
+++ b/mv_roi_tracker/roi_tracker/src/mv_roi_tracker.c
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "mv_private.h"
-#include "mv_feature_key.h"
 #include "mv_roi_tracker.h"
+#include "mv_feature_key.h"
+#include "mv_private.h"
 #include "mv_roi_tracker_open.h"
 
 static const char *feature_keys[] = { "http://tizen.org/feature/vision.roi_tracking" };

diff --git a/mv_surveillance/surveillance/include/EventDefs.h b/mv_surveillance/surveillance/include/EventDefs.h
index 0fd812e..2f5cd9b 100644 (file)
--- a/mv_surveillance/surveillance/include/EventDefs.h
+++ b/mv_surveillance/surveillance/include/EventDefs.h
@@ -24,10 +24,10 @@
 
 #include <mv_common.h>
 
-#include <string>
-#include <vector>
 #include <list>
 #include <map>
+#include <string>
+#include <vector>
 
 #include <opencv2/opencv.hpp>
 

diff --git a/mv_surveillance/surveillance/include/EventManager.h b/mv_surveillance/surveillance/include/EventManager.h
index 77e8b49..3947e3f 100644 (file)
--- a/mv_surveillance/surveillance/include/EventManager.h
+++ b/mv_surveillance/surveillance/include/EventManager.h
@@ -22,8 +22,8 @@
  * @brief This file contains functionality for event manager.
  */
 
-#include "EventTrigger.h"
 #include "EventDefs.h"
+#include "EventTrigger.h"
 
 namespace mediavision
 {

diff --git a/mv_surveillance/surveillance/include/EventTrigger.h b/mv_surveillance/surveillance/include/EventTrigger.h
index 3cc6805..1da38b5 100644 (file)
--- a/mv_surveillance/surveillance/include/EventTrigger.h
+++ b/mv_surveillance/surveillance/include/EventTrigger.h
@@ -27,9 +27,9 @@
 #include <mv_surveillance.h>
 #include <mv_surveillance_private.h>
 
-#include <string>
-#include <map>
 #include <list>
+#include <map>
+#include <string>
 
 namespace mediavision
 {

diff --git a/mv_surveillance/surveillance/include/EventTriggerMovementDetection.h b/mv_surveillance/surveillance/include/EventTriggerMovementDetection.h
index db2b473..055c25f 100644 (file)
--- a/mv_surveillance/surveillance/include/EventTriggerMovementDetection.h
+++ b/mv_surveillance/surveillance/include/EventTriggerMovementDetection.h
@@ -24,8 +24,8 @@
 
 #include "EventTrigger.h"
 
-#include "EventResult.h"
 #include "EventDefs.h"
+#include "EventResult.h"
 
 namespace mediavision
 {

diff --git a/mv_surveillance/surveillance/include/EventTriggerPersonAppearance.h b/mv_surveillance/surveillance/include/EventTriggerPersonAppearance.h
index a9236d6..c05d461 100644 (file)
--- a/mv_surveillance/surveillance/include/EventTriggerPersonAppearance.h
+++ b/mv_surveillance/surveillance/include/EventTriggerPersonAppearance.h
@@ -25,11 +25,11 @@
 #include "EventTrigger.h"
 #include "MFTracker.h"
 
-#include "EventResult.h"
 #include "EventDefs.h"
+#include "EventResult.h"
 
-#include <opencv2/opencv.hpp>
 #include <opencv2/objdetect.hpp>
+#include <opencv2/opencv.hpp>
 
 #include <sys/time.h>
 

diff --git a/mv_surveillance/surveillance/include/EventTriggerPersonRecognition.h b/mv_surveillance/surveillance/include/EventTriggerPersonRecognition.h
index bbfcd1a..17bec3b 100644 (file)
--- a/mv_surveillance/surveillance/include/EventTriggerPersonRecognition.h
+++ b/mv_surveillance/surveillance/include/EventTriggerPersonRecognition.h
@@ -26,8 +26,8 @@
 
 #include "EventTrigger.h"
 
-#include "EventResult.h"
 #include "EventDefs.h"
+#include "EventResult.h"
 
 #include "EventTriggerPersonAppearance.h"
 

diff --git a/mv_surveillance/surveillance/src/EventManager.cpp b/mv_surveillance/surveillance/src/EventManager.cpp
index 5c9165d..7d84e57 100644 (file)
--- a/mv_surveillance/surveillance/src/EventManager.cpp
+++ b/mv_surveillance/surveillance/src/EventManager.cpp
@@ -18,9 +18,9 @@
 
 #include "SurveillanceHelper.h"
 
+#include "EventTriggerMovementDetection.h"
 #include "EventTriggerPersonAppearance.h"
 #include "EventTriggerPersonRecognition.h"
-#include "EventTriggerMovementDetection.h"
 
 #include "mv_private.h"
 #include <CommonUtils.h>

diff --git a/mv_surveillance/surveillance/src/EventTrigger.cpp b/mv_surveillance/surveillance/src/EventTrigger.cpp
index 7581765..4f61a41 100644 (file)
--- a/mv_surveillance/surveillance/src/EventTrigger.cpp
+++ b/mv_surveillance/surveillance/src/EventTrigger.cpp
@@ -16,9 +16,9 @@
 
 #include "EventTrigger.h"
 
-#include <mv_private.h>
-#include <mv_mask_buffer.h>
 #include <mv_apply_mask.h>
+#include <mv_mask_buffer.h>
+#include <mv_private.h>
 
 namespace mediavision
 {

diff --git a/mv_surveillance/surveillance/src/EventTriggerMovementDetection.cpp b/mv_surveillance/surveillance/src/EventTriggerMovementDetection.cpp
index d880e8c..4d434f7 100644 (file)
--- a/mv_surveillance/surveillance/src/EventTriggerMovementDetection.cpp
+++ b/mv_surveillance/surveillance/src/EventTriggerMovementDetection.cpp
@@ -17,8 +17,8 @@
 #include "EventTriggerMovementDetection.h"
 
 #include "EventDefs.h"
-#include "mv_absdiff.h"
 #include "SurveillanceHelper.h"
+#include "mv_absdiff.h"
 
 #include <mv_private.h>
 

diff --git a/mv_surveillance/surveillance/src/EventTriggerPersonAppearance.cpp b/mv_surveillance/surveillance/src/EventTriggerPersonAppearance.cpp
index 51b997b..5b3b7a9 100644 (file)
--- a/mv_surveillance/surveillance/src/EventTriggerPersonAppearance.cpp
+++ b/mv_surveillance/surveillance/src/EventTriggerPersonAppearance.cpp
@@ -17,8 +17,8 @@
 #include "EventTriggerPersonAppearance.h"
 
 #include "EventManager.h"
-#include "SurveillanceHelper.h"
 #include "EventTriggerMovementDetection.h"
+#include "SurveillanceHelper.h"
 
 #include "opencv2/highgui.hpp"
 

diff --git a/mv_surveillance/surveillance/src/EventTriggerPersonRecognition.cpp b/mv_surveillance/surveillance/src/EventTriggerPersonRecognition.cpp
index 5a3243f..d0f8870 100644 (file)
--- a/mv_surveillance/surveillance/src/EventTriggerPersonRecognition.cpp
+++ b/mv_surveillance/surveillance/src/EventTriggerPersonRecognition.cpp
@@ -17,8 +17,8 @@
 #include "EventTriggerPersonRecognition.h"
 #include "EventManager.h"
 
-#include <mv_private.h>
 #include <mv_face.h>
+#include <mv_private.h>
 #include <mv_surveillance.h>
 
 #include <sstream>

diff --git a/mv_surveillance/surveillance/src/MFTracker.cpp b/mv_surveillance/surveillance/src/MFTracker.cpp
index c7d19a8..e2ff616 100644 (file)
--- a/mv_surveillance/surveillance/src/MFTracker.cpp
+++ b/mv_surveillance/surveillance/src/MFTracker.cpp
@@ -16,8 +16,8 @@
 
 #include "MFTracker.h"
 
-#include "opencv2/video/tracking.hpp"
 #include "opencv2/imgproc.hpp"
+#include "opencv2/video/tracking.hpp"
 
 namespace mediavision
 {

diff --git a/mv_surveillance/surveillance/src/SurveillanceHelper.cpp b/mv_surveillance/surveillance/src/SurveillanceHelper.cpp
index ce2c21c..d45c4d2 100644 (file)
--- a/mv_surveillance/surveillance/src/SurveillanceHelper.cpp
+++ b/mv_surveillance/surveillance/src/SurveillanceHelper.cpp
@@ -18,8 +18,8 @@
 
 #include "mv_private.h"
 
-#include "opencv2/imgproc.hpp"
 #include "opencv2/highgui.hpp"
+#include "opencv2/imgproc.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
 
 namespace mediavision

diff --git a/mv_surveillance/surveillance/src/mv_surveillance.c b/mv_surveillance/surveillance/src/mv_surveillance.c
index edb7f9d..0f53962 100644 (file)
--- a/mv_surveillance/surveillance/src/mv_surveillance.c
+++ b/mv_surveillance/surveillance/src/mv_surveillance.c
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <stdlib.h>
 #include "mv_surveillance.h"
+#include <stdlib.h>
 
-#include "mv_surveillance_private.h"
-#include "mv_private.h"
 #include "mv_feature_key.h"
+#include "mv_private.h"
 #include "mv_surveillance_open.h"
+#include "mv_surveillance_private.h"
 
 /**
  * @file  mv_surveillance.c

diff --git a/test/assessment/barcode/assessment_barcode.cpp b/test/assessment/barcode/assessment_barcode.cpp
index 4548a21..09cce6d 100644 (file)
--- a/test/assessment/barcode/assessment_barcode.cpp
+++ b/test/assessment/barcode/assessment_barcode.cpp
@@ -19,14 +19,14 @@
 
 #include <opencv2/core.hpp>
 #include <opencv2/highgui.hpp>
+#include <opencv2/imgcodecs/legacy/constants_c.h>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/imgproc/imgproc_c.h>
-#include <opencv2/imgcodecs/legacy/constants_c.h>
 
-#include <error.h>
 #include <argp.h>
-#include <iostream>
 #include <chrono>
+#include <error.h>
+#include <iostream>
 
 #define MAX_ARGS 2
 

diff --git a/test/assessment/face/assessment_face.cpp b/test/assessment/face/assessment_face.cpp
index 3d210dd..c8d7294 100644 (file)
--- a/test/assessment/face/assessment_face.cpp
+++ b/test/assessment/face/assessment_face.cpp
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-#include <mv_face.h>
 #include <mv_common.h>
+#include <mv_face.h>
 #include <mv_private.h>
 
 #include <opencv2/core.hpp>
 #include <opencv2/highgui.hpp>
+#include <opencv2/imgcodecs/legacy/constants_c.h>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/imgproc/imgproc_c.h>
-#include <opencv2/imgcodecs/legacy/constants_c.h>
 
-#include <error.h>
 #include <argp.h>
-#include <iostream>
 #include <chrono>
+#include <error.h>
+#include <iostream>
 
 #define MAX_ARGS 3
 

diff --git a/test/assessment/surveillance/assessment_surveillance.cpp b/test/assessment/surveillance/assessment_surveillance.cpp
index 071ea13..7f53e69 100644 (file)
--- a/test/assessment/surveillance/assessment_surveillance.cpp
+++ b/test/assessment/surveillance/assessment_surveillance.cpp
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-#include <mv_surveillance.h>
 #include <mv_common.h>
 #include <mv_private.h>
+#include <mv_surveillance.h>
 
 #include <opencv2/core.hpp>
-#include <opencv2/video.hpp>
+#include <opencv2/highgui.hpp>
 #include <opencv2/imgproc.hpp>
+#include <opencv2/video.hpp>
 #include <opencv2/videoio.hpp>
-#include <opencv2/highgui.hpp>
 
-#include <error.h>
 #include <argp.h>
-#include <iostream>
 #include <chrono>
+#include <error.h>
+#include <iostream>
 
 #define MAX_ARGS 3
 

diff --git a/test/testsuites/barcode/barcode_test_suite.c b/test/testsuites/barcode/barcode_test_suite.c
index e6c9fac..68d8b77 100644 (file)
--- a/test/testsuites/barcode/barcode_test_suite.c
+++ b/test/testsuites/barcode/barcode_test_suite.c
@@ -20,18 +20,18 @@
 #include <mv_private.h>
 
 #include <ctype.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#include <libswscale/swscale.h>
 #include <libavcodec/avcodec.h>
 #include <libavutil/pixfmt.h>
+#include <libswscale/swscale.h>
 
+#include <argp.h>
 #include <curses.h>
 #include <error.h>
-#include <argp.h>
 
 #define MINX 0
 #define MINY 0

diff --git a/test/testsuites/barcode/test_barcode.cpp b/test/testsuites/barcode/test_barcode.cpp
index 2c05686..a2878ea 100644 (file)
--- a/test/testsuites/barcode/test_barcode.cpp
+++ b/test/testsuites/barcode/test_barcode.cpp
@@ -1,10 +1,10 @@
+#include <ImageHelper.h>
 #include <gtest/gtest.h>
 #include <json-glib/json-glib.h>
 #include <mv_barcode.h>
 #include <string>
 #include <tuple>
 #include <vector>
-#include <ImageHelper.h>
 
 using namespace std;
 using TestParams = tuple<string, string>;

diff --git a/test/testsuites/barcode/test_designqr.cpp b/test/testsuites/barcode/test_designqr.cpp
index e8a34a1..f08463c 100644 (file)
--- a/test/testsuites/barcode/test_designqr.cpp
+++ b/test/testsuites/barcode/test_designqr.cpp
@@ -1,5 +1,5 @@
-#include <gtest/gtest.h>
 #include <algorithm>
+#include <gtest/gtest.h>
 #include <mv_barcode_generate.h>
 
 #define IMAGE1_PATH TEST_RES_PATH "/res/inference/images/banana.jpg"

diff --git a/test/testsuites/common/image_helper/src/ImageHelper.cpp b/test/testsuites/common/image_helper/src/ImageHelper.cpp
index 2cc5888..80c8f7f 100644 (file)
--- a/test/testsuites/common/image_helper/src/ImageHelper.cpp
+++ b/test/testsuites/common/image_helper/src/ImageHelper.cpp
@@ -22,12 +22,12 @@
 
 #include <setjmp.h>
 
+#include <MediaSource.h>
 #include <opencv2/core.hpp>
 #include <opencv2/highgui.hpp>
+#include <opencv2/imgcodecs/legacy/constants_c.h>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/imgproc/imgproc_c.h>
-#include <opencv2/imgcodecs/legacy/constants_c.h>
-#include <MediaSource.h>
 
 /**
  * @file   ImageHelper.cpp

diff --git a/test/testsuites/common/image_helper/src/image_helper.cpp b/test/testsuites/common/image_helper/src/image_helper.cpp
index 0b4db2a..50c854d 100644 (file)
--- a/test/testsuites/common/image_helper/src/image_helper.cpp
+++ b/test/testsuites/common/image_helper/src/image_helper.cpp
@@ -16,8 +16,8 @@
 
 #include "image_helper.h"
 
-#include "mv_private.h"
 #include "ImageHelper.h"
+#include "mv_private.h"
 
 #include <opencv2/core.hpp>
 

diff --git a/test/testsuites/common/test_camera_pkt.cpp b/test/testsuites/common/test_camera_pkt.cpp
index 645108e..19709ac 100644 (file)
--- a/test/testsuites/common/test_camera_pkt.cpp
+++ b/test/testsuites/common/test_camera_pkt.cpp
@@ -1,5 +1,5 @@
-#include <gtest/gtest.h>
 #include <camera.h>
+#include <gtest/gtest.h>
 #include <mv_common.h>
 
 /* This test needs camera privilege and to be owner user*/

diff --git a/test/testsuites/common/testsuite_common/mv_testsuite_common.c b/test/testsuites/common/testsuite_common/mv_testsuite_common.c
index 677f13b..02604d3 100644 (file)
--- a/test/testsuites/common/testsuite_common/mv_testsuite_common.c
+++ b/test/testsuites/common/testsuite_common/mv_testsuite_common.c
@@ -19,9 +19,9 @@
 #include "image_helper.h"
 #include "mv_log_cfg.h"
 
-#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 void print_fail_result(const char *action_name, int action_return_value)
 {

diff --git a/test/testsuites/common/video_helper/mv_video_helper.c b/test/testsuites/common/video_helper/mv_video_helper.c
index a703786..8ac94fc 100644 (file)
--- a/test/testsuites/common/video_helper/mv_video_helper.c
+++ b/test/testsuites/common/video_helper/mv_video_helper.c
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-#include "mv_common.h"
 #include "mv_video_helper.h"
+#include "mv_common.h"
 
 #include "mv_log_cfg.h"
 
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
 
-#include <gst/gst.h>
 #include <gst/app/gstappsink.h>
 #include <gst/app/gstappsrc.h>
+#include <gst/gst.h>
 #include <gst/video/video.h>
 
 #include <pthread.h>

diff --git a/test/testsuites/common/video_helper/mv_video_helper.h b/test/testsuites/common/video_helper/mv_video_helper.h
index d54aa09..f694d9f 100644 (file)
--- a/test/testsuites/common/video_helper/mv_video_helper.h
+++ b/test/testsuites/common/video_helper/mv_video_helper.h
@@ -17,8 +17,8 @@
 #ifndef __MEDIA_VISION_MV_VIDEO_HELPER_H__
 #define __MEDIA_VISION_MV_VIDEO_HELPER_H__
 
-#include "mv_common.h"
 #include "image_helper.h"
+#include "mv_common.h"
 
 /**
  * @brief The handle to the video reader.

diff --git a/test/testsuites/common/visualizer/include/mv_util_shader.h b/test/testsuites/common/visualizer/include/mv_util_shader.h
index 9a1d619..a1945ec 100644 (file)
--- a/test/testsuites/common/visualizer/include/mv_util_shader.h
+++ b/test/testsuites/common/visualizer/include/mv_util_shader.h
@@ -21,11 +21,11 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include <cstdlib>
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
+#include <cstdlib>
 
 typedef struct shader_obj_t {
        GLuint program;

diff --git a/test/testsuites/common/visualizer/include/mv_util_visualizer_3d.h b/test/testsuites/common/visualizer/include/mv_util_visualizer_3d.h
index 7d47e1f..8e3ca2b 100644 (file)
--- a/test/testsuites/common/visualizer/include/mv_util_visualizer_3d.h
+++ b/test/testsuites/common/visualizer/include/mv_util_visualizer_3d.h
@@ -27,11 +27,11 @@ extern "C" {
 #include "mv_util_render_3d.h"
 
 #ifdef __cplusplus
-#include <cstdlib>
 #include <cmath>
+#include <cstdlib>
 #else
-#include <stdlib.h>
 #include <math.h>
+#include <stdlib.h>
 #endif
 
 int mv_util_visualizer_3d(mv_source_h source, float *depth, int xpos, int ypos);

diff --git a/test/testsuites/common/visualizer/src/mv_util_matrix.cpp b/test/testsuites/common/visualizer/src/mv_util_matrix.cpp
index ba01fa5..63dda46 100644 (file)
--- a/test/testsuites/common/visualizer/src/mv_util_matrix.cpp
+++ b/test/testsuites/common/visualizer/src/mv_util_matrix.cpp
@@ -15,10 +15,10 @@
  */
 
 #define _USE_MATH_DEFINES
+#include "mv_util_matrix.h"
 #include <math.h>
 #include <mv_common.h>
 #include <mv_private.h>
-#include "mv_util_matrix.h"
 
 static float vec3_length(float *v)
 {

diff --git a/test/testsuites/common/visualizer/src/mv_util_render_3d.cpp b/test/testsuites/common/visualizer/src/mv_util_render_3d.cpp
index ae5f235..2319b61 100644 (file)
--- a/test/testsuites/common/visualizer/src/mv_util_render_3d.cpp
+++ b/test/testsuites/common/visualizer/src/mv_util_render_3d.cpp
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include <stdio.h>
-#include <math.h>
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
+#include <math.h>
 #include <mv_common.h>
 #include <mv_private.h>
+#include <stdio.h>
 
 #include "mv_util_matrix.h"
 #include "mv_util_render_2d.h"

diff --git a/test/testsuites/common/visualizer/src/mv_util_shader.cpp b/test/testsuites/common/visualizer/src/mv_util_shader.cpp
index 42bca00..b69faf5 100644 (file)
--- a/test/testsuites/common/visualizer/src/mv_util_shader.cpp
+++ b/test/testsuites/common/visualizer/src/mv_util_shader.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <mv_private.h>
 #include "mv_util_shader.h"
+#include <mv_private.h>
 
 GLuint compile_shader_text(GLenum shaderType, const char *text)
 {

diff --git a/test/testsuites/common/visualizer/src/mv_util_visualizer_2d.cpp b/test/testsuites/common/visualizer/src/mv_util_visualizer_2d.cpp
index b461736..e1150b8 100644 (file)
--- a/test/testsuites/common/visualizer/src/mv_util_visualizer_2d.cpp
+++ b/test/testsuites/common/visualizer/src/mv_util_visualizer_2d.cpp
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-#include <mv_private.h>
 #include <grpcpp/grpcpp.h>
+#include <mv_private.h>
 
 #include <opencv2/core.hpp>
 #include <opencv2/imgcodecs.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
 #include <opencv2/opencv.hpp>
 
-#include "mv_util_visualizer_rd.grpc.pb.h"
 #include "mv_util_visualizer_2d.h"
+#include "mv_util_visualizer_rd.grpc.pb.h"
 
 static int win_w = 1920;
 static int win_h = 1080;

diff --git a/test/testsuites/common/visualizer/src/mv_util_visualizer_3d.cpp b/test/testsuites/common/visualizer/src/mv_util_visualizer_3d.cpp
index 59d79a6..8a7a58c 100644 (file)
--- a/test/testsuites/common/visualizer/src/mv_util_visualizer_3d.cpp
+++ b/test/testsuites/common/visualizer/src/mv_util_visualizer_3d.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <mv_private.h>
-#include "mv_util_matrix.h"
 #include "mv_util_visualizer_3d.h"
+#include "mv_util_matrix.h"
+#include <mv_private.h>
 
 #define MAX_DEPTH_WIDTH 640
 #define MAX_DEPTH_HEIGHT 480

diff --git a/test/testsuites/common/visualizer/src/mv_util_winsys.cpp b/test/testsuites/common/visualizer/src/mv_util_winsys.cpp
index f243621..2246c20 100644 (file)
--- a/test/testsuites/common/visualizer/src/mv_util_winsys.cpp
+++ b/test/testsuites/common/visualizer/src/mv_util_winsys.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <string.h>
-#include <sys/mman.h>
-#include <signal.h>
-#include <mv_private.h>
+#include "mv_util_winsys.h"
 #include "wayland-client.h"
 #include "wayland-egl.h"
-#include "mv_util_winsys.h"
+#include <mv_private.h>
+#include <signal.h>
+#include <string.h>
+#include <sys/mman.h>
 
 #define UNUSED(x) (void) (x)
 

diff --git a/test/testsuites/face/face_test_suite.c b/test/testsuites/face/face_test_suite.c
index a85e258..79f87f0 100644 (file)
--- a/test/testsuites/face/face_test_suite.c
+++ b/test/testsuites/face/face_test_suite.c
@@ -27,11 +27,11 @@
 #include "pthread.h"
 
 #include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <dirent.h>
-#include <string.h>
 #include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define MIN_ALLOWED_LABEL 0
 #define MAX_ALLOWED_LABEL 100

diff --git a/test/testsuites/image/image_test_suite.c b/test/testsuites/image/image_test_suite.c
index fc2adc7..4657cbd 100644 (file)
--- a/test/testsuites/image/image_test_suite.c
+++ b/test/testsuites/image/image_test_suite.c
@@ -18,11 +18,11 @@
 #include "mv_private.h"
 
 #include "image_helper.h"
-#include "mv_video_helper.h"
 #include "mv_testsuite_common.h"
+#include "mv_video_helper.h"
 
-#include <stdlib.h>
 #include <glib-2.0/glib.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <pthread.h>

diff --git a/test/testsuites/machine_learning/face_recognition/face_recognition_test_util.cpp b/test/testsuites/machine_learning/face_recognition/face_recognition_test_util.cpp
index 75be896..2e114dd 100644 (file)
--- a/test/testsuites/machine_learning/face_recognition/face_recognition_test_util.cpp
+++ b/test/testsuites/machine_learning/face_recognition/face_recognition_test_util.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
+#include <app_common.h>
 #include <stdio.h>
 #include <string>
-#include <vector>
-#include <app_common.h>
 #include <unistd.h>
+#include <vector>
 
 using namespace std;
 

diff --git a/test/testsuites/machine_learning/face_recognition/measure_face_recognition.cpp b/test/testsuites/machine_learning/face_recognition/measure_face_recognition.cpp
index fcdcf6a..1bc62e1 100644 (file)
--- a/test/testsuites/machine_learning/face_recognition/measure_face_recognition.cpp
+++ b/test/testsuites/machine_learning/face_recognition/measure_face_recognition.cpp
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
+#include <algorithm>
+#include <fstream>
 #include <iostream>
-#include <string.h>
 #include <map>
-#include <fstream>
+#include <string.h>
 #include <vector>
-#include <algorithm>
 
 #include "gtest/gtest.h"
 
 #include "ImageHelper.h"
-#include "mv_face_recognition.h"
 #include "face_recognition_test_util.h"
+#include "mv_face_recognition.h"
 
 #define TRAIN_LIST_FILE TEST_RES_PATH "/res/face_recognition/res/measurement/train_list.txt"
 #define TEST_LIST_FILE TEST_RES_PATH "/res/face_recognition/res/measurement/test_list.txt"

diff --git a/test/testsuites/machine_learning/face_recognition/test_face_recognition.cpp b/test/testsuites/machine_learning/face_recognition/test_face_recognition.cpp
index 49d0560..92d9095 100644 (file)
--- a/test/testsuites/machine_learning/face_recognition/test_face_recognition.cpp
+++ b/test/testsuites/machine_learning/face_recognition/test_face_recognition.cpp
@@ -15,16 +15,16 @@
  */
 
 #include <iostream>
-#include <string.h>
 #include <map>
+#include <string.h>
 #include <thread>
 
 #include "gtest/gtest.h"
 
 #include "ImageHelper.h"
+#include "face_recognition_test_util.h"
 #include "mv_face_recognition.h"
 #include "mv_face_recognition_internal.h"
-#include "face_recognition_test_util.h"
 
 #define TRAINING_IMAGE_PATH TEST_RES_PATH "/res/face_recognition/res/test/training/"
 #define TEST_IMAGE_PATH TEST_RES_PATH "/res/face_recognition/res/test/test/"

diff --git a/test/testsuites/machine_learning/image_classification/test_image_classification.cpp b/test/testsuites/machine_learning/image_classification/test_image_classification.cpp
index aa14b2b..ba3037b 100644 (file)
--- a/test/testsuites/machine_learning/image_classification/test_image_classification.cpp
+++ b/test/testsuites/machine_learning/image_classification/test_image_classification.cpp
@@ -15,9 +15,9 @@
  */
 
 #include <iostream>
+#include <map>
 #include <string.h>
 #include <vector>
-#include <map>
 
 #include "gtest/gtest.h"
 

diff --git a/test/testsuites/machine_learning/image_classification/test_image_classification_async.cpp b/test/testsuites/machine_learning/image_classification/test_image_classification_async.cpp
index 32330d1..e292a53 100644 (file)
--- a/test/testsuites/machine_learning/image_classification/test_image_classification_async.cpp
+++ b/test/testsuites/machine_learning/image_classification/test_image_classification_async.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <iostream>
 #include <algorithm>
+#include <iostream>
 #include <string.h>
 #include <thread>
 

diff --git a/test/testsuites/machine_learning/image_segmentation/test_selfie_segmentation.cpp b/test/testsuites/machine_learning/image_segmentation/test_selfie_segmentation.cpp
index 57864ee..543735b 100644 (file)
--- a/test/testsuites/machine_learning/image_segmentation/test_selfie_segmentation.cpp
+++ b/test/testsuites/machine_learning/image_segmentation/test_selfie_segmentation.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
+#include <algorithm>
 #include <fstream>
 #include <iostream>
-#include <algorithm>
-#include <string.h>
 #include <opencv2/core.hpp>
 #include <opencv2/imgcodecs.hpp>
 #include <opencv2/imgproc.hpp>
+#include <string.h>
 
 #include "gtest/gtest.h"
 

diff --git a/test/testsuites/machine_learning/inference/inference_test_suite.c b/test/testsuites/machine_learning/inference/inference_test_suite.c
index 3970212..a0f23cf 100644 (file)
--- a/test/testsuites/machine_learning/inference/inference_test_suite.c
+++ b/test/testsuites/machine_learning/inference/inference_test_suite.c
@@ -17,18 +17,18 @@
 #include <mv_common.h>
 #include <mv_inference.h>
 
-#include <mv_testsuite_common.h>
 #include <image_helper.h>
+#include <mv_testsuite_common.h>
 #include <mv_video_helper.h>
 
 #include <mv_log_cfg.h>
 
 #include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <dirent.h>
-#include <string.h>
 #include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <time.h>
 
 #define ARRAY_SIZE(x) (sizeof((x)) / sizeof((x)[0]))

diff --git a/test/testsuites/machine_learning/inference/test_face_detection.cpp b/test/testsuites/machine_learning/inference/test_face_detection.cpp
index 8329dfa..e2aff2c 100644 (file)
--- a/test/testsuites/machine_learning/inference/test_face_detection.cpp
+++ b/test/testsuites/machine_learning/inference/test_face_detection.cpp
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
+#include "test_inference_helper.hpp"
+#include <ImageHelper.h>
 #include <gtest/gtest.h>
 #include <string>
-#include <ImageHelper.h>
-#include "test_inference_helper.hpp"
 
 #define FD_TFLITE_WEIGHT_MOBILENET_V1_SSD_300_PATH \
        TEST_RES_PATH                                  \

diff --git a/test/testsuites/machine_learning/inference/test_face_landmark_detection.cpp b/test/testsuites/machine_learning/inference/test_face_landmark_detection.cpp
index 600f54c..5b3e2db 100644 (file)
--- a/test/testsuites/machine_learning/inference/test_face_landmark_detection.cpp
+++ b/test/testsuites/machine_learning/inference/test_face_landmark_detection.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-#include <ImageHelper.h>
 #include "test_inference_helper.hpp"
+#include <ImageHelper.h>
+#include <gtest/gtest.h>
 
 #define FLD_OPENCV_WEIGHT_CAFFE_PATH \
        TEST_RES_PATH                    \

diff --git a/test/testsuites/machine_learning/inference/test_image_classification.cpp b/test/testsuites/machine_learning/inference/test_image_classification.cpp
index b97f65e..8ed892a 100644 (file)
--- a/test/testsuites/machine_learning/inference/test_image_classification.cpp
+++ b/test/testsuites/machine_learning/inference/test_image_classification.cpp
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
+#include "test_inference_helper.hpp"
+#include <ImageHelper.h>
 #include <gtest/gtest.h>
 #include <string>
-#include <ImageHelper.h>
-#include "test_inference_helper.hpp"
 
 #define IC_LABEL_MOBILENET_V1_224_PATH \
        TEST_RES_PATH                      \

diff --git a/test/testsuites/machine_learning/inference/test_inference_helper.cpp b/test/testsuites/machine_learning/inference/test_inference_helper.cpp
index e449d17..1a57dea 100644 (file)
--- a/test/testsuites/machine_learning/inference/test_inference_helper.cpp
+++ b/test/testsuites/machine_learning/inference/test_inference_helper.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include "test_inference_helper.hpp"
 #include <gtest/gtest.h>
 #include <image_helper.h>
-#include "test_inference_helper.hpp"
 
 TestInference::TestInference() : _use_json_parser(false), _target_device_type(MV_INFERENCE_TARGET_DEVICE_NONE)
 {

diff --git a/test/testsuites/machine_learning/inference/test_object_detection.cpp b/test/testsuites/machine_learning/inference/test_object_detection.cpp
index 203e36b..be59644 100644 (file)
--- a/test/testsuites/machine_learning/inference/test_object_detection.cpp
+++ b/test/testsuites/machine_learning/inference/test_object_detection.cpp
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
+#include "test_inference_helper.hpp"
+#include <ImageHelper.h>
 #include <gtest/gtest.h>
 #include <string>
-#include <ImageHelper.h>
-#include "test_inference_helper.hpp"
 
 #define OD_LABEL_MOBILENET_V1_SSD_300_PATH \
        TEST_RES_PATH                          \

diff --git a/test/testsuites/machine_learning/inference/test_pose_landmark_detection.cpp b/test/testsuites/machine_learning/inference/test_pose_landmark_detection.cpp
index 707d92b..4175a67 100644 (file)
--- a/test/testsuites/machine_learning/inference/test_pose_landmark_detection.cpp
+++ b/test/testsuites/machine_learning/inference/test_pose_landmark_detection.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-#include <ImageHelper.h>
 #include "test_inference_helper.hpp"
+#include <ImageHelper.h>
+#include <gtest/gtest.h>
 
 #define PLD_TFLITE_WEIGHT_MOBILENET_V1_POSENET_257_PATH \
        TEST_RES_PATH                                       \

diff --git a/test/testsuites/machine_learning/landmark_detection/test_landmark_detection.cpp b/test/testsuites/machine_learning/landmark_detection/test_landmark_detection.cpp
index 6f90e58..752553c 100644 (file)
--- a/test/testsuites/machine_learning/landmark_detection/test_landmark_detection.cpp
+++ b/test/testsuites/machine_learning/landmark_detection/test_landmark_detection.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <iostream>
 #include <algorithm>
+#include <iostream>
 #include <string.h>
 
 #include "gtest/gtest.h"

diff --git a/test/testsuites/machine_learning/landmark_detection/test_landmark_detection_async.cpp b/test/testsuites/machine_learning/landmark_detection/test_landmark_detection_async.cpp
index 7e71125..93e7f3f 100644 (file)
--- a/test/testsuites/machine_learning/landmark_detection/test_landmark_detection_async.cpp
+++ b/test/testsuites/machine_learning/landmark_detection/test_landmark_detection_async.cpp
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-#include <iostream>
 #include <algorithm>
+#include <iostream>
 #include <string.h>
 #include <thread>
 
 #include "gtest/gtest.h"
 
 #include "ImageHelper.h"
-#include "mv_pose_landmark_internal.h"
 #include "mv_facial_landmark_internal.h"
+#include "mv_pose_landmark_internal.h"
 
 #define IMG_FACE TEST_RES_PATH "/res/inference/images/faceLandmark.jpg"
 #define IMG_POSE TEST_RES_PATH "/res/inference/images/poseLandmark.jpg"

diff --git a/test/testsuites/machine_learning/object_detection/test_object_detection.cpp b/test/testsuites/machine_learning/object_detection/test_object_detection.cpp
index 8f8bfd9..aaee147 100644 (file)
--- a/test/testsuites/machine_learning/object_detection/test_object_detection.cpp
+++ b/test/testsuites/machine_learning/object_detection/test_object_detection.cpp
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#include <iostream>
 #include <algorithm>
+#include <iostream>
 #include <string.h>
 
 #include "gtest/gtest.h"
 
 #include "ImageHelper.h"
-#include "mv_object_detection_internal.h"
 #include "mv_face_detection_internal.h"
+#include "mv_object_detection_internal.h"
 
 #define IMG_DOG TEST_RES_PATH "/res/inference/images/dog2.jpg"
 #define IMG_FACE TEST_RES_PATH "/res/inference/images/faceDetection.jpg"

diff --git a/test/testsuites/machine_learning/object_detection/test_object_detection_async.cpp b/test/testsuites/machine_learning/object_detection/test_object_detection_async.cpp
index bcaddc4..5084b27 100644 (file)
--- a/test/testsuites/machine_learning/object_detection/test_object_detection_async.cpp
+++ b/test/testsuites/machine_learning/object_detection/test_object_detection_async.cpp
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-#include <iostream>
 #include <algorithm>
+#include <iostream>
 #include <string.h>
 #include <thread>
 
 #include "gtest/gtest.h"
 
 #include "ImageHelper.h"
-#include "mv_object_detection_internal.h"
 #include "mv_face_detection_internal.h"
+#include "mv_object_detection_internal.h"
 
 #define IMG_DOG TEST_RES_PATH "/res/inference/images/dog2.jpg"
 #define IMG_FACE TEST_RES_PATH "/res/inference/images/faceDetection.jpg"

diff --git a/test/testsuites/machine_learning/object_detection_3d/test_object_detection_3d.cpp b/test/testsuites/machine_learning/object_detection_3d/test_object_detection_3d.cpp
index 0eecf8d..cd32735 100644 (file)
--- a/test/testsuites/machine_learning/object_detection_3d/test_object_detection_3d.cpp
+++ b/test/testsuites/machine_learning/object_detection_3d/test_object_detection_3d.cpp
@@ -15,8 +15,8 @@
  */
 
 #include <iostream>
-#include <string.h>
 #include <map>
+#include <string.h>
 
 #include "gtest/gtest.h"
 

diff --git a/test/testsuites/mv3d/depth_test_suite.cpp b/test/testsuites/mv3d/depth_test_suite.cpp
index 40ab602..9cef533 100644 (file)
--- a/test/testsuites/mv3d/depth_test_suite.cpp
+++ b/test/testsuites/mv3d/depth_test_suite.cpp
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-#include <pthread.h>
 #include <chrono>
-#include <iostream>
 #include <fstream>
 #include <iomanip>
-#include <stdlib.h>
-#include <unistd.h>
+#include <iostream>
 #include <math.h>
-#include <typeinfo>
 #include <opencv2/core.hpp>
 #include <opencv2/imgcodecs.hpp>
 #include <opencv2/imgproc.hpp>
+#include <pthread.h>
+#include <stdlib.h>
+#include <typeinfo>
+#include <unistd.h>
 
-#include <mv_log_cfg.h>
 #include <mv_common.h>
+#include <mv_log_cfg.h>
 #include <mv_testsuite_common.h>
 
 #include "mv_3d.h"

diff --git a/test/testsuites/mv3d/depthstream_test_suite.cpp b/test/testsuites/mv3d/depthstream_test_suite.cpp
index 90befae..090235c 100644 (file)
--- a/test/testsuites/mv3d/depthstream_test_suite.cpp
+++ b/test/testsuites/mv3d/depthstream_test_suite.cpp
@@ -14,31 +14,31 @@
  * limitations under the License.
  */
 
-#include <pthread.h>
 #include <chrono>
-#include <iostream>
 #include <fstream>
 #include <iomanip>
-#include <stdlib.h>
-#include <unistd.h>
+#include <iostream>
 #include <math.h>
 #include <opencv2/core.hpp>
 #include <opencv2/imgcodecs.hpp>
 #include <opencv2/imgproc.hpp>
+#include <pthread.h>
+#include <stdlib.h>
+#include <unistd.h>
 #ifdef MV_3D_POINTCLOUD_IS_AVAILABLE
 #include <open3d/Open3D.h>
 #endif
 
-#include <mv_log_cfg.h>
-#include <mv_common.h>
 #include "mv_3d.h"
+#include <mv_common.h>
+#include <mv_log_cfg.h>
 #include <mv_testsuite_common.h>
 #include <vision_source.h>
 
 #include <glib-2.0/glib.h>
+#include <gst/app/gstappsrc.h>
 #include <gst/gst.h>
 #include <gst/video/video.h>
-#include <gst/app/gstappsrc.h>
 
 #ifdef BUILD_VISUALIZER
 #include "mv_util_visualizer_2d.h"

diff --git a/test/testsuites/mv3d/test_3d.cpp b/test/testsuites/mv3d/test_3d.cpp
index 93ff725..b8011a4 100644 (file)
--- a/test/testsuites/mv3d/test_3d.cpp
+++ b/test/testsuites/mv3d/test_3d.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <unistd.h>
-#include <pthread.h>
 #include <glib-2.0/glib.h>
+#include <pthread.h>
+#include <unistd.h>
 
-#include "gtest/gtest.h"
 #include "ImageHelper.h"
 #include "mv_3d.h"
+#include "gtest/gtest.h"
 
 using namespace testing;
 

diff --git a/test/testsuites/surveillance/surveillance_test_suite.c b/test/testsuites/surveillance/surveillance_test_suite.c
index 7090790..c2a77ec 100644 (file)
--- a/test/testsuites/surveillance/surveillance_test_suite.c
+++ b/test/testsuites/surveillance/surveillance_test_suite.c
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-#include "mv_testsuite_common.h"
 #include "image_helper.h"
+#include "mv_testsuite_common.h"
 
 #include "mv_log_cfg.h"
 
 #include "mv_private.h"
 #include "mv_surveillance.h"
 
-#include <stdlib.h>
 #include <limits.h>
+#include <stdlib.h>
 
 #define MAX_EVENTS_NUMBER 101
 

diff --git a/test/testsuites/tracker/test_tracker.cpp b/test/testsuites/tracker/test_tracker.cpp
index 6cc6671..ceae3bc 100644 (file)
--- a/test/testsuites/tracker/test_tracker.cpp
+++ b/test/testsuites/tracker/test_tracker.cpp
@@ -15,8 +15,8 @@
  */
 
 #include <iostream>
-#include <string.h>
 #include <map>
+#include <string.h>
 
 #include "gtest/gtest.h"
 

diff --git a/test/testsuites/visualizer/remote_display_server/server.cpp b/test/testsuites/visualizer/remote_display_server/server.cpp
index 89cac0d..71032cc 100644 (file)
--- a/test/testsuites/visualizer/remote_display_server/server.cpp
+++ b/test/testsuites/visualizer/remote_display_server/server.cpp
@@ -1,14 +1,14 @@
 
-#include <stdio.h>
-#include <grpcpp/grpcpp.h>
 #include "proto/mv_util_visualizer_rd.grpc.pb.h"
+#include <grpcpp/grpcpp.h>
+#include <stdio.h>
 
 #include <stdlib.h>
 #include <string>
 
 #include <opencv2/core.hpp>
-#include <opencv2/imgcodecs.hpp>
 #include <opencv2/highgui.hpp>
+#include <opencv2/imgcodecs.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
 
 typedef unsigned char byte;

diff --git a/test/testsuites/visualizer/visualizer_test_suite.cpp b/test/testsuites/visualizer/visualizer_test_suite.cpp
index 42c152a..b773ca1 100644 (file)
--- a/test/testsuites/visualizer/visualizer_test_suite.cpp
+++ b/test/testsuites/visualizer/visualizer_test_suite.cpp
@@ -16,14 +16,14 @@
 
 #include <mv_private.h>
 
-#include <iostream>
+#include <argp.h>
 #include <chrono>
 #include <error.h>
-#include <argp.h>
+#include <iostream>
 
+#include "bunny.h"
 #include "mv_util_visualizer_2d.h"
 #include "mv_util_visualizer_3d.h"
-#include "bunny.h"
 
 #define MAX_ARGS 3