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

Remove use of boost::ref #4

Merged
merged 1 commit into from
May 28, 2016
Merged

Remove use of boost::ref #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions src/simpleShape.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -*- lsst-c++ -*-
/*
* LSST Data Management System
* Copyright 2008-2013 LSST Corporation.
* Copyright 2008-2016 AURA/LSST.
*
* This product includes software developed by the
* LSST Project (http://www.lsst.org/).
Expand Down Expand Up @@ -51,18 +51,18 @@ Span clipSpan(Span const & span, afw::geom::Box2I const & box) {
}

template <typename Function, typename Iterator>
void iterateSpan(Function function, Iterator pixIter, Span const & span) {
void iterateSpan(Function & function, Iterator pixIter, Span const & span) {
for (
Span::Iterator pointIter = span.begin(), pointEnd = span.end();
pointIter != pointEnd;
++pointIter, ++pixIter
) {
boost::unwrap_ref(function)(*pointIter, *pixIter);
function(*pointIter, *pixIter);
}
}

template <typename Function, typename Image, typename Region>
void iterateRegion(Function function, Image const & image, Region const & region) {
void iterateRegion(Function & function, Image const & image, Region const & region) {
afw::geom::Box2I bbox = image.getBBox(afw::image::PARENT);
if (bbox.contains(region.getBBox())) {
// if the box contains the region, there's no need to check each span to make sure it's entirely
Expand Down Expand Up @@ -167,7 +167,7 @@ SimpleShapeResult SimpleShape::computeMoments(
// All the pixel operations take place in the next two lines, when we use the above machinery
// to accumulate the raw moments in a single pass.
RawMomentAccumulator functor(weight);
iterateRegion(boost::ref(functor), image, region);
iterateRegion(functor, image, region);

// Then we convert the raw moments to an ellipse and centroid, and propagate the uncertainty
// through the covariance matrix.
Expand Down