Forward declare operator<<

cvg · May 16, 2024 · 93c3407 · 93c3407
1 parent e5645d3
commit 93c3407
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 42 deletions.
diff --git a/pixsfm/util/CMakeLists.txt b/pixsfm/util/CMakeLists.txt
@@ -7,7 +7,7 @@ PIXSFM_ADD_SOURCES(
     src/math.h
     src/simple_logger.h
     src/simple_logger.cc
-    src/log_exceptions.h
+    src/log_exceptions.h src/log_exceptions.cc
     src/memory.h
     src/threading.h src/threading.cc
     src/stringprintf.h src/stringprintf.cc

diff --git a/pixsfm/util/src/log_exceptions.cc b/pixsfm/util/src/log_exceptions.cc
@@ -0,0 +1,50 @@
+//
+// Created by dawars on 2024.03.20..
+//
+#include <sstream>
+
+#include <colmap/sensor/models.h>
+#include "log_exceptions.h"
+
+std::ostream &operator<<(std::ostream &os, const colmap::CameraModelId &id) {
+    os << static_cast<int>(id);
+//    switch (id) {
+//        case colmap::CameraModelId::kInvalid:
+//            os << "kInvalid";
+//            break;
+//        case colmap::CameraModelId::kSimplePinhole:
+//            os << "kSimplePinhole";
+//            break;
+//        case colmap::CameraModelId::kPinhole:
+//            os << "kPinhole";
+//            break;
+//        case colmap::CameraModelId::kSimpleRadial:
+//            os << "kSimpleRadial";
+//            break;
+//        case colmap::CameraModelId::kRadial:
+//            os << "kRadial";
+//            break;
+//        case colmap::CameraModelId::kOpenCV:
+//            os << "kOpenCV";
+//            break;
+//        case colmap::CameraModelId::kOpenCVFisheye:
+//            os << "kOpenCVFisheye";
+//            break;
+//        case colmap::CameraModelId::kFullOpenCV:
+//            os << "kFullOpenCV";
+//            break;
+//        case colmap::CameraModelId::kFOV:
+//            os << "kFOV";
+//            break;
+//        case colmap::CameraModelId::kSimpleRadialFisheye:
+//            os << "kSimpleRadialFisheye";
+//            break;
+//        case colmap::CameraModelId::kRadialFisheye:
+//            os << "kRadialFisheye";
+//            break;
+//        case colmap::CameraModelId::kThinPrismFisheye:
+//            os << "kThinPrismFisheye";
+//            break;
+//    }
+    return os;
+}
diff --git a/pixsfm/util/src/log_exceptions.h b/pixsfm/util/src/log_exceptions.h
@@ -70,47 +70,7 @@ inline void __ThrowCheckImplMsg(const char* file, const int line,
   }
 }
 
-std::ostream& operator<<(std::ostream& os, const colmap::CameraModelId& id) {
-    switch (id) {
-        case colmap::CameraModelId::kInvalid:
-            os << "kInvalid";
-            break;
-        case colmap::CameraModelId::kSimplePinhole:
-            os << "kSimplePinhole";
-            break;
-        case colmap::CameraModelId::kPinhole:
-            os << "kPinhole";
-            break;
-        case colmap::CameraModelId::kSimpleRadial:
-            os << "kSimpleRadial";
-            break;
-        case colmap::CameraModelId::kRadial:
-            os << "kRadial";
-            break;
-        case colmap::CameraModelId::kOpenCV:
-            os << "kOpenCV";
-            break;
-        case colmap::CameraModelId::kOpenCVFisheye:
-            os << "kOpenCVFisheye";
-            break;
-        case colmap::CameraModelId::kFullOpenCV:
-            os << "kFullOpenCV";
-            break;
-        case colmap::CameraModelId::kFOV:
-            os << "kFOV";
-            break;
-        case colmap::CameraModelId::kSimpleRadialFisheye:
-            os << "kSimpleRadialFisheye";
-            break;
-        case colmap::CameraModelId::kRadialFisheye:
-            os << "kRadialFisheye";
-            break;
-        case colmap::CameraModelId::kThinPrismFisheye:
-            os << "kThinPrismFisheye";
-            break;
-    }
-    return os;
-}
+std::ostream& operator<<(std::ostream& os, const colmap::CameraModelId& id);
 
 
 template <typename T1, typename T2>