Changeset 3249


Ignore:
Timestamp:
10/09/07 14:35:38 (12 years ago)
Author:
melissa
Message:

Fixed pixel type mismatch.

Location:
trunk/loci/formats/in
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/formats/in/LegacyQTReader.java

    r3204 r3249  
    143143      throw new FormatException(LegacyQTTools.EXPIRED_QT_MSG); 
    144144    } 
    145     if (!tools.canDoQT()) throw new FormatException(LegacyQTTools.NO_QT_MSG); 
     145    if (!tools.canDoQT()) { 
     146      throw new FormatException(LegacyQTTools.NO_QT_MSG); 
     147    } 
    146148 
    147149    super.initFile(id); 
  • trunk/loci/formats/in/QTReader.java

    r3197 r3249  
    305305      useLegacy = true; 
    306306      legacy = createLegacyReader(); 
    307       legacy.setId(id); 
     307      legacy.setId(id, true); 
     308      core = legacy.getCoreMetadata(); 
     309      return; 
    308310    } 
    309311 
     
    586588            if (i == 0) { 
    587589              codec = in.readString(4); 
     590 
     591              if (!codec.equals("raw ") && !codec.equals("rle ") && 
     592                !codec.equals("rpza") && !codec.equals("mjpb") && 
     593                !codec.equals("jpeg")) 
     594              { 
     595                throw new FormatException("Unsupported codec: " + codec); 
     596              } 
     597 
    588598              in.skipBytes(16); 
    589599              if (in.readShort() == 0) { 
Note: See TracChangeset for help on using the changeset viewer.