phundrak
/
genetic-images
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

trailing types instead of return types

This commit is contained in:
Phuntsok Drak-pa 2019-04-01 16:55:02 +02:00
parent 8a215f4a74
commit 801e74d752
6 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/genimg/common.hh
View File

@ -7,9 +7,9 @@
#include <string> #include <string>
#include <utility> #include <utility>
[[nodiscard]] std::pair<cv::Mat, cv::Mat> init_image( [[nodiscard]] auto init_image(std::string const&) noexcept
std::string const&) noexcept; -> std::pair<cv::Mat, cv::Mat>;
[[nodiscard]] double euclidian_distance(cv::Mat const&, cv::Mat const&); [[nodiscard]] auto euclidian_distance(cv::Mat const&, cv::Mat const&) -> double;
#endif /* GENETIC_IMAGE_INCLUDE_GENIMG_COMMON_HH_ */ #endif /* GENETIC_IMAGE_INCLUDE_GENIMG_COMMON_HH_ */

5
include/genimg/parseargs.hh
View File

@ -4,8 +4,7 @@
#include <filesystem> #include <filesystem>
#include <tuple> #include <tuple>
[[nodiscard]] std:: [[nodiscard]] auto parse_args(int, char**)
tuple<std::filesystem::path, std::filesystem::path, int, int, bool> -> std::tuple<std::filesystem::path, std::filesystem::path, int, int, bool>;
parse_args(int, char**);
#endif /* GENETIC_IMAGE_INCLUDE_GENIMG_PARSEARGS_HH_ */ #endif /* GENETIC_IMAGE_INCLUDE_GENIMG_PARSEARGS_HH_ */

8
src/common.cc
View File

@ -3,8 +3,8 @@
#include <cmath> #include <cmath>
#include <cstdlib> #include <cstdlib>
[[nodiscard]] std::pair<cv::Mat, cv::Mat> init_image( [[nodiscard]] auto init_image(std::string const& t_input_file) noexcept
std::string const& t_input_file) noexcept -> std::pair<cv::Mat, cv::Mat>
{ {
cv::Mat input_image = cv::imread(t_input_file, cv::IMREAD_COLOR); cv::Mat input_image = cv::imread(t_input_file, cv::IMREAD_COLOR);
if (!input_image.data) { if (!input_image.data) {
@ -19,8 +19,8 @@
return std::make_pair(std::move(input_image), process_image); return std::make_pair(std::move(input_image), process_image);
} }
[[nodiscard]] double euclidian_distance(cv::Mat const& t_img1, [[nodiscard]] auto euclidian_distance(cv::Mat const& t_img1,
cv::Mat const& t_img2) cv::Mat const& t_img2) -> double
{ {
double euclidian = 0.0; double euclidian = 0.0;
for (auto itr1 = t_img1.begin<uchar>(), itr2 = t_img2.begin<uchar>(); for (auto itr1 = t_img1.begin<uchar>(), itr2 = t_img2.begin<uchar>();

30
src/main.cc
View File

@ -17,21 +17,21 @@ int main(int ac, char** av)
auto [input_image, process_image] = init_image(input_file.native()); auto [input_image, process_image] = init_image(input_file.native());
switch (method) { switch (method) {
case 1: { case 1: {
method1(input_image, process_image, iterations); method1(input_image, process_image, iterations);
break; break;
} }
case 2: { case 2: {
method2(input_image, process_image, iterations); method2(input_image, process_image, iterations);
break; break;
} }
case 3: { case 3: {
method3(input_image, process_image, iterations); method3(input_image, process_image, iterations);
break; break;
} }
default: default:
spdlog::error("Requested method {} is not implemented."); spdlog::error("Requested method {} is not implemented.");
std::exit(-1); std::exit(-1);
} }
cv::imwrite(output_file.native(), process_image); cv::imwrite(output_file.native(), process_image);

6
src/methods.cc
View File

@ -31,7 +31,7 @@ void adjustSize(cv::Mat const& t_process_img, cv::Point& t_top_left, int size)
} }
} }
[[nodiscard]] cv::Scalar randomColor() [[nodiscard]] auto randomColor() -> cv::Scalar
{ {
static std::uniform_int_distribution<> dis(0, 255); static std::uniform_int_distribution<> dis(0, 255);
return cv::Scalar(rand() % 255, rand() % 255, rand() % 255); return cv::Scalar(rand() % 255, rand() % 255, rand() % 255);
@ -60,12 +60,12 @@ void threadedGetColor(cv::Mat const& t_reference, ColorSet& t_colors, int t_h)
} }
} }
[[nodiscard]] ColorSet getColorSet(cv::Mat const& t_reference) [[nodiscard]] auto getColorSet(cv::Mat const& t_reference) -> ColorSet
{ {
ColorSet res{}; ColorSet res{};
for (int h = 0; h < t_reference.size().height; h += thread_nbr) { for (int h = 0; h < t_reference.size().height; h += thread_nbr) {
std::vector<std::thread> thread_list{}; std::vector<std::thread> thread_list{};
for (int i = 0; i < thread_nbr; ++i) { for (auto i = 0u; i < thread_nbr; ++i) {
thread_list.push_back(std::thread(methods_private::threadedGetColor, thread_list.push_back(std::thread(methods_private::threadedGetColor,
std::ref(t_reference), std::ref(res), std::ref(t_reference), std::ref(res),
h + i)); h + i));

4
src/parseargs.cc
View File

@ -21,8 +21,8 @@ void processFilenames(po::variables_map const& vm,
} }
} }
[[nodiscard]] std::tuple<path, path, int, int, bool> parse_args(int t_ac, [[nodiscard]] auto parse_args(int t_ac, char** t_av)
char** t_av) -> std::tuple<path, path, int, int, bool>
{ {
po::options_description desc("Allowed options"); po::options_description desc("Allowed options");
desc.add_options()("help,h", "Display this help message")( desc.add_options()("help,h", "Display this help message")(