Add an image class.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4dd0dcd..443bb88 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,7 +177,7 @@ if (GLUT_INCLUDE_DIR)
         ${GLUT_INCLUDE_DIR}
     )
 
-    add_executable (glretrace glretrace.cpp trace_model.cpp ${os} ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
+    add_executable (glretrace glretrace.cpp trace_model.cpp image.cpp ${os} ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
 
     target_link_libraries (glretrace
         ${OPENGL_gl_LIBRARY}

diff --git a/glretrace.py b/glretrace.py
index d397a90..bee6728 100644 (file)
--- a/glretrace.py
+++ b/glretrace.py
@@ -216,7 +216,7 @@ static Trace::Parser parser;
 static void display_noop(void) {
 }
 
-#include "bmp.hpp"
+#include "image.hpp"
 
 static void frame_complete(void) {
     ++__frame;
@@ -224,9 +224,9 @@ static void frame_complete(void) {
     if (__screenshots && !__reshape_window) {
         char filename[PATH_MAX];
         snprintf(filename, sizeof filename, "screenshot_%04u.bmp", __frame);
-        unsigned char *pixels = new unsigned char[__window_height*__window_width*4];
-        glReadPixels(0, 0, __window_width, __window_height, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
-        BMP::write(filename, pixels, __window_width, __window_height, __window_width*4);
+        Image::Image image(__window_width, __window_height, true);
+        glReadPixels(0, 0, __window_width, __window_height, GL_RGBA, GL_UNSIGNED_BYTE, image.pixels);
+        image.writeBMP(filename);
     }
 
 }

diff --git a/bmp.hpp b/image.cpp
similarity index 88%
rename from bmp.hpp
rename to image.cpp
index b6a4ab7..ec056d7 100644 (file)
--- a/bmp.hpp
+++ b/image.cpp
@@ -23,18 +23,16 @@
  *
  **************************************************************************/
 
-/*
- * BMP image writing.
- */
-
-#ifndef _BMP_HPP_
-#define _BMP_HPP_
 
+#include <stdint.h>
 
 #include <fstream>
 
+#include "image.hpp"
+
+
+namespace Image {
 
-namespace BMP {
 
 #pragma pack(push,2)
 struct FileHeader {
@@ -68,13 +66,8 @@ struct Pixel {
 };
 
 
-static inline void
-write(const char *filename,
-      const unsigned char *rgba, 
-      unsigned width, unsigned height,
-      unsigned stride,
-      bool flip = false)
-{
+void
+Image::writeBMP(const char *filename) const {
     struct FileHeader bmfh;
     struct InfoHeader bmih;
     unsigned x, y;
@@ -102,10 +95,11 @@ write(const char *filename,
     stream.write((const char *)&bmfh, 14);
     stream.write((const char *)&bmih, 40);
 
-    if (flip) {
-        y = height;
-        while (y--) {
-            const unsigned char *ptr = rgba + y * stride;
+    unsigned stride = width*4;
+
+    if (flipped) {
+        for (y = 0; y < height; ++y) {
+            const unsigned char *ptr = pixels + y * stride;
             for (x = 0; x < width; ++x) {
                 struct Pixel pixel;
                 pixel.rgbRed   = ptr[x*4 + 0];
@@ -116,8 +110,9 @@ write(const char *filename,
             }
         }
     } else {
-        for (y = 0; y < height; ++y) {
-            const unsigned char *ptr = rgba + y * stride;
+        y = height;
+        while (y--) {
+            const unsigned char *ptr = pixels + y * stride;
             for (x = 0; x < width; ++x) {
                 struct Pixel pixel;
                 pixel.rgbRed   = ptr[x*4 + 0];
@@ -133,7 +128,4 @@ write(const char *filename,
 }
 
 
-} /* namespace BMP */
-
-
-#endif /* _BMP_HPP_ */
+} /* namespace Image */

diff --git a/image.hpp b/image.hpp
new file mode 100644 (file)
index 0000000..92749c6
--- /dev/null
+++ b/image.hpp
@@ -0,0 +1,69 @@
+/**************************************************************************
+ *
+ * Copyright 2008-2010 VMware, Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ **************************************************************************/
+
+/*
+ * Image I/O.
+ */
+
+#ifndef _IMAGE_HPP_
+#define _IMAGE_HPP_
+
+
+#include <fstream>
+
+
+namespace Image {
+
+
+class Image {
+public:
+    unsigned width;
+    unsigned height;
+
+    // Flipped vertically or not
+    bool flipped;
+
+    // Pixels in RGBA format
+    unsigned char *pixels;
+
+    inline Image(unsigned w, unsigned h, bool f = false) : 
+        width(w),
+        height(h),
+        flipped(f),
+        pixels(new unsigned char[h*w*4])
+    {}
+
+    inline ~Image() {
+        delete [] pixels;
+    }
+
+    void writeBMP(const char *filename) const;
+};
+
+
+} /* namespace Image */
+
+
+#endif /* _IMAGE_HPP_ */