Skip to content
Snippets Groups Projects
Commit 9fbacda5 authored by Mickael Savinaud's avatar Mickael Savinaud
Browse files

COMP: fix otb to support VS2012 (WIP)

parent 9594d49c
Branches
Tags
No related merge requests found
......@@ -470,7 +470,7 @@ private:
rightBandMathExpression << "if(" << rightBandMathCondition.str() << "," << state << "," << elseState << ")";
#endif
std::cout << leftBandMathCondition << std::endl;
std::cout << leftBandMathCondition.str() << std::endl;
if(maskingLeft)
{
GetLogger()->Info("Masking criterion on left image: " + leftBandMathExpression.str() + '\n');
......
......@@ -20,6 +20,7 @@
#include "itkNumericTraits.h"
#include "vnl/vnl_math.h"
#include <algorithm>
namespace otb {
......
......@@ -101,7 +101,7 @@ int otbMorphologicalPyramidAnalysisFilter(int argc, char * argv[])
writer->SetInput(itInfDeci.Get());
writer->SetFileName(oss.str().c_str());
writer->Update();
std::cout << "File " << oss << " written" << std::endl;
std::cout << "File " << oss.str() << " written" << std::endl;
oss.str("");
oss << outputFilenamePrefix << "_sd_" << i << "." << outputFilenameSuffix;
writer->SetInput(itSupDeci.Get());
......
......@@ -34,7 +34,7 @@ int otbCompareAsciiTestsEpsilon3_WhiteSpace(int argc, char * argv[])
// Transfer to temporary object
std::string strFileTest;
std::vector<std::string> listLineFileTest;
while (std::getline(fileTestInput, strFileTest) != 0)
while (std::getline(fileTestInput, strFileTest))
{
listLineFileTest.push_back(strFileTest);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment