Skip to content

Commit

Permalink
apply code-format changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@nihui @github-actions
nihui authored and github-actions[bot] committed Jan 2, 2025
1 parent 36f10b2 commit 44787a8
Show file tree
Hide file tree
Showing 4 changed files with 109 additions and 109 deletions.
72 changes: 36 additions & 36 deletions examples/yolov8.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -408,25 +408,25 @@ static void draw_objects_coco(const cv::Mat& bgr, const std::vector<Object>& 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();
Expand Down Expand Up @@ -547,25 +547,25 @@ static void draw_objects_oiv(const cv::Mat& bgr, const std::vector<Object>& 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();
Expand Down
32 changes: 16 additions & 16 deletions examples/yolov8_obb.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,23 +424,23 @@ static void draw_objects(const cv::Mat& bgr, const std::vector<Object>& 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();
Expand Down
68 changes: 34 additions & 34 deletions examples/yolov8_pose.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,25 +430,25 @@ static void draw_objects(const cv::Mat& bgr, const std::vector<Object>& 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();
Expand All @@ -467,22 +467,22 @@ static void draw_objects(const cv::Mat& bgr, const std::vector<Object>& 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++)
Expand Down
46 changes: 23 additions & 23 deletions examples/yolov8_seg.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,12 +437,12 @@ static int detect_yolov8_seg(const cv::Mat& bgr, std::vector<Object>& 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;
Expand Down Expand Up @@ -524,25 +524,25 @@ static void draw_objects(const cv::Mat& bgr, const std::vector<Object>& 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();
Expand Down

0 comments on commit 44787a8

Please sign in to comment.