forked from pool/MozillaFirefox
85 lines
2.8 KiB
Diff
85 lines
2.8 KiB
Diff
|
diff --git a/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h b/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h
|
||
|
|
index 8a63354..655c8da 100644
|
||
|
|
--- a/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h
|
||
|
|
+++ b/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h
|
||
|
|
@@ -39,8 +39,10 @@
|
||
|
|
#include "imgIEncoder.h"
|
||
|
|
#ifdef MOZILLA_1_8_BRANCH
|
||
|
|
#define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH
|
||
|
|
+#ifndef NS_DECL_IMGIENCODER
|
||
|
|
#define NS_DECL_IMGIENCODER NS_DECL_IMGIENCODER_MOZILLA_1_8_BRANCH
|
||
|
|
#endif
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
// needed for JPEG library
|
||
|
|
#include <stdio.h>
|
||
|
|
@@ -69,6 +71,13 @@ public:
|
||
|
|
|
||
|
|
nsJPEGEncoder();
|
||
|
|
|
||
|
|
+ NS_IMETHOD InitFromData(const PRUint8* aData,
|
||
|
|
+ PRUint32 aLength, // (unused, req'd by JS)
|
||
|
|
+ PRUint32 aWidth,
|
||
|
|
+ PRUint32 aHeight,
|
||
|
|
+ PRUint32 aStride,
|
||
|
|
+ PRUint32 aInputFormat,
|
||
|
|
+ const nsAString& aOutputOptions);
|
||
|
|
private:
|
||
|
|
~nsJPEGEncoder();
|
||
|
|
|
||
|
|
diff --git a/modules/libpr0n/encoders/png/nsPNGEncoder.h b/modules/libpr0n/encoders/png/nsPNGEncoder.h
|
||
|
|
index ff85949..83766f1 100644
|
||
|
|
--- a/modules/libpr0n/encoders/png/nsPNGEncoder.h
|
||
|
|
+++ b/modules/libpr0n/encoders/png/nsPNGEncoder.h
|
||
|
|
@@ -38,8 +38,10 @@
|
||
|
|
#include "imgIEncoder.h"
|
||
|
|
#ifdef MOZILLA_1_8_BRANCH
|
||
|
|
#define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH
|
||
|
|
+#ifndef NS_DECL_IMGIENCODER
|
||
|
|
#define NS_DECL_IMGIENCODER NS_DECL_IMGIENCODER_MOZILLA_1_8_BRANCH
|
||
|
|
#endif
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
#include <png.h>
|
||
|
|
|
||
|
|
@@ -63,6 +65,14 @@ public:
|
||
|
|
|
||
|
|
nsPNGEncoder();
|
||
|
|
|
||
|
|
+ NS_IMETHOD InitFromData(const PRUint8* aData,
|
||
|
|
+ PRUint32 aLength, // (unused, req'd by JS)
|
||
|
|
+ PRUint32 aWidth,
|
||
|
|
+ PRUint32 aHeight,
|
||
|
|
+ PRUint32 aStride,
|
||
|
|
+ PRUint32 aInputFormat,
|
||
|
|
+ const nsAString& aOutputOptions);
|
||
|
|
+
|
||
|
|
private:
|
||
|
|
~nsPNGEncoder();
|
||
|
|
|
||
|
|
diff --git a/modules/libpr0n/public/imgIContainer.idl b/modules/libpr0n/public/imgIContainer.idl
|
||
|
|
index f975b16..4819158 100644
|
||
|
|
--- a/modules/libpr0n/public/imgIContainer.idl
|
||
|
|
+++ b/modules/libpr0n/public/imgIContainer.idl
|
||
|
|
@@ -38,7 +38,7 @@
|
||
|
|
* ***** END LICENSE BLOCK ***** */
|
||
|
|
|
||
|
|
#include "nsISupports.idl"
|
||
|
|
-#include "gfxtypes.idl"
|
||
|
|
+#include <gfxtypes.idl>
|
||
|
|
#include "gfxIFormats.idl"
|
||
|
|
|
||
|
|
interface gfxIImageFrame;
|
||
|
|
diff --git a/modules/libpr0n/public/imgIEncoder.idl b/modules/libpr0n/public/imgIEncoder.idl
|
||
|
|
index 120b3bf..562bf42 100755
|
||
|
|
--- a/modules/libpr0n/public/imgIEncoder.idl
|
||
|
|
+++ b/modules/libpr0n/public/imgIEncoder.idl
|
||
|
|
@@ -96,6 +96,6 @@ interface nsIFile;
|
||
|
|
[scriptable, uuid(CCC5B3AD-3E67-4e3d-97E1-B06B2E96FEF8)]
|
||
|
|
interface imgIEncoder : nsISupports
|
||
|
|
{
|
||
|
|
- void encodeClipboardImage(in nsIClipboardImage aClipboardImage, out nsIFile aImageFile);
|
||
|
|
+ /* void encodeClipboardImage(in nsIClipboardImage aClipboardImage, out nsIFile aImageFile); */
|
||
|
|
};
|
||
|
|
|