diff -r 000000000000 -r 6474c204b198 image/encoders/bmp/nsBMPEncoder.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/image/encoders/bmp/nsBMPEncoder.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,91 @@
+/* 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/. */
+
+#include "mozilla/Attributes.h"
+#include "mozilla/ReentrantMonitor.h"
+
+#include "imgIEncoder.h"
+#include "BMPFileHeaders.h"
+
+#include "nsCOMPtr.h"
+
+#define NS_BMPENCODER_CID \
+{ /* 13a5320c-4c91-4FA4-bd16-b081a3ba8c0b */         \
+     0x13a5320c,                                     \
+     0x4c91,                                         \
+     0x4fa4,                                         \
+    {0xbd, 0x16, 0xb0, 0x81, 0xa3, 0Xba, 0x8c, 0x0b} \
+}
+
+// Provides BMP encoding functionality. Use InitFromData() to do the
+// encoding. See that function definition for encoding options.
+
+class nsBMPEncoder MOZ_FINAL : public imgIEncoder
+{
+  typedef mozilla::ReentrantMonitor ReentrantMonitor;
+public:
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_IMGIENCODER
+  NS_DECL_NSIINPUTSTREAM
+  NS_DECL_NSIASYNCINPUTSTREAM
+
+  nsBMPEncoder();
+  ~nsBMPEncoder();
+
+protected:
+  enum Version {
+      VERSION_3 = 3,
+      VERSION_5 = 5
+  };
+
+  // See InitData in the cpp for valid parse options
+  nsresult ParseOptions(const nsAString& aOptions, Version* version,
+                        uint32_t* bpp);
+  // Obtains data with no alpha in machine-independent byte order
+  void ConvertHostARGBRow(const uint8_t* aSrc, uint8_t* aDest,
+                          uint32_t aPixelWidth);
+  // Thread safe notify listener
+  void NotifyListener();
+
+  // Initializes the bitmap file header member mBMPFileHeader
+  void InitFileHeader(Version aVersion, uint32_t aBPP, uint32_t aWidth,
+                      uint32_t aHeight);
+  // Initializes the bitmap info header member mBMPInfoHeader
+  void InitInfoHeader(Version aVersion, uint32_t aBPP, uint32_t aWidth,
+                      uint32_t aHeight);
+
+  // Encodes the bitmap file header member mBMPFileHeader
+  void EncodeFileHeader();
+  // Encodes the bitmap info header member mBMPInfoHeader
+  void EncodeInfoHeader();
+  // Encodes a row of image data which does not have alpha data
+  void EncodeImageDataRow24(const uint8_t* aData);
+  // Encodes a row of image data which does have alpha data
+  void EncodeImageDataRow32(const uint8_t* aData);
+  // Obtains the current offset filled up to for the image buffer
+  inline int32_t GetCurrentImageBufferOffset()
+  {
+    return static_cast<int32_t>(mImageBufferCurr - mImageBufferStart);
+  }
+
+  // These headers will always contain endian independent stuff 
+  // They store the BMP headers which will be encoded
+  mozilla::image::BMPFILEHEADER mBMPFileHeader;
+  mozilla::image::BITMAPV5HEADER mBMPInfoHeader;
+
+  // Keeps track of the start of the image buffer
+  uint8_t* mImageBufferStart;
+  // Keeps track of the current position in the image buffer
+  uint8_t* mImageBufferCurr;
+  // Keeps track of the image buffer size
+  uint32_t mImageBufferSize;
+  // Keeps track of the number of bytes in the image buffer which are read
+  uint32_t mImageBufferReadPoint;
+  // Stores true if the image is done being encoded
+  bool mFinished;
+
+  nsCOMPtr<nsIInputStreamCallback> mCallback;
+  nsCOMPtr<nsIEventTarget> mCallbackTarget;
+  uint32_t mNotifyThreshold;
+};