]> git.cworth.org Git - apitrace/commitdiff
image: Write the scale factor / endianness line for PFM too.
authorJosé Fonseca <jfonseca@vmware.com>
Mon, 16 Sep 2013 12:07:00 +0000 (13:07 +0100)
committerJosé Fonseca <jfonseca@vmware.com>
Mon, 16 Sep 2013 12:07:00 +0000 (13:07 +0100)
image/image_pnm.cpp

index 55130cb12866859a61efcdfd211a473ad63ba919..79db1c6e78249e945b9b5a6c2f45fb89b3dc7788 100644 (file)
@@ -80,6 +80,8 @@ Image::writePNM(std::ostream &os, const char *comment) const
 
     if (channelType == TYPE_UNORM8) {
         os << "255" << "\n";
+    } else {
+        os << "1" << "\n";
     }
 
     const unsigned char *row;
@@ -262,10 +264,8 @@ readPNMHeader(const char *buffer, size_t bufferSize, PNMInfo &info)
     bufferSize -= nextBuffer - currentBuffer;
     currentBuffer = nextBuffer;
 
-    if (info.channelType == TYPE_UNORM8) {
-        // skip over "255\n" at end of header
-        nextBuffer = (const char *) memchr((const void *) currentBuffer, '\n', bufferSize) + 1;
-    }
+    // skip scale factor / endianness line
+    nextBuffer = (const char *) memchr((const void *) currentBuffer, '\n', bufferSize) + 1;
 
     // return start of image data
     return nextBuffer;