Changeset 14008

Show
Ignore:
Timestamp:
03/14/08 10:12:47 (4 months ago)
Author:
warmerdam
Message:

be more careful deciding what geotransforms to ignore (#1935)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/gdal/frmts/ecw/ecwdataset.cpp

    r13901 r14008  
    13861386/* -------------------------------------------------------------------- */ 
    13871387/*      Capture Geotransform.                                           */ 
    1388 /* -------------------------------------------------------------------- */ 
    1389  
     1388/*                                                                      */ 
     1389/*      We will try to ignore the provided file information if it is    */ 
     1390/*      origin (0,0) and pixel size (1,1).  I think sometimes I have    */ 
     1391/*      also seen pixel increments of 0 on invalid datasets.            */ 
     1392/* -------------------------------------------------------------------- */ 
    13901393    if( psFileInfo->fOriginX != 0.0  
    13911394        || psFileInfo->fOriginY != 0.0  
    1392         && (psFileInfo->fCellIncrementX != 0.0 &&  
    1393             psFileInfo->fCellIncrementX != 1.0) 
    1394         && (psFileInfo->fCellIncrementY != 0.0 &&  
    1395             psFileInfo->fCellIncrementY != 1.0) ) 
     1395        || (psFileInfo->fCellIncrementX != 0.0  
     1396            && psFileInfo->fCellIncrementX != 1.0) 
     1397        || (psFileInfo->fCellIncrementY != 0.0  
     1398            && psFileInfo->fCellIncrementY != 1.0) ) 
    13961399    { 
    13971400        bGeoTransformValid = TRUE;