latest version. no datatypes

Author: Wumpf

CMakeLists.txt

@@ -9,7 +9,7 @@ if(NOT DEFINED CMAKE_CXX_STANDARD)
 endif()
 
 include(FetchContent)
-FetchContent_Declare(rerun_sdk URL https://build.rerun.io/commit/d5153cb/rerun_cpp_sdk.zip) # TODO: 2023-11-24. Update to latest commit.
+FetchContent_Declare(rerun_sdk URL https://build.rerun.io/commit/746dbf3/rerun_cpp_sdk.zip) # TODO: 2023-11-28. Update to latest commit.
 FetchContent_MakeAvailable(rerun_sdk)
 
 find_package(Eigen3 REQUIRED)

src/collection_adapters.hpp

@@ -15,7 +15,7 @@ struct rerun::CollectionAdapter<rerun::Position3D, std::vector<Eigen::Vector3f>>
         return Collection<rerun::Position3D>::borrow(container.data(), container.size());
     }
 
-    // Do a full copy for temporaries (otherwise the data will be deleted when the temporary is destroyed).
+    // Do a full copy for temporaries (otherwise the data might be deleted when the temporary is destroyed).
     Collection<rerun::Position3D> operator()(std::vector<Eigen::Vector3f>&& container) {
         std::vector<rerun::Position3D> positions(container.size());
         memcpy(positions.data(), container.data(), container.size() * sizeof(Eigen::Vector3f));
@@ -42,7 +42,7 @@ struct rerun::CollectionAdapter<rerun::Position3D, Eigen::Matrix3Xf> {
         );
     }
 
-    // Do a full copy for temporaries (otherwise the data will be deleted when the temporary is destroyed).
+    // Do a full copy for temporaries (otherwise the data might be deleted when the temporary is destroyed).
     Collection<rerun::Position3D> operator()(Eigen::Matrix3Xf&& matrix) {
         std::vector<rerun::Position3D> positions(matrix.cols());
         memcpy(positions.data(), matrix.data(), matrix.size() * sizeof(rerun::Position3D));
@@ -62,7 +62,7 @@ struct rerun::CollectionAdapter<uint8_t, cv::Mat> {
         return Collection<uint8_t>::borrow(img.data, img.total() * img.channels());
     }
 
-    // Do a full copy for temporaries (otherwise the data will be deleted when the temporary is destroyed).
+    // Do a full copy for temporaries (otherwise the data might be deleted when the temporary is destroyed).
     Collection<uint8_t> operator()(cv::Mat&& img) {
         assert(
             "OpenCV matrix was expected have bit depth CV_U8" && CV_MAT_DEPTH(img.type()) == CV_8U
@@ -75,11 +75,10 @@ struct rerun::CollectionAdapter<uint8_t, cv::Mat> {
 };
 
 // Adapter for extracting tensor dimensions from an OpenCV matrix.
-// TODO(https://github.com/rerun-io/rerun/pull/4331): remove `datatypes::`
 template <>
-struct rerun::CollectionAdapter<rerun::datatypes::TensorDimension, cv::Mat> {
+struct rerun::CollectionAdapter<rerun::TensorDimension, cv::Mat> {
     /// Only overload the const& operator since there is no way of borrowing the dimensions anyways.
-    Collection<rerun::datatypes::TensorDimension> operator()(const cv::Mat& img) {
+    Collection<rerun::TensorDimension> operator()(const cv::Mat& img) {
         return {
             static_cast<size_t>(img.rows),
             static_cast<size_t>(img.cols),

src/main.cpp

@@ -65,9 +65,8 @@ int main() {
     }
 
     // Log image to Rerun
-    // TODO(https://github.com/rerun-io/rerun/pull/4331): remove `datatypes::`
     cv::cvtColor(img, img, cv::COLOR_BGR2RGB); // Rerun expects RGB format
-    rec.log("image", rerun::Image(img, rerun::datatypes::TensorBuffer::u8(img)));
+    rec.log("image", rerun::Image(img, rerun::TensorBuffer::u8(img)));
 
     return 0;
 }