diff -r 000000000000 -r 6474c204b198 image/src/BMPFileHeaders.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/image/src/BMPFileHeaders.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,138 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef MOZILLA_IMAGELIB_BMPHEADERS_H_
+#define MOZILLA_IMAGELIB_BMPHEADERS_H_
+
+namespace mozilla {
+  namespace image {
+
+    struct BMPFILEHEADER {
+      char signature[2]; // String "BM"
+      uint32_t filesize;
+      int32_t reserved; // Zero
+      uint32_t dataoffset; // Offset to raster data
+
+      uint32_t bihsize;
+    };
+
+// The length of the bitmap file header as defined in the BMP spec.
+#define BFH_LENGTH 14
+// Internally we store the bitmap file header with an additional 4 bytes which
+// is used to store the bitmap information header size.
+#define BFH_INTERNAL_LENGTH 18
+
+#define OS2_INTERNAL_BIH_LENGTH 8
+#define WIN_V3_INTERNAL_BIH_LENGTH 36
+#define WIN_V5_INTERNAL_BIH_LENGTH 120
+
+#define OS2_BIH_LENGTH 12 // This is the real BIH size (as contained in the bihsize field of BMPFILEHEADER)
+#define WIN_V3_BIH_LENGTH 40 // This is the real BIH size (as contained in the bihsize field of BMPFILEHEADER)
+#define WIN_V5_BIH_LENGTH 124 // This is the real BIH size (as contained in the bihsize field of BMPFILEHEADER)
+
+#define OS2_HEADER_LENGTH (BFH_INTERNAL_LENGTH + OS2_INTERNAL_BIH_LENGTH)
+#define WIN_V3_HEADER_LENGTH (BFH_INTERNAL_LENGTH + WIN_V3_INTERNAL_BIH_LENGTH)
+#define WIN_V5_HEADER_LENGTH (BFH_INTERNAL_LENGTH + WIN_V5_INTERNAL_BIH_LENGTH)
+
+#ifndef LCS_sRGB
+#define LCS_sRGB 0x73524742
+#endif
+
+    struct xyz {
+      int32_t x, y, z;
+    };
+
+    struct xyzTriple {
+      xyz r, g, b;
+    };
+
+    struct BITMAPV5HEADER {
+      int32_t width; // Uint16 in OS/2 BMPs
+      int32_t height; // Uint16 in OS/2 BMPs
+      uint16_t planes; // =1
+      uint16_t bpp; // Bits per pixel.
+      // The rest of the header is not available in OS/2 BMP Files
+      uint32_t compression; // 0=no compression 1=8bit RLE 2=4bit RLE
+      uint32_t image_size; // (compressed) image size. Can be 0 if compression==0
+      uint32_t xppm; // Pixels per meter, horizontal
+      uint32_t yppm; // Pixels per meter, vertical
+      uint32_t colors; // Used Colors
+      uint32_t important_colors; // Number of important colors. 0=all
+      uint32_t red_mask;   // Bits used for red component
+      uint32_t green_mask; // Bits used for green component
+      uint32_t blue_mask;  // Bits used for blue component
+      uint32_t alpha_mask; // Bits used for alpha component
+      uint32_t color_space; // 0x73524742=LCS_sRGB ...
+      // These members are unused unless color_space == LCS_CALIBRATED_RGB
+      xyzTriple white_point; // Logical white point
+      uint32_t gamma_red;   // Red gamma component
+      uint32_t gamma_green; // Green gamma component
+      uint32_t gamma_blue;  // Blue gamma component
+      uint32_t intent; // Rendering intent
+      // These members are unused unless color_space == LCS_PROFILE_*
+      uint32_t profile_offset; // Offset to profile data in bytes
+      uint32_t profile_size; // Size of profile data in bytes
+      uint32_t reserved; // =0
+    };
+
+    struct colorTable {
+      uint8_t red;
+      uint8_t green;
+      uint8_t blue;
+    };
+
+    struct bitFields {
+      uint32_t red;
+      uint32_t green;
+      uint32_t blue;
+      uint8_t redLeftShift;
+      uint8_t redRightShift;
+      uint8_t greenLeftShift;
+      uint8_t greenRightShift;
+      uint8_t blueLeftShift;
+      uint8_t blueRightShift;
+    };
+
+  } // namespace image
+} // namespace mozilla
+
+#define BITFIELD_LENGTH 12 // Length of the bitfields structure in the bmp file
+#define USE_RGB
+
+// BMPINFOHEADER.compression defines
+#ifndef BI_RGB
+#define BI_RGB 0
+#endif
+#ifndef BI_RLE8
+#define BI_RLE8 1
+#endif
+#ifndef BI_RLE4
+#define BI_RLE4 2
+#endif
+#ifndef BI_BITFIELDS
+#define BI_BITFIELDS 3
+#endif
+// BI_ALPHABITFIELDS  means no compression and specifies alpha bits
+// valid only for 32bpp and 16bpp
+#ifndef BI_ALPHABITFIELDS
+#define BI_ALPHABITFIELDS 4
+#endif
+
+// RLE Escape codes
+#define RLE_ESCAPE       0
+#define RLE_ESCAPE_EOL   0
+#define RLE_ESCAPE_EOF   1
+#define RLE_ESCAPE_DELTA 2
+
+/// enums for mState
+enum ERLEState {
+  eRLEStateInitial,
+  eRLEStateNeedSecondEscapeByte,
+  eRLEStateNeedXDelta,
+  eRLEStateNeedYDelta,    ///< mStateData will hold x delta
+  eRLEStateAbsoluteMode,  ///< mStateData will hold count of existing data to read
+  eRLEStateAbsoluteModePadded ///< As above, but another byte of data has to be read as padding
+};
+
+#endif