Skip to content
Snippets Groups Projects
Commit 7f6d54b7 authored by Emmanuel Christophe's avatar Emmanuel Christophe
Browse files

BUG: fix segfault in ossim (due to Ikonos)

parent 7193dbb1
Branches
Tags
No related merge requests found
...@@ -898,22 +898,24 @@ bool ossimIkonosRpcModel::parseTiffFile(const ossimFilename& filename) ...@@ -898,22 +898,24 @@ bool ossimIkonosRpcModel::parseTiffFile(const ossimFilename& filename)
ossimNotify(ossimNotifyLevel_DEBUG) ossimNotify(ossimNotifyLevel_DEBUG)
<< "DEBUG ossimIkonosRpcModel parseTiffFile: Ikonos filename non standard" << std::endl; << "DEBUG ossimIkonosRpcModel parseTiffFile: Ikonos filename non standard" << std::endl;
} }
ossimFilename metadatafile = filenameparts[0]; else
metadatafile += "_"; {
metadatafile += filenameparts[1]; ossimFilename metadatafile = filenameparts[0];
metadatafile += "_metadata.txt"; metadatafile += "_";
metadatafile += filenameparts[1];
metadatafile += "_metadata.txt";
metadatafile.setPath(filename.path()); metadatafile.setPath(filename.path());
parseMetaData (metadatafile); parseMetaData (metadatafile);
if (getErrorStatus()) //check for errors in parsing metadata file if (getErrorStatus()) //check for errors in parsing metadata file
{ {
ossimNotify(ossimNotifyLevel_DEBUG) ossimNotify(ossimNotifyLevel_DEBUG)
<< "DEBUG ossimIkonosRpcModel parseTiffFile: errors parsing metadata" << std::endl; << "DEBUG ossimIkonosRpcModel parseTiffFile: errors parsing metadata" << std::endl;
//failed to read metadata, but don't abord here. //failed to read metadata, but don't abord here.
}
} }
//convert file to rpc filename and hdr filename so we can get some info //convert file to rpc filename and hdr filename so we can get some info
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment