Standardize on 4 spaces.

[apitrace] / bmp.hpp

diff --git a/bmp.hpp b/bmp.hpp
index cc5a7735107d1d305c96ad59a1485578df35244c..872bc756138c2aee38cbf89e649b6da8dd2add1b 100644 (file)
--- a/bmp.hpp
+++ b/bmp.hpp
@@ -34,33 +34,33 @@ namespace BMP {
 
 #pragma pack(push,2)
 struct FileHeader {
-   uint16_t bfType;
-   uint32_t bfSize;
-   uint16_t bfReserved1;
-   uint16_t bfReserved2;
-   uint32_t bfOffBits;
+    uint16_t bfType;
+    uint32_t bfSize;
+    uint16_t bfReserved1;
+    uint16_t bfReserved2;
+    uint32_t bfOffBits;
 };
 #pragma pack(pop)
 
 struct InfoHeader {
-   uint32_t biSize;
-   int32_t biWidth;
-   int32_t biHeight;
-   uint16_t biPlanes;
-   uint16_t biBitCount;
-   uint32_t biCompression;
-   uint32_t biSizeImage;
-   int32_t biXPelsPerMeter;
-   int32_t biYPelsPerMeter;
-   uint32_t biClrUsed;
-   uint32_t biClrImportant;
+    uint32_t biSize;
+    int32_t biWidth;
+    int32_t biHeight;
+    uint16_t biPlanes;
+    uint16_t biBitCount;
+    uint32_t biCompression;
+    uint32_t biSizeImage;
+    int32_t biXPelsPerMeter;
+    int32_t biYPelsPerMeter;
+    uint32_t biClrUsed;
+    uint32_t biClrImportant;
 };
 
 struct Pixel {
-   uint8_t rgbBlue;
-   uint8_t rgbGreen;
-   uint8_t rgbRed;
-   uint8_t rgbAlpha;
+    uint8_t rgbBlue;
+    uint8_t rgbGreen;
+    uint8_t rgbRed;
+    uint8_t rgbAlpha;
 };
 
 
@@ -71,61 +71,61 @@ write(const char *filename,
       unsigned stride,
       bool flip = false)
 {
-   struct FileHeader bmfh;
-   struct InfoHeader bmih;
-   unsigned x, y;
-
-   bmfh.bfType = 0x4d42;
-   bmfh.bfSize = 14 + 40 + height*width*4;
-   bmfh.bfReserved1 = 0;
-   bmfh.bfReserved2 = 0;
-   bmfh.bfOffBits = 14 + 40;
-
-   bmih.biSize = 40;
-   bmih.biWidth = width;
-   bmih.biHeight = height;
-   bmih.biPlanes = 1;
-   bmih.biBitCount = 32;
-   bmih.biCompression = 0;
-   bmih.biSizeImage = height*width*4;
-   bmih.biXPelsPerMeter = 0;
-   bmih.biYPelsPerMeter = 0;
-   bmih.biClrUsed = 0;
-   bmih.biClrImportant = 0;
-
-   std::ofstream stream(filename, std::ofstream::binary);
-
-   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;
-          for (x = 0; x < width; ++x) {
-             struct Pixel pixel;
-             pixel.rgbRed   = ptr[x*4 + 0];
-             pixel.rgbGreen = ptr[x*4 + 1];
-             pixel.rgbBlue  = ptr[x*4 + 2];
-             pixel.rgbAlpha = ptr[x*4 + 3];
-             stream.write((const char *)&pixel, 4);
-          }
-       }
-   } else {
-       for (y = 0; y < height; ++y) {
-          const unsigned char *ptr = rgba + y * stride;
-          for (x = 0; x < width; ++x) {
-             struct Pixel pixel;
-             pixel.rgbRed   = ptr[x*4 + 0];
-             pixel.rgbGreen = ptr[x*4 + 1];
-             pixel.rgbBlue  = ptr[x*4 + 2];
-             pixel.rgbAlpha = ptr[x*4 + 3];
-             stream.write((const char *)&pixel, 4);
-          }
-       }
-   }
-
-   stream.close();
+    struct FileHeader bmfh;
+    struct InfoHeader bmih;
+    unsigned x, y;
+
+    bmfh.bfType = 0x4d42;
+    bmfh.bfSize = 14 + 40 + height*width*4;
+    bmfh.bfReserved1 = 0;
+    bmfh.bfReserved2 = 0;
+    bmfh.bfOffBits = 14 + 40;
+
+    bmih.biSize = 40;
+    bmih.biWidth = width;
+    bmih.biHeight = height;
+    bmih.biPlanes = 1;
+    bmih.biBitCount = 32;
+    bmih.biCompression = 0;
+    bmih.biSizeImage = height*width*4;
+    bmih.biXPelsPerMeter = 0;
+    bmih.biYPelsPerMeter = 0;
+    bmih.biClrUsed = 0;
+    bmih.biClrImportant = 0;
+
+    std::ofstream stream(filename, std::ofstream::binary);
+
+    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;
+            for (x = 0; x < width; ++x) {
+                struct Pixel pixel;
+                pixel.rgbRed   = ptr[x*4 + 0];
+                pixel.rgbGreen = ptr[x*4 + 1];
+                pixel.rgbBlue  = ptr[x*4 + 2];
+                pixel.rgbAlpha = ptr[x*4 + 3];
+                stream.write((const char *)&pixel, 4);
+            }
+        }
+    } else {
+        for (y = 0; y < height; ++y) {
+            const unsigned char *ptr = rgba + y * stride;
+            for (x = 0; x < width; ++x) {
+                struct Pixel pixel;
+                pixel.rgbRed   = ptr[x*4 + 0];
+                pixel.rgbGreen = ptr[x*4 + 1];
+                pixel.rgbBlue  = ptr[x*4 + 2];
+                pixel.rgbAlpha = ptr[x*4 + 3];
+                stream.write((const char *)&pixel, 4);
+            }
+        }
+    }
+
+    stream.close();
 }