Skip to content

Change template names to avoid conflicts with common windows.h macros #1121

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

Open
kielnino wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Change template names to avoid conflicts with common windows.h macros #1121

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions opensfm/src/geometry/camera_instances.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,38 +195,38 @@ using SphericalCamera = ProjectGeneric<SphericalProjection, Identity, Identity>;
/* This is where the pseudo-strategy pattern takes place. If you want to add
* your own new camera model, just add a new enum value, the corresponding
* case below and the implementation (see above). */
template <class FUNC, class... IN>
void Dispatch(const ProjectionType& type, IN&&... args) {
template <class FUNC, class... FUNC_IN>
void Dispatch(const ProjectionType& type, FUNC_IN&&... args) {
switch (type) {
case ProjectionType::PERSPECTIVE:
FUNC::template Apply<PerspectiveCamera>(std::forward<IN>(args)...);
FUNC::template Apply<PerspectiveCamera>(std::forward<FUNC_IN>(args)...);
break;
case ProjectionType::BROWN:
FUNC::template Apply<BrownCamera>(std::forward<IN>(args)...);
FUNC::template Apply<BrownCamera>(std::forward<FUNC_IN>(args)...);
break;
case ProjectionType::FISHEYE:
FUNC::template Apply<FisheyeCamera>(std::forward<IN>(args)...);
FUNC::template Apply<FisheyeCamera>(std::forward<FUNC_IN>(args)...);
break;
case ProjectionType::FISHEYE_OPENCV:
FUNC::template Apply<FisheyeOpencvCamera>(std::forward<IN>(args)...);
FUNC::template Apply<FisheyeOpencvCamera>(std::forward<FUNC_IN>(args)...);
break;
case ProjectionType::FISHEYE62:
FUNC::template Apply<Fisheye62Camera>(std::forward<IN>(args)...);
FUNC::template Apply<Fisheye62Camera>(std::forward<FUNC_IN>(args)...);
break;
case ProjectionType::FISHEYE624:
FUNC::template Apply<Fisheye624Camera>(std::forward<IN>(args)...);
FUNC::template Apply<Fisheye624Camera>(std::forward<FUNC_IN>(args)...);
break;
case ProjectionType::RADIAL:
FUNC::template Apply<RadialCamera>(std::forward<IN>(args)...);
FUNC::template Apply<RadialCamera>(std::forward<FUNC_IN>(args)...);
break;
case ProjectionType::SIMPLE_RADIAL:
FUNC::template Apply<SimpleRadialCamera>(std::forward<IN>(args)...);
FUNC::template Apply<SimpleRadialCamera>(std::forward<FUNC_IN>(args)...);
break;
case ProjectionType::DUAL:
FUNC::template Apply<DualCamera>(std::forward<IN>(args)...);
FUNC::template Apply<DualCamera>(std::forward<FUNC_IN>(args)...);
break;
case ProjectionType::SPHERICAL:
FUNC::template Apply<SphericalCamera>(std::forward<IN>(args)...);
FUNC::template Apply<SphericalCamera>(std::forward<FUNC_IN>(args)...);
break;
case ProjectionType::NONE:
default:
Expand Down
8 changes: 4 additions & 4 deletions opensfm/src/geometry/functions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ inline T SquaredNorm(T* point) {
return point[0] * point[0] + point[1] * point[1];
}

template <int IN, int P, int OUT>
template <int FUNC_IN, int FUNC_P, int FUNC_OUT>
struct Functor {
constexpr static int InSize = IN;
constexpr static int ParamSize = P;
constexpr static int OutSize = OUT;
constexpr static int InSize = FUNC_IN;
constexpr static int ParamSize = FUNC_P;
constexpr static int OutSize = FUNC_OUT;
template <bool C>
static constexpr int Stride() {
return C * ParamSize + InSize;
Expand Down
Loading