From 44787a8ebcf06a06d6cb44cd9e0cbac9822f7a66 Mon Sep 17 00:00:00 2001 From: nihui Date: Thu, 2 Jan 2025 08:08:34 +0000 Subject: [PATCH] apply code-format changes --- examples/yolov8.cpp | 72 ++++++++++++++++++++-------------------- examples/yolov8_obb.cpp | 32 +++++++++--------- examples/yolov8_pose.cpp | 68 ++++++++++++++++++------------------- examples/yolov8_seg.cpp | 46 ++++++++++++------------- 4 files changed, 109 insertions(+), 109 deletions(-) diff --git a/examples/yolov8.cpp b/examples/yolov8.cpp index 44072a1de2d..3a5068b5f79 100644 --- a/examples/yolov8.cpp +++ b/examples/yolov8.cpp @@ -408,25 +408,25 @@ static void draw_objects_coco(const cv::Mat& bgr, const std::vector& obj }; static cv::Scalar colors[] = { - cv::Scalar(244, 67, 54), - cv::Scalar(233, 30, 99), - cv::Scalar(156, 39, 176), - cv::Scalar(103, 58, 183), - cv::Scalar( 63, 81, 181), - cv::Scalar( 33, 150, 243), - cv::Scalar( 3, 169, 244), - cv::Scalar( 0, 188, 212), - cv::Scalar( 0, 150, 136), - cv::Scalar( 76, 175, 80), - cv::Scalar(139, 195, 74), - cv::Scalar(205, 220, 57), - cv::Scalar(255, 235, 59), - cv::Scalar(255, 193, 7), - cv::Scalar(255, 152, 0), - cv::Scalar(255, 87, 34), - cv::Scalar(121, 85, 72), + cv::Scalar(244, 67, 54), + cv::Scalar(233, 30, 99), + cv::Scalar(156, 39, 176), + cv::Scalar(103, 58, 183), + cv::Scalar(63, 81, 181), + cv::Scalar(33, 150, 243), + cv::Scalar(3, 169, 244), + cv::Scalar(0, 188, 212), + cv::Scalar(0, 150, 136), + cv::Scalar(76, 175, 80), + cv::Scalar(139, 195, 74), + cv::Scalar(205, 220, 57), + cv::Scalar(255, 235, 59), + cv::Scalar(255, 193, 7), + cv::Scalar(255, 152, 0), + cv::Scalar(255, 87, 34), + cv::Scalar(121, 85, 72), cv::Scalar(158, 158, 158), - cv::Scalar( 96, 125, 139) + cv::Scalar(96, 125, 139) }; cv::Mat image = bgr.clone(); @@ -547,25 +547,25 @@ static void draw_objects_oiv(const cv::Mat& bgr, const std::vector& obje }; static cv::Scalar colors[] = { - cv::Scalar(244, 67, 54), - cv::Scalar(233, 30, 99), - cv::Scalar(156, 39, 176), - cv::Scalar(103, 58, 183), - cv::Scalar( 63, 81, 181), - cv::Scalar( 33, 150, 243), - cv::Scalar( 3, 169, 244), - cv::Scalar( 0, 188, 212), - cv::Scalar( 0, 150, 136), - cv::Scalar( 76, 175, 80), - cv::Scalar(139, 195, 74), - cv::Scalar(205, 220, 57), - cv::Scalar(255, 235, 59), - cv::Scalar(255, 193, 7), - cv::Scalar(255, 152, 0), - cv::Scalar(255, 87, 34), - cv::Scalar(121, 85, 72), + cv::Scalar(244, 67, 54), + cv::Scalar(233, 30, 99), + cv::Scalar(156, 39, 176), + cv::Scalar(103, 58, 183), + cv::Scalar(63, 81, 181), + cv::Scalar(33, 150, 243), + cv::Scalar(3, 169, 244), + cv::Scalar(0, 188, 212), + cv::Scalar(0, 150, 136), + cv::Scalar(76, 175, 80), + cv::Scalar(139, 195, 74), + cv::Scalar(205, 220, 57), + cv::Scalar(255, 235, 59), + cv::Scalar(255, 193, 7), + cv::Scalar(255, 152, 0), + cv::Scalar(255, 87, 34), + cv::Scalar(121, 85, 72), cv::Scalar(158, 158, 158), - cv::Scalar( 96, 125, 139) + cv::Scalar(96, 125, 139) }; cv::Mat image = bgr.clone(); diff --git a/examples/yolov8_obb.cpp b/examples/yolov8_obb.cpp index b97a268abde..c80c6fd99d7 100644 --- a/examples/yolov8_obb.cpp +++ b/examples/yolov8_obb.cpp @@ -424,23 +424,23 @@ static void draw_objects(const cv::Mat& bgr, const std::vector& objects) }; static const cv::Scalar colors[] = { - cv::Scalar(156, 39, 176), - cv::Scalar(103, 58, 183), - cv::Scalar( 63, 81, 181), - cv::Scalar( 33, 150, 243), - cv::Scalar( 3, 169, 244), - cv::Scalar( 0, 188, 212), - cv::Scalar( 0, 150, 136), - cv::Scalar( 76, 175, 80), - cv::Scalar(139, 195, 74), - cv::Scalar(205, 220, 57), - cv::Scalar(255, 235, 59), - cv::Scalar(255, 193, 7), - cv::Scalar(255, 152, 0), - cv::Scalar(255, 87, 34), - cv::Scalar(121, 85, 72), + cv::Scalar(156, 39, 176), + cv::Scalar(103, 58, 183), + cv::Scalar(63, 81, 181), + cv::Scalar(33, 150, 243), + cv::Scalar(3, 169, 244), + cv::Scalar(0, 188, 212), + cv::Scalar(0, 150, 136), + cv::Scalar(76, 175, 80), + cv::Scalar(139, 195, 74), + cv::Scalar(205, 220, 57), + cv::Scalar(255, 235, 59), + cv::Scalar(255, 193, 7), + cv::Scalar(255, 152, 0), + cv::Scalar(255, 87, 34), + cv::Scalar(121, 85, 72), cv::Scalar(158, 158, 158), - cv::Scalar( 96, 125, 139) + cv::Scalar(96, 125, 139) }; cv::Mat image = bgr.clone(); diff --git a/examples/yolov8_pose.cpp b/examples/yolov8_pose.cpp index 0bf6699e7db..e4b6137766c 100644 --- a/examples/yolov8_pose.cpp +++ b/examples/yolov8_pose.cpp @@ -430,25 +430,25 @@ static void draw_objects(const cv::Mat& bgr, const std::vector& objects) static const char* class_names[] = {"person"}; static const cv::Scalar colors[] = { - cv::Scalar(244, 67, 54), - cv::Scalar(233, 30, 99), - cv::Scalar(156, 39, 176), - cv::Scalar(103, 58, 183), - cv::Scalar( 63, 81, 181), - cv::Scalar( 33, 150, 243), - cv::Scalar( 3, 169, 244), - cv::Scalar( 0, 188, 212), - cv::Scalar( 0, 150, 136), - cv::Scalar( 76, 175, 80), - cv::Scalar(139, 195, 74), - cv::Scalar(205, 220, 57), - cv::Scalar(255, 235, 59), - cv::Scalar(255, 193, 7), - cv::Scalar(255, 152, 0), - cv::Scalar(255, 87, 34), - cv::Scalar(121, 85, 72), + cv::Scalar(244, 67, 54), + cv::Scalar(233, 30, 99), + cv::Scalar(156, 39, 176), + cv::Scalar(103, 58, 183), + cv::Scalar(63, 81, 181), + cv::Scalar(33, 150, 243), + cv::Scalar(3, 169, 244), + cv::Scalar(0, 188, 212), + cv::Scalar(0, 150, 136), + cv::Scalar(76, 175, 80), + cv::Scalar(139, 195, 74), + cv::Scalar(205, 220, 57), + cv::Scalar(255, 235, 59), + cv::Scalar(255, 193, 7), + cv::Scalar(255, 152, 0), + cv::Scalar(255, 87, 34), + cv::Scalar(121, 85, 72), cv::Scalar(158, 158, 158), - cv::Scalar( 96, 125, 139) + cv::Scalar(96, 125, 139) }; cv::Mat image = bgr.clone(); @@ -467,22 +467,22 @@ static void draw_objects(const cv::Mat& bgr, const std::vector& objects) {0, 1}, {1, 3}, {0, 2}, {2, 4}, {5, 6}, {5, 7}, {7, 9}, {6, 8}, {8, 10}, {5, 11}, {6, 12}, {11, 12}, {11, 13}, {12, 14}, {13, 15}, {14, 16} }; static const cv::Scalar bone_colors[] = { - cv::Scalar( 0, 255, 0), - cv::Scalar( 0, 255, 0), - cv::Scalar( 0, 255, 0), - cv::Scalar( 0, 255, 0), - cv::Scalar(255, 128, 0), - cv::Scalar(255, 128, 0), - cv::Scalar(255, 128, 0), - cv::Scalar(255, 128, 0), - cv::Scalar(255, 128, 0), - cv::Scalar(255, 51, 255), - cv::Scalar(255, 51, 255), - cv::Scalar(255, 51, 255), - cv::Scalar( 51, 153, 255), - cv::Scalar( 51, 153, 255), - cv::Scalar( 51, 153, 255), - cv::Scalar( 51, 153, 255), + cv::Scalar(0, 255, 0), + cv::Scalar(0, 255, 0), + cv::Scalar(0, 255, 0), + cv::Scalar(0, 255, 0), + cv::Scalar(255, 128, 0), + cv::Scalar(255, 128, 0), + cv::Scalar(255, 128, 0), + cv::Scalar(255, 128, 0), + cv::Scalar(255, 128, 0), + cv::Scalar(255, 51, 255), + cv::Scalar(255, 51, 255), + cv::Scalar(255, 51, 255), + cv::Scalar(51, 153, 255), + cv::Scalar(51, 153, 255), + cv::Scalar(51, 153, 255), + cv::Scalar(51, 153, 255), }; for (int j = 0; j < 16; j++) diff --git a/examples/yolov8_seg.cpp b/examples/yolov8_seg.cpp index 3af2a200342..6472199bdd6 100644 --- a/examples/yolov8_seg.cpp +++ b/examples/yolov8_seg.cpp @@ -437,12 +437,12 @@ static int detect_yolov8_seg(const cv::Mat& bgr, std::vector& objects) ncnn::Layer* gemm = ncnn::create_layer("Gemm"); ncnn::ParamDict pd; - pd.set(6, 1); // constantC - pd.set(7, count); // constantM + pd.set(6, 1); // constantC + pd.set(7, count); // constantM pd.set(8, mask_protos.w * mask_protos.h); // constantN - pd.set(9, mask_feat.w); // constantK - pd.set(10, -1); // constant_broadcast_type_C - pd.set(11, 1); // output_N1M + pd.set(9, mask_feat.w); // constantK + pd.set(10, -1); // constant_broadcast_type_C + pd.set(11, 1); // output_N1M gemm->load_param(pd); ncnn::Option opt; @@ -524,25 +524,25 @@ static void draw_objects(const cv::Mat& bgr, const std::vector& objects) }; static cv::Scalar colors[] = { - cv::Scalar(244, 67, 54), - cv::Scalar(233, 30, 99), - cv::Scalar(156, 39, 176), - cv::Scalar(103, 58, 183), - cv::Scalar( 63, 81, 181), - cv::Scalar( 33, 150, 243), - cv::Scalar( 3, 169, 244), - cv::Scalar( 0, 188, 212), - cv::Scalar( 0, 150, 136), - cv::Scalar( 76, 175, 80), - cv::Scalar(139, 195, 74), - cv::Scalar(205, 220, 57), - cv::Scalar(255, 235, 59), - cv::Scalar(255, 193, 7), - cv::Scalar(255, 152, 0), - cv::Scalar(255, 87, 34), - cv::Scalar(121, 85, 72), + cv::Scalar(244, 67, 54), + cv::Scalar(233, 30, 99), + cv::Scalar(156, 39, 176), + cv::Scalar(103, 58, 183), + cv::Scalar(63, 81, 181), + cv::Scalar(33, 150, 243), + cv::Scalar(3, 169, 244), + cv::Scalar(0, 188, 212), + cv::Scalar(0, 150, 136), + cv::Scalar(76, 175, 80), + cv::Scalar(139, 195, 74), + cv::Scalar(205, 220, 57), + cv::Scalar(255, 235, 59), + cv::Scalar(255, 193, 7), + cv::Scalar(255, 152, 0), + cv::Scalar(255, 87, 34), + cv::Scalar(121, 85, 72), cv::Scalar(158, 158, 158), - cv::Scalar( 96, 125, 139) + cv::Scalar(96, 125, 139) }; cv::Mat image = bgr.clone();