Changeset 14009

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

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.5/gdal/frmts/ecw/ecwdataset.cpp

    r13431 r14009  
    13691369/* -------------------------------------------------------------------- */ 
    13701370/*      Capture Geotransform.                                           */ 
    1371 /* -------------------------------------------------------------------- */ 
    1372  
     1371/*                                                                      */ 
     1372/*      We will try to ignore the provided file information if it is    */ 
     1373/*      origin (0,0) and pixel size (1,1).  I think sometimes I have    */ 
     1374/*      also seen pixel increments of 0 on invalid datasets.            */ 
     1375/* -------------------------------------------------------------------- */ 
    13731376    if( psFileInfo->fOriginX != 0.0  
    13741377        || psFileInfo->fOriginY != 0.0  
    1375         && (psFileInfo->fCellIncrementX != 0.0 &&  
    1376             psFileInfo->fCellIncrementX != 1.0) 
    1377         && (psFileInfo->fCellIncrementY != 0.0 &&  
    1378             psFileInfo->fCellIncrementY != 1.0) ) 
     1378        || (psFileInfo->fCellIncrementX != 0.0  
     1379            && psFileInfo->fCellIncrementX != 1.0) 
     1380        || (psFileInfo->fCellIncrementY != 0.0  
     1381            && psFileInfo->fCellIncrementY != 1.0) ) 
    13791382    { 
    13801383        bGeoTransformValid = TRUE;