Skip to content

Commit

Permalink
align NOMINMAX
Browse files Browse the repository at this point in the history
  • Loading branch information
hobu committed Apr 4, 2019
1 parent df0d1bb commit fa8429f
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions filters/Align3DFilter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@ PointViewSet Align3dFilter::run(PointViewPtr view)

// Get overlapping bounds.
align3d::AlignBounds bounds;
bounds.xmin = std::max(referenceDSM.easting, targetDSM.easting);
bounds.ymin = std::max(referenceDSM.northing, targetDSM.northing);
bounds.xmin = (std::max)(referenceDSM.easting, targetDSM.easting);
bounds.ymin = (std::max)(referenceDSM.northing, targetDSM.northing);
bounds.xmax =
std::min(referenceDSM.easting + (referenceDSM.width * referenceDSM.gsd),
(std::min)(referenceDSM.easting + (referenceDSM.width * referenceDSM.gsd),
targetDSM.easting + (targetDSM.width * targetDSM.gsd));
bounds.ymax = std::min(
bounds.ymax = (std::min)(
referenceDSM.northing + (referenceDSM.height * referenceDSM.gsd),
targetDSM.northing + (targetDSM.height * targetDSM.gsd));
bounds.width = bounds.xmax - bounds.xmin;
Expand Down

0 comments on commit fa8429f

Please sign in to comment.