Skip to content
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.

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

Fix misc bugs #520

Merged
merged 3 commits into from
Oct 30, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/aliceVision/depthMap/SemiGlobalMatchingVolume.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ SemiGlobalMatchingVolume::SemiGlobalMatchingVolume(float _volGpuMB, int _volDimX
SemiGlobalMatchingVolume::~SemiGlobalMatchingVolume()
{
delete _volume;
delete _volumeSecondBest;
delete _volumeStepZ;
delete _volumeBestZ;
}
Expand Down
2 changes: 1 addition & 1 deletion src/aliceVision/matching/io.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ class MatchExporter
for(IndexT key: keys)
{
PairwiseMatches::const_iterator match = matchBegin;
while(match->first.first == key && match != matchEnd)
while(match != matchEnd && match->first.first == key)
++match;
const std::string filepath = (fs::path(m_directory) / (std::to_string(key) + "." + m_filename)).string();
ALICEVISION_LOG_DEBUG("Export Matches in: " << filepath);
Expand Down
3 changes: 2 additions & 1 deletion src/aliceVision/mesh/Mesh.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2467,7 +2467,8 @@ bool Mesh::loadFromObjAscii(int& nmtls, StaticVector<int>& trisMtlIds, StaticVec
{
int n1 = mvsUtils::findNSubstrsInString(line, "/");
int n2 = mvsUtils::findNSubstrsInString(line, "//");
if((n1 == 3 && n2 == 0) ||
if((n1 == 3 && n2 == 0) ||
(n1 == 6 && n2 == 0) ||
(n1 == 0 && n2 == 3) ||
(n1 == 0 && n2 == 0))
ntris += 1;
Expand Down