Rename writePfmFile to writePFMfile

microsoft · Feb 1, 2021 · 5ce5c9b · 5ce5c9b
1 parent bd2dcc4
commit 5ce5c9b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/AirLib/include/common/common_utils/Utils.hpp b/AirLib/include/common/common_utils/Utils.hpp
@@ -678,7 +678,7 @@ class Utils {
         return uval[0] == 1;
     }
 
-    static void writePfmFile(const float * const image_data, int width, int height, std::string path, float scalef=1)
+    static void writePFMfile(const float * const image_data, int width, int height, const std::string& path, float scalef=1)
     {
         std::fstream file(path.c_str(), std::ios::out | std::ios::binary);
 

diff --git a/Examples/DataCollection/DataCollectorSGM.h b/Examples/DataCollection/DataCollectorSGM.h
@@ -234,13 +234,13 @@ class DataCollectorSGM {
             fclose(img_r);
 
             //GT disparity and depth
-            Utils::writePfmFile(gt_depth_data.data(), w, h, FileSystem::combine(result->storage_dir_, depth_gt_file_name));
+            Utils::writePFMfile(gt_depth_data.data(), w, h, FileSystem::combine(result->storage_dir_, depth_gt_file_name));
             denormalizeDisparity(gt_disparity_data, w);
-            Utils::writePfmFile(gt_disparity_data.data(), w, h, FileSystem::combine(result->storage_dir_, disparity_gt_file_name));
+            Utils::writePFMfile(gt_disparity_data.data(), w, h, FileSystem::combine(result->storage_dir_, disparity_gt_file_name));
 
             //SGM depth disparity and confidence
-            Utils::writePfmFile(sgm_depth_data.data(), w, h, FileSystem::combine(result->storage_dir_, depth_sgm_file_name));
-            Utils::writePfmFile(sgm_disparity_data.data(), w, h, FileSystem::combine(result->storage_dir_, disparity_sgm_file_name));
+            Utils::writePFMfile(sgm_depth_data.data(), w, h, FileSystem::combine(result->storage_dir_, depth_sgm_file_name));
+            Utils::writePFMfile(sgm_disparity_data.data(), w, h, FileSystem::combine(result->storage_dir_, disparity_sgm_file_name));
             FILE *sgm_c = fopen(FileSystem::combine(result->storage_dir_, confidence_sgm_file_name).c_str(), "wb");
             svpng(sgm_c,w,h,reinterpret_cast<const unsigned char*>(sgm_confidence_data.data()),0,1);
             fclose(sgm_c);

diff --git a/Examples/DataCollection/StereoImageGenerator.hpp b/Examples/DataCollection/StereoImageGenerator.hpp
@@ -174,7 +174,7 @@ class StereoImageGenerator {
 
             denormalizeDisparity(disparity_data, result.response.at(2).width);
 
-            Utils::writePfmFile(disparity_data.data(), result.response.at(2).width, result.response.at(2).height,
+            Utils::writePFMfile(disparity_data.data(), result.response.at(2).width, result.response.at(2).height,
                 FileSystem::combine(result.storage_dir_, disparity_file_name));
 
             (* result.file_list) << left_file_name << "," << right_file_name << "," << disparity_file_name << std::endl;

diff --git a/HelloCar/main.cpp b/HelloCar/main.cpp
@@ -50,7 +50,7 @@ int main()
                 if (path != "") {
                     std::string file_path = FileSystem::combine(path, std::to_string(image_info.time_stamp));
                     if (image_info.pixels_as_float) {
-                        Utils::writePfmFile(image_info.image_data_float.data(), image_info.width, image_info.height,
+                        Utils::writePFMfile(image_info.image_data_float.data(), image_info.width, image_info.height,
                             file_path + ".pfm");
                     }
                     else {

diff --git a/HelloDrone/main.cpp b/HelloDrone/main.cpp
@@ -44,7 +44,7 @@ int main()
                 if (path != "") {
                     std::string file_path = FileSystem::combine(path, std::to_string(image_info.time_stamp));
                     if (image_info.pixels_as_float) {
-                        Utils::writePfmFile(image_info.image_data_float.data(), image_info.width, image_info.height,
+                        Utils::writePFMfile(image_info.image_data_float.data(), image_info.width, image_info.height,
                             file_path + ".pfm");
                     }
                     else {

diff --git a/Unreal/Plugins/AirSim/Source/Recording/RecordingFile.cpp b/Unreal/Plugins/AirSim/Source/Recording/RecordingFile.cpp
@@ -41,7 +41,7 @@ void RecordingFile::appendRecord(const std::vector<msr::airlib::ImageCaptureBase
         //write image file
         try {
             if (extension == ".pfm") {
-                common_utils::Utils::writePfmFile(response.image_data_float.data(), response.width, response.height,
+                common_utils::Utils::writePFMfile(response.image_data_float.data(), response.width, response.height,
                     image_full_file_path);
             }
             else if (extension == ".ppm") {