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.

Sign up for GitHub

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

Jump to bottom

DM-15394: Update boost::GIL usage for boost v1.68 #379

Merged
merged 2 commits into from
Aug 24, 2018
Merged

DM-15394: Update boost::GIL usage for boost v1.68 #379

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b88fdd5
Use BOOST_FORCEINLINE rather than GIL_FORCEINLINE
timj Aug 10, 2018
1459dc4
Use new versions of GIL TYPEDEF macros
timj Aug 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions include/lsst/afw/image/lsstGil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,18 +116,18 @@ memory_based_2d_locator<T>& operator-=(memory_based_2d_locator<T>& loc, std::pai
typedef uint64_t bits64;
typedef int64_t bits64s;

GIL_DEFINE_BASE_TYPEDEFS(64, gray)
GIL_DEFINE_ALL_TYPEDEFS_INTERNAL(64, dev2n, devicen_t<2>, devicen_layout_t<2>)
GIL_DEFINE_BASE_TYPEDEFS(64s, gray)
GIL_DEFINE_ALL_TYPEDEFS_INTERNAL(64s, dev2n, devicen_t<2>, devicen_layout_t<2>)
GIL_DEFINE_BASE_TYPEDEFS(64, bits64, gray)
GIL_DEFINE_ALL_TYPEDEFS_INTERNAL(64, bits64, dev2n, devicen_t<2>, devicen_layout_t<2>)
GIL_DEFINE_BASE_TYPEDEFS(64s, bits64s, gray)
GIL_DEFINE_ALL_TYPEDEFS_INTERNAL(64s, bits64s, dev2n, devicen_t<2>, devicen_layout_t<2>)

/*
* Define a type that's a pure float, without scaling into [0, 1]
*/
typedef float bits32f_noscale;

GIL_DEFINE_BASE_TYPEDEFS(32f_noscale, gray)
GIL_DEFINE_ALL_TYPEDEFS_INTERNAL(32f_noscale, dev2n, devicen_t<2>, devicen_layout_t<2>)
GIL_DEFINE_BASE_TYPEDEFS(32f_noscale, bits32f_noscale, gray)
GIL_DEFINE_ALL_TYPEDEFS_INTERNAL(32f_noscale, bits32f_noscale, dev2n, devicen_t<2>, devicen_layout_t<2>)

template <>
struct channel_multiplier<bits32f_noscale>
Expand All @@ -140,8 +140,8 @@ struct channel_multiplier<bits32f_noscale>
*/
typedef double bits64f_noscale;

GIL_DEFINE_BASE_TYPEDEFS(64f_noscale, gray)
GIL_DEFINE_ALL_TYPEDEFS_INTERNAL(64f_noscale, dev2n, devicen_t<2>, devicen_layout_t<2>)
GIL_DEFINE_BASE_TYPEDEFS(64f_noscale, bits64f_noscale, gray)
GIL_DEFINE_ALL_TYPEDEFS_INTERNAL(64f_noscale, bits64f_noscale, dev2n, devicen_t<2>, devicen_layout_t<2>)

//
// Conversions that don't scale
Expand Down Expand Up @@ -384,7 +384,7 @@ namespace gil {

/// transform_pixels with three sources
template <typename View1, typename View2, typename View3, typename ViewDest, typename F>
GIL_FORCEINLINE F transform_pixels(const View1& src1, const View2& src2, const View3& src3,
BOOST_FORCEINLINE F transform_pixels(const View1& src1, const View2& src2, const View3& src3,
const ViewDest& dst, F fun) {
for (std::ptrdiff_t y = 0; y < dst.height(); ++y) {
typename View1::x_iterator srcIt1 = src1.row_begin(y);
Expand All @@ -398,7 +398,7 @@ GIL_FORCEINLINE F transform_pixels(const View1& src1, const View2& src2, const V

/// transform_pixels with four sources
template <typename View1, typename View2, typename View3, typename View4, typename ViewDest, typename F>
GIL_FORCEINLINE F transform_pixels(const View1& src1, const View2& src2, const View3& src3, const View4& src4,
BOOST_FORCEINLINE F transform_pixels(const View1& src1, const View2& src2, const View3& src3, const View4& src4,
const ViewDest& dst, F fun) {
for (std::ptrdiff_t y = 0; y < dst.height(); ++y) {
typename View1::x_iterator srcIt1 = src1.row_begin(y);
Expand Down