Merge branch 'master' into d3dretrace

[apitrace] / common / image.hpp

diff --git a/common/image.hpp b/common/image.hpp
index dc53ec990ee3a19f931f5e9160269c7e0c875169..ea3eefb0d589c6e3f342860b8a1bd9720b3011bf 100644 (file)
--- a/common/image.hpp
+++ b/common/image.hpp
@@ -34,7 +34,7 @@
 #include <fstream>
 
 
-namespace Image {
+namespace image {
 
 
 class Image {
@@ -108,8 +108,10 @@ 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 */
+} /* namespace image */
 
 
 #endif /* _IMAGE_HPP_ */