File seamonkey-gcc4.3-fixes.patch of Package seamonkey

Overview Repositories Revisions Requests Users Attributes Meta

File seamonkey-gcc4.3-fixes.patch of Package seamonkey

diff --git a/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h b/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h
index 8a63354..d726df2 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>
@@ -64,11 +66,20 @@ class nsJPEGEncoder : public imgIEncoder
 {
 public:
   NS_DECL_ISUPPORTS
-  NS_DECL_IMGIENCODER
   NS_DECL_NSIINPUTSTREAM
-
+  NS_DECL_IMGIENCODER
+  // NS_DECL_IMGIENCODER_MOZILLA_1_8_BRANCH
   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..695dd5f 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,15 @@ public:
 
   nsPNGEncoder();
 
+  NS_IMETHODIMP 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/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); */
 };

Places

File seamonkey-gcc4.3-fixes.patch of Package seamonkey

Places