Merge pull request #9906 from sturkmen72:fix_grfmt_gdal

7 years ago · 91323549f4
parent cca99bf824 d1c5e79ec3
commit 91323549f4
1 changed files with 1 additions and 2 deletions
--- a/modules/imgcodecs/src/grfmt_gdal.cpp
+++ b/modules/imgcodecs/src/grfmt_gdal.cpp
@ -562,7 +562,6 @@ ImageDecoder GdalDecoder::newDecoder()const{
 */
 bool GdalDecoder::checkSignature( const String& signature )const{

-
    // look for NITF
    std::string str(signature);
    if( str.substr(0,4).find("NITF") != std::string::npos ){
@ -570,7 +569,7 @@ bool GdalDecoder::checkSignature( const String& signature )const{
    }

    // look for DTED
-    if( str.substr(140,4) == "DTED" ){
+    if( str.size() > 144 && str.substr(140,4) == "DTED" ){
        return true;
    }