Implement and use os::thread.

[apitrace] / common / image.hpp

diff --git a/common/image.hpp b/common/image.hpp
index 6316791bba210763dd79d10ed52afd6a20bfef9c..e930512f86473c89352a8990443cd9bbff40d622 100644 (file)
--- a/common/image.hpp
+++ b/common/image.hpp
@@ -78,7 +78,7 @@ public:
     }
 
     inline signed stride(void) const {
-        return flipped ? -width*channels : width*channels;
+        return flipped ? -(signed)(width*channels) : width*channels;
     }
 
     bool writeBMP(const char *filename) const;
@@ -108,6 +108,8 @@ bool writePixelsToBuffer(unsigned char *pixels,
 Image *
 readPNG(const char *filename);
 
+const char *
+readPNMHeader(const char *buffer, size_t size, unsigned *channels, unsigned *width, unsigned *height);
 
 } /* namespace image */