Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Added missing include guard to line rasterizer #687

Merged
merged 2 commits into from
Jun 12, 2022
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
5 changes: 3 additions & 2 deletions include/boost/gil/extension/image_processing/diffusion.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
// http://www.boost.org/LICENSE_1_0.txt)
//

#ifndef BOOST_GIL_IMAGE_PROCESSING_DIFFUSION_HPP
#define BOOST_GIL_IMAGE_PROCESSING_DIFFUSION_HPP
#ifndef BOOST_GIL_EXTENSION_IMAGE_PROCESSING_DIFFUSION_HPP
#define BOOST_GIL_EXTENSION_IMAGE_PROCESSING_DIFFUSION_HPP

#include <boost/gil/detail/math.hpp>
#include <boost/gil/algorithm.hpp>
Expand All @@ -19,6 +19,7 @@
#include <boost/gil/pixel.hpp>
#include <boost/gil/point.hpp>
#include <boost/gil/typedefs.hpp>

#include <functional>
#include <numeric>
#include <vector>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
#ifndef BOOST_GIL_IMAGE_PROCESSING_HOUGH_PARAMETER_HPP
#define BOOST_GIL_IMAGE_PROCESSING_HOUGH_PARAMETER_HPP
#ifndef BOOST_GIL_EXTENSION_IMAGE_PROCESSING_HOUGH_PARAMETER_HPP
#define BOOST_GIL_EXTENSION_IMAGE_PROCESSING_HOUGH_PARAMETER_HPP

#include "boost/gil/point.hpp"

#include <cmath>
#include <cstddef>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
#ifndef BOOST_GIL_IMAGE_PROCESSING_HOUGH_TRANSFORM_HPP
#define BOOST_GIL_IMAGE_PROCESSING_HOUGH_TRANSFORM_HPP
#ifndef BOOST_GIL_EXTENSION_IMAGE_PROCESSING_HOUGH_TRANSFORM_HPP
#define BOOST_GIL_EXTENSION_IMAGE_PROCESSING_HOUGH_TRANSFORM_HPP

#include <algorithm>
#include <boost/gil/extension/image_processing/hough_parameter.hpp>
#include <boost/gil/extension/rasterization/circle.hpp>

#include <algorithm>
#include <cmath>
#include <cstddef>
#include <iterator>
Expand Down
9 changes: 6 additions & 3 deletions include/boost/gil/extension/rasterization/circle.hpp
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
// Boost.GIL (Generic Image Library) - tests
//
// Copyright 2020 Olzhas Zhumabek <anonymous.from.applecity@gmail.com>
//
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
#ifndef BOOST_GIL_RASTERIZATION_CIRCLE_HPP
#define BOOST_GIL_RASTERIZATION_CIRCLE_HPP
#ifndef BOOST_GIL_EXTENSION_RASTERIZATION_CIRCLE_HPP
#define BOOST_GIL_EXTENSION_RASTERIZATION_CIRCLE_HPP

#include <boost/gil/detail/math.hpp>
#include <boost/gil/point.hpp>

#include <cmath>
#include <cstddef>

namespace boost { namespace gil {

/// \defgroup CircleRasterization
/// \ingroup Rasterization
/// \brief Circle rasterization algorithms
Expand Down Expand Up @@ -122,5 +123,7 @@ struct midpoint_circle_rasterizer
}
}
};

}} // namespace boost::gil

#endif
8 changes: 5 additions & 3 deletions include/boost/gil/extension/rasterization/ellipse.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
#ifndef BOOST_GIL_RASTERIZATION_ELLIPSE_HPP
#define BOOST_GIL_RASTERIZATION_ELLIPSE_HPP
#ifndef BOOST_GIL_EXTENSION_RASTERIZATION_ELLIPSE_HPP
#define BOOST_GIL_EXTENSION_RASTERIZATION_ELLIPSE_HPP

#include <array>
#include <vector>
Expand Down Expand Up @@ -187,6 +187,8 @@ struct midpoint_elliptical_rasterizer
obtain_trajectory(semi_axes);
draw_curve(view, colour, center, trajectory_points);
}
}; // midpoint elliptical rasterizer
};

}} // namespace boost::gil

#endif
12 changes: 7 additions & 5 deletions include/boost/gil/extension/rasterization/line.hpp
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
// Boost.GIL (Generic Image Library) - tests
//
// Copyright 2020 Olzhas Zhumabek <anonymous.from.applecity@gmail.com>
//
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
#ifndef BOOST_GIL_EXTENSION_RASTERIZATION_LINE_HPP
#define BOOST_GIL_EXTENSION_RASTERIZATION_LINE_HPP

#include <boost/gil/point.hpp>

#include <cmath>
#include <cstddef>

namespace boost
{
namespace gil
{
namespace boost { namespace gil {

/// \defgroup Rasterization
/// \brief A set of functions to rasterize shapes
///
Expand Down Expand Up @@ -95,3 +95,5 @@ struct bresenham_line_rasterizer
};

}} // namespace boost::gil

#endif