diff --git a/.gitignore b/.gitignore index 63123fb..1add2e3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .DS_store +build diff --git a/graph/output.jpg b/graph/output.jpg deleted file mode 100644 index bad0334..0000000 Binary files a/graph/output.jpg and /dev/null differ diff --git a/graph/src/segment-image.h b/graph/src/segment-image.h index 5e32a80..588cd26 100644 --- a/graph/src/segment-image.h +++ b/graph/src/segment-image.h @@ -5,6 +5,7 @@ #include #define square(x) ((x)*(x)) +#define COLORED_OUTPUT // random color cv::Vec3b random_rgb(){ @@ -92,9 +93,10 @@ cv::Mat segment_image(cv::Mat image, float sigma, float c, int min_size) { } } - cv::Mat output(image.size(), CV_16UC1); +#ifdef COLORED_OUTPUT + cv::Mat output(image.size(), CV_8UC3); - /*// pick random colors for each component + // pick random colors for each component std::vector colors; colors.resize(image.total()); for (int i = 0; i < image.total(); i++) @@ -105,8 +107,9 @@ cv::Mat segment_image(cv::Mat image, float sigma, float c, int min_size) { int comp = find(clusters, y * image.cols + x); output.at(y, x) = colors[comp]; } - }*/ - + } +#else + cv::Mat output(image.size(), CV_16UC1); std::map cluster_ids; uint16_t max_id = 1; @@ -118,6 +121,7 @@ cv::Mat segment_image(cv::Mat image, float sigma, float c, int min_size) { output.at(y, x) = cluster_ids[comp]; } } +#endif return output; }