Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 25 additions & 10 deletions include/boost/gil/extension/numeric/kernel.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -328,17 +328,32 @@ class kernel_2d_fixed :
template <typename T, std::size_t Size>
constexpr std::size_t kernel_2d_fixed<T, Size>::static_size;

} //namespace detail
template <typename Kernel>
inline Kernel reverse_kernel_2d(Kernel const& kernel)
{
Kernel result(kernel);
result.center_x() = kernel.lower_size();
result.center_y() = kernel.right_size();
std::reverse(result.begin(), result.end());
return result;
}

/// \brief reverse a kernel
//template <typename Kernel>
//inline Kernel reverse_kernel(Kernel const& kernel)
//{
// Kernel result(kernel);
// result.center() = kernel.right_size();
// std::reverse(result.begin(), result.end());
// return result;
//}

/// \brief reverse a kernel_2d
template<typename T, typename Allocator>
inline kernel_2d<T, Allocator> reverse_kernel(kernel_2d<T, Allocator> const& kernel)
{
return reverse_kernel_2d(kernel);
}

/// \brief reverse a kernel_2d
template<typename T, std::size_t Size>
inline kernel_2d_fixed<T, Size> reverse_kernel(kernel_2d_fixed<T, Size> const& kernel)
{
return reverse_kernel_2d(kernel);
}

} //namespace detail

}} // namespace boost::gil

Expand Down
26 changes: 26 additions & 0 deletions test/extension/numeric/kernel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,31 @@ void test_kernel_1d_reverse_kernel()
BOOST_TEST_EQ(k.size(), d.size());
}

void test_kernel_2d_reverse_kernel()
{
std::vector<int> data = {1, 2, 3, 4, 5, 6, 7, 8, 9};
gil::detail::kernel_2d<int> d(data.begin(), data.size(), 2, 0);

BOOST_TEST_EQ(d.center_x(), 0);
BOOST_TEST_EQ(d.center_y(), 2);

auto k = gil::detail::reverse_kernel(d);

BOOST_TEST_EQ(k.center_x(), d.lower_size());
BOOST_TEST_EQ(k.center_x(), 0);

BOOST_TEST_EQ(k.center_y(), d.right_size());
BOOST_TEST_EQ(k.center_y(), 2);

// std::vector interface
BOOST_TEST_EQ(k.size(), d.size());

for (size_t i = 0; i < k.size() * k.size(); i++)
{
BOOST_TEST_EQ(d[i], k[(k.size()*k.size()) - 1 - i]);
}
}

int main()
{
test_kernel_1d_default_constructor();
Expand All @@ -169,6 +194,7 @@ int main()
test_kernel_1d_assignment_operator();
test_kernel_2d_assignment_operator();
test_kernel_1d_reverse_kernel();
test_kernel_2d_reverse_kernel();

return ::boost::report_errors();
}