Skip to content

Commit

Permalink
Fix CI issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@meshtag
meshtag committed Aug 15, 2021
1 parent fe1621e commit aa7c069
Show file tree
Hide file tree
Showing 15 changed files with 1,000 additions and 238 deletions.
2 changes: 1 addition & 1 deletion example/convolve2d.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ int main()

std::vector<float> v(9, 1.0f / 9.0f);
detail::kernel_2d<float> kernel(v.begin(), v.size(), 1, 1);
detail::convolve_2d(view(img), kernel, view(img_out1));
convolve_2d<gray8_pixel_t>(view(img), kernel, view(img_out1));

//write_view("out-convolve2d.png", view(img_out), png_tag{});
write_view("out-convolve2d.png", view(img_out1), jpeg_tag{});
Expand Down
4 changes: 2 additions & 2 deletions example/harris.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,9 @@ int main(int argc, char* argv[])
auto x_gradient = gil::view(x_gradient_image);
auto y_gradient = gil::view(y_gradient_image);
auto scharr_x = gil::generate_dx_scharr();
gil::detail::convolve_2d(smoothed, scharr_x, x_gradient);
gil::convolve_2d<gil::gray8_pixel_t>(smoothed, scharr_x, x_gradient);
auto scharr_y = gil::generate_dy_scharr();
gil::detail::convolve_2d(smoothed, scharr_y, y_gradient);
gil::convolve_2d<gil::gray8_pixel_t>(smoothed, scharr_y, y_gradient);

gil::gray32f_image_t m11(x_gradient.dimensions());
gil::gray32f_image_t m12_21(x_gradient.dimensions());
Expand Down
191 changes: 59 additions & 132 deletions example/hessian.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include <boost/gil/image.hpp>
#include <boost/gil/image_view.hpp>
#include <boost/gil/extension/numeric/matrix.hpp>
#include <boost/gil/extension/numeric/arithmetics.hpp>
#include <boost/gil/image_processing/numeric.hpp>
#include <boost/gil/image_processing/hessian.hpp>
#include <boost/gil/extension/io/png.hpp>
Expand All @@ -11,134 +13,38 @@

namespace gil = boost::gil;

// some images might produce artifacts
// when converted to grayscale,
// which was previously observed on
// canny edge detector for test input
// used for this example.
// the algorithm here follows sRGB gamma definition
// taken from here (luminance calculation):
// https://en.wikipedia.org/wiki/Grayscale
gil::gray8_image_t to_grayscale(gil::rgb8_view_t original)
{
gil::gray8_image_t output_image(original.dimensions());
auto output = gil::view(output_image);
constexpr double max_channel_intensity = (std::numeric_limits<std::uint8_t>::max)();
for (long int y = 0; y < original.height(); ++y)
{
for (long int x = 0; x < original.width(); ++x)
{
// scale the values into range [0, 1] and calculate linear intensity
auto& p = original(x, y);
double red_intensity = p.at(std::integral_constant<int, 0>{})
/ max_channel_intensity;
double green_intensity = p.at(std::integral_constant<int, 1>{})
/ max_channel_intensity;
double blue_intensity = p.at(std::integral_constant<int, 2>{})
/ max_channel_intensity;
auto linear_luminosity = 0.2126 * red_intensity
+ 0.7152 * green_intensity
+ 0.0722 * blue_intensity;

// perform gamma adjustment
double gamma_compressed_luminosity = 0;
if (linear_luminosity < 0.0031308)
{
gamma_compressed_luminosity = linear_luminosity * 12.92;
} else
{
gamma_compressed_luminosity = 1.055 * std::pow(linear_luminosity, 1 / 2.4) - 0.055;
}

// since now it is scaled, descale it back
output(x, y) = gamma_compressed_luminosity * max_channel_intensity;
}
}

return output_image;
}

void apply_gaussian_blur(gil::gray8_view_t input_view, gil::gray8_view_t output_view)
{
constexpr static std::ptrdiff_t filter_height = 5ull;
constexpr static std::ptrdiff_t filter_width = 5ull;
constexpr static double filter[filter_height][filter_width] =
{
{ 2, 4, 6, 4, 2 },
{ 4, 9, 12, 9, 4 },
{ 5, 12, 15, 12, 5 },
{ 4, 9, 12, 9, 4 },
{ 2, 4, 5, 4, 2 }
};
constexpr double factor = 1.0 / 159;
constexpr double bias = 0.0;

const auto height = input_view.height();
const auto width = input_view.width();
for (std::ptrdiff_t x = 0; x < width; ++x)
{
for (std::ptrdiff_t y = 0; y < height; ++y)
{
double intensity = 0.0;
for (std::ptrdiff_t filter_y = 0; filter_y < filter_height; ++filter_y)
{
for (std::ptrdiff_t filter_x = 0; filter_x < filter_width; ++filter_x)
{
int image_x = x - filter_width / 2 + filter_x;
int image_y = y - filter_height / 2 + filter_y;
if (image_x >= input_view.width() || image_x < 0 ||
image_y >= input_view.height() || image_y < 0)
{
continue;
}
const auto& pixel = input_view(image_x, image_y);
intensity += pixel.at(std::integral_constant<int, 0>{})
* filter[filter_y][filter_x];
}
}
auto& pixel = output_view(gil::point_t(x, y));
pixel = (std::min)((std::max)(int(factor * intensity + bias), 0), 255);
}

}
}

std::vector<gil::point_t> suppress(
gil::gray32f_view_t harris_response,
gil::matrix harris_response,
double harris_response_threshold)
{
std::vector<gil::point_t> corner_points;
for (gil::gray32f_view_t::coord_t y = 1; y < harris_response.height() - 1; ++y)
{
for (gil::gray32f_view_t::coord_t x = 1; x < harris_response.width() - 1; ++x)
{
auto value = [](gil::gray32f_pixel_t pixel) {
return pixel.at(std::integral_constant<int, 0>{});
};
double values[9] = {
value(harris_response(x - 1, y - 1)),
value(harris_response(x, y - 1)),
value(harris_response(x + 1, y - 1)),
value(harris_response(x - 1, y)),
value(harris_response(x, y)),
value(harris_response(x + 1, y)),
value(harris_response(x - 1, y + 1)),
value(harris_response(x, y + 1)),
value(harris_response(x + 1, y + 1))
gil::elem_t values[9] = {
harris_response(x - 1, y - 1),
harris_response(x, y - 1),
harris_response(x + 1, y - 1),
harris_response(x - 1, y),
harris_response(x, y),
harris_response(x + 1, y),
harris_response(x - 1, y + 1),
harris_response(x, y + 1),
harris_response(x + 1, y + 1),
};

auto maxima = *std::max_element(
values,
values + 9,
[](double lhs, double rhs)
[](gil::elemc_ref_t lhs, gil::elemc_ref_t rhs)
{
return lhs < rhs;
return std::abs(lhs[0]) < std::abs(rhs[0]);
}
);

if (maxima == value(harris_response(x, y))
&& std::count(values, values + 9, maxima) == 1
&& maxima >= harris_response_threshold)
if (maxima[0] == harris_response(x, y)[0]
&& std::abs(maxima[0]) >= harris_response_threshold)
{
corner_points.emplace_back(x, y);
}
Expand All @@ -148,6 +54,13 @@ std::vector<gil::point_t> suppress(
return corner_points;
}

std::pair<float, float> get_min_max_elements(const gil::matrix& m) {
auto min_element = *std::min_element(m.begin(), m.end());
auto max_element = *std::max_element(m.begin(), m.end());

return {min_element, max_element};
}

int main(int argc, char* argv[]) {
if (argc != 5)
{
Expand All @@ -157,39 +70,48 @@ int main(int argc, char* argv[]) {
}

std::size_t window_size = std::stoul(argv[2]);
long hessian_determinant_threshold = std::stol(argv[3]);
double hessian_determinant_threshold = std::stod(argv[3]);

gil::rgb8_image_t input_image;

gil::read_image(argv[1], input_image, gil::png_tag{});

auto input_view = gil::view(input_image);
auto grayscaled = to_grayscale(input_view);
gil::gray8_image_t smoothed_image(grayscaled.dimensions());
auto smoothed = gil::view(smoothed_image);
apply_gaussian_blur(gil::view(grayscaled), smoothed);
gil::gray16s_image_t x_gradient_image(grayscaled.dimensions());
gil::gray16s_image_t y_gradient_image(grayscaled.dimensions());

auto x_gradient = gil::view(x_gradient_image);
auto y_gradient = gil::view(y_gradient_image);
auto scharr_x = gil::generate_dx_scharr();
gil::detail::convolve_2d(smoothed, scharr_x, x_gradient);
auto scharr_y = gil::generate_dy_scharr();
gil::detail::convolve_2d(smoothed, scharr_y, y_gradient);

gil::gray32f_image_t m11(x_gradient.dimensions());
gil::gray32f_image_t m12_21(x_gradient.dimensions());
gil::gray32f_image_t m22(x_gradient.dimensions());
gil::gray8_image_t grayscaled_image(input_image.dimensions());
auto grayscaled = gil::view(grayscaled_image);
gil::copy_and_convert_pixels(input_view, grayscaled);
gil::write_view("grayscale.png", grayscaled, gil::png_tag{});

gil::matrix_storage input_matrix_storage(grayscaled_image.dimensions());
auto input_matrix = gil::view(input_matrix_storage);
gil::value_cast(grayscaled, input_matrix);

gil::matrix_storage grayscaled_matrix_storage(grayscaled.dimensions());
auto grayscaled_matrix = gil::view(grayscaled_matrix_storage);
gil::value_cast(grayscaled, grayscaled_matrix);

gil::matrix_storage smoothed_matrix(grayscaled.dimensions());
auto smoothed = gil::view(smoothed_matrix);
gil::convolve_2d<gil::elem_t>(grayscaled_matrix, gil::generate_gaussian_kernel(3, 1.0), smoothed);
gil::matrix_storage dx_matrix(grayscaled.dimensions());
auto dx = gil::view(dx_matrix);
gil::matrix_storage dy_matrix(grayscaled.dimensions());
auto dy = gil::view(dy_matrix);
gil::convolve_2d<gil::elem_t>(smoothed, gil::generate_dx_scharr(), dx);
gil::convolve_2d<gil::elem_t>(smoothed, gil::generate_dy_sobel(), dy);

gil::matrix_storage m11(dx.dimensions());
gil::matrix_storage m12_21(dx.dimensions());
gil::matrix_storage m22(dy.dimensions());
gil::compute_hessian_entries(
x_gradient,
y_gradient,
dx,
dy,
gil::view(m11),
gil::view(m12_21),
gil::view(m22)
);

gil::gray32f_image_t hessian_response(x_gradient.dimensions());
gil::matrix_storage hessian_response(dx.dimensions());
auto gaussian_kernel = gil::generate_gaussian_kernel(window_size, 0.84089642);
gil::compute_hessian_responses(
gil::view(m11),
Expand All @@ -199,7 +121,12 @@ int main(int argc, char* argv[]) {
gil::view(hessian_response)
);

auto minmax_elements = get_min_max_elements(gil::view(hessian_response));
std::cout << "min Hessian response: " << minmax_elements.first
<< " max Hessian response: " << minmax_elements.second << '\n';

auto corner_points = suppress(gil::view(hessian_response), hessian_determinant_threshold);
// std::vector<gil::point_t> corner_points = {};
for (auto point: corner_points) {
input_view(point) = gil::rgb8_pixel_t(0, 0, 0);
input_view(point).at(std::integral_constant<int, 1>{}) = 255;
Expand Down
47 changes: 47 additions & 0 deletions example/matrix.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
//
// Created by shino on 13.08.21.
//
#include <boost/gil.hpp>
#include <boost/gil/extension/io/png.hpp>
#include <boost/gil/extension/numeric/matrix.hpp>
#include <boost/gil/extension/numeric/arithmetics.hpp>

namespace gil = boost::gil;

#include <iostream>

int main() {
gil::gray8_image_t input_image;

gil::read_image("input.png", input_image, gil::png_tag{});
auto input = gil::view(input_image);


gil::matrix_storage matrix(input.dimensions());
auto view = gil::view(matrix);
gil::value_cast(input, view);

auto dx_kernel = gil::generate_dx_sobel();
auto dy_kernel = gil::generate_dy_sobel();

gil::matrix_storage dx_matrix(input.dimensions());
gil::matrix_storage dy_matrix(input.dimensions());
auto dx = gil::view(dx_matrix);
auto dy = gil::view(dy_matrix);

gil::convolve_2d<gil::elem_t>(view, dx_kernel, dx, gil::boundary_option::extend_constant);
gil::convolve_2d<gil::elem_t>(view, dy_kernel, dy, gil::boundary_option::extend_constant);

gil::gray8_image_t output_image(input.dimensions());
auto output = gil::view(output_image);
auto max_derivative_value = 4.0 * 255.0;
gil::abs_remap_cast(dx, output, 0.0, max_derivative_value);
gil::write_view("dx_output.png", output, gil::png_tag{});
gil::abs_remap_cast(dy, output, 0.0, max_derivative_value);
gil::write_view("dy_output.png", output, gil::png_tag{});

gil::matrix_storage gradient_storage(input.dimensions());
gil::gradient(dx, dy, gil::view(gradient_storage));
gil::remap_cast(gil::view(gradient_storage), output, 0.0, max_derivative_value * std::sqrt(2.0));
gil::write_view("gradient.png", output, gil::png_tag{});
}
8 changes: 4 additions & 4 deletions example/sobel_scharr.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ int main(int argc, char* argv[])
auto dy = gil::view(dy_image);
if (filter_type == "sobel")
{
gil::detail::convolve_2d(input, gil::generate_dx_sobel(1), dx);
gil::detail::convolve_2d(input, gil::generate_dy_sobel(1), dy);
gil::convolve_2d<gil::gray8_pixel_t>(input, gil::generate_dx_sobel(1), dx);
gil::convolve_2d<gil::gray8_pixel_t>(input, gil::generate_dy_sobel(1), dy);
}
else if (filter_type == "scharr")
{
gil::detail::convolve_2d(input, gil::generate_dx_scharr(1), dx);
gil::detail::convolve_2d(input, gil::generate_dy_scharr(1), dy);
gil::convolve_2d<gil::gray8_pixel_t>(input, gil::generate_dx_scharr(1), dx);
gil::convolve_2d<gil::gray8_pixel_t>(input, gil::generate_dy_scharr(1), dy);
}
else
{
Expand Down
Loading

0 comments on commit aa7c069

Please sign in to comment.