Fix name extraction from path in multicalib

cdcseacave · web-flow · commit 4095ef10db64 · 2017-10-23T16:04:01.000+03:00
diff --git a/modules/ccalib/src/multicalib.cpp b/modules/ccalib/src/multicalib.cpp
@@ -141,7 +141,7 @@ void MultiCameraCalibration::loadImages()
     for (int i = 1; i < (int)file_list.size(); ++i)
     {
         int cameraVertex, timestamp;
-        std::string filename = file_list[i].substr(0, file_list[i].find('.'));
+        std::string filename = file_list[i].substr(0, file_list[i].rfind('.'));
         size_t spritPosition1 = filename.rfind('/');
         size_t spritPosition2 = filename.rfind('\\');
         if (spritPosition1!=std::string::npos)
@@ -777,4 +777,4 @@ void MultiCameraCalibration::writeParameters(const std::string& filename)
         fs << photoTimestamp << _vertexList[photoIdx].pose;
     }
 }
-}} // namespace multicalib, cv
+}} // namespace multicalib, cv

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ void MultiCameraCalibration::loadImages()`
`141`	`141`	`for (int i = 1; i < (int)file_list.size(); ++i)`
`142`	`142`	`{`
`143`	`143`	`int cameraVertex, timestamp;`
`144`		`- std::string filename = file_list[i].substr(0, file_list[i].find('.'));`
	`144`	`+ std::string filename = file_list[i].substr(0, file_list[i].rfind('.'));`
`145`	`145`	`size_t spritPosition1 = filename.rfind('/');`
`146`	`146`	`size_t spritPosition2 = filename.rfind('\\');`
`147`	`147`	`if (spritPosition1!=std::string::npos)`
`@@ -777,4 +777,4 @@ void MultiCameraCalibration::writeParameters(const std::string& filename)`
`777`	`777`	`fs << photoTimestamp << _vertexList[photoIdx].pose;`
`778`	`778`	`}`
`779`	`779`	`}`
`780`		`-}} // namespace multicalib, cv`
	`780`	`+}} // namespace multicalib, cv`