Changeset 13664

Show
Ignore:
Timestamp:
02/01/08 18:26:36 (3 months ago)
Author:
rouault
Message:

Fix logical tests in PNM Identify (bug #2190)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.5/gdal/frmts/raw/pnmdataset.cpp

    r13656 r13664  
    123123        return FALSE; 
    124124 
    125     if( poOpenInfo->pabyHeader[0] != 'P'  && 
    126         (poOpenInfo->pabyHeader[2] != ' '  ||    // XXX: Magick number 
    127          poOpenInfo->pabyHeader[2] != '\t' ||    // may be followed 
    128          poOpenInfo->pabyHeader[2] != '\n' ||    // any of the blank 
     125    if( poOpenInfo->pabyHeader[0] != 'P'  || 
     126        (poOpenInfo->pabyHeader[2] != ' '  &&    // XXX: Magick number 
     127         poOpenInfo->pabyHeader[2] != '\t' &&    // may be followed 
     128         poOpenInfo->pabyHeader[2] != '\n' &&    // any of the blank 
    129129         poOpenInfo->pabyHeader[2] != '\r') )    // characters 
    130130        return FALSE;