Changeset 3249

Timestamp:

10/09/07 14:35:38 (12 years ago)

Author:

melissa

Message:

Fixed pixel type mismatch.

Location:

trunk/loci/formats/in

Files:

• LegacyQTReader.java (modified) (1 diff)
• QTReader.java (modified) (2 diffs)

trunk/loci/formats/in/LegacyQTReader.java

@@ -143 +143 @@
       throw new FormatException(LegacyQTTools.EXPIRED_QT_MSG);
     }
-    if (!tools.canDoQT()) throw new FormatException(LegacyQTTools.NO_QT_MSG);
+    if (!tools.canDoQT()) {
+      throw new FormatException(LegacyQTTools.NO_QT_MSG);
+    }
 
     super.initFile(id);

trunk/loci/formats/in/QTReader.java

@@ -305 +305 @@
       useLegacy = true;
       legacy = createLegacyReader();
-      legacy.setId(id);
+      legacy.setId(id, true);
+      core = legacy.getCoreMetadata();
+      return;
     }
 
@@ -586 +588 @@
             if (i == 0) {
               codec = in.readString(4);
+
+              if (!codec.equals("raw ") && !codec.equals("rle ") &&
+                !codec.equals("rpza") && !codec.equals("mjpb") &&
+                !codec.equals("jpeg"))
+              {
+                throw new FormatException("Unsupported codec: " + codec);
+              }
+
               in.skipBytes(16);
               if (in.readShort() == 0) {