Changeset 11186

Show
Ignore:
Timestamp:
04/02/07 21:07:32 (2 years ago)
Author:
mloskot
Message:

Backported missing test if particular lines consist of non-Zero values (Ticket #1523).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.4/gdal/gcore/gdal_misc.cpp

    r11183 r11186  
    14081408    papszLines = CSLLoad( pszTFW ); 
    14091409 
     1410    /* Handling of blank lines is not supported. */ 
    14101411    nLinesCount = CSLCount(papszLines); 
    14111412    if( nLinesCount >= 6 ) 
    …… 
    14251426    } 
    14261427    else 
     1428    { 
    14271429        bValid = false; 
    1428  
    1429  
    1430     if( bValid ) 
     1430    } 
     1431 
     1432    if( bValid 
     1433        && (CPLAtofM(papszLines[0]) != 0.0 || CPLAtofM(papszLines[2]) != 0.0)   
     1434        && (CPLAtofM(papszLines[3]) != 0.0 || CPLAtofM(papszLines[1]) != 0.0) )  
    14311435    { 
    14321436        padfGeoTransform[0] = CPLAtofM(papszLines[4]);