Merge pull request #9906 from sturkmen72:fix_grfmt_gdal

pull/9923/head
Maksim Shabunin 7 years ago
commit 91323549f4
  1. 3
      modules/imgcodecs/src/grfmt_gdal.cpp

@ -562,7 +562,6 @@ ImageDecoder GdalDecoder::newDecoder()const{
*/ */
bool GdalDecoder::checkSignature( const String& signature )const{ bool GdalDecoder::checkSignature( const String& signature )const{
// look for NITF // look for NITF
std::string str(signature); std::string str(signature);
if( str.substr(0,4).find("NITF") != std::string::npos ){ if( str.substr(0,4).find("NITF") != std::string::npos ){
@ -570,7 +569,7 @@ bool GdalDecoder::checkSignature( const String& signature )const{
} }
// look for DTED // look for DTED
if( str.substr(140,4) == "DTED" ){ if( str.size() > 144 && str.substr(140,4) == "DTED" ){
return true; return true;
} }

Loading…
Cancel
Save