Logoj0ke.net Open Build Service > Projects > mozilla > MozillaThunderbird > mozilla-gcc4.3-fixes.patch
Sign Up | Log In

File mozilla-gcc4.3-fixes.patch of Package MozillaThunderbird (Revision 043c390b46f411317ab330fed87a5457)

Currently displaying revision 043c390b46f411317ab330fed87a5457, show latest

 
1
References:
2
https://bugzilla.mozilla.org/show_bug.cgi?id=403675
3
https://bugzilla.mozilla.org/show_bug.cgi?id=386362
4
​
5
Index: modules/libpr0n/encoders/png/nsPNGEncoder.h
6
===================================================================
7
RCS file: /cvsroot/mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.h,v
8
retrieving revision 1.1.18.1
9
diff -u -p -6 -r1.1.18.1 nsPNGEncoder.h
10
--- modules/libpr0n/encoders/png/nsPNGEncoder.h 20 May 2006 17:20:49 -0000  1.1.18.1
11
+++ modules/libpr0n/encoders/png/nsPNGEncoder.h 13 Nov 2007 22:07:36 -0000
12
@@ -35,14 +35,16 @@
13
  *
14
  * ***** END LICENSE BLOCK ***** */
15
16
 #include "imgIEncoder.h"
17
 #ifdef MOZILLA_1_8_BRANCH
18
 #define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH
19
+#ifndef NS_DECL_IMGIENCODER
20
 #define NS_DECL_IMGIENCODER NS_DECL_IMGIENCODER_MOZILLA_1_8_BRANCH
21
 #endif
22
+#endif
23
24
 #include <png.h>
25
26
 #define NS_PNGENCODER_CID \
27
 { /* 38d1592e-b81e-432b-86f8-471878bbfe07 */         \
28
      0x38d1592e,                                     \
29
@@ -60,12 +62,20 @@ public:
30
   NS_DECL_ISUPPORTS
31
   NS_DECL_IMGIENCODER
32
   NS_DECL_NSIINPUTSTREAM
33
34
   nsPNGEncoder();
35
36
+  NS_IMETHOD InitFromData(const PRUint8* aData,
37
+                          PRUint32 aLength, // (unused, req'd by JS)
38
+                          PRUint32 aWidth,
39
+                          PRUint32 aHeight,
40
+                          PRUint32 aStride,
41
+                          PRUint32 aInputFormat,
42
+                          const nsAString& aOutputOptions);
43
+
44
 private:
45
   ~nsPNGEncoder();
46
47
 protected:
48
   void ConvertHostARGBRow(const PRUint8* aSrc, PRUint8* aDest,
49
                           PRUint32 aPixelWidth, PRBool aUseTransparency);
50
Index: modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h
51
===================================================================
52
RCS file: /cvsroot/mozilla/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h,v
53
retrieving revision 1.1.14.1
54
diff -u -p -6 -r1.1.14.1 nsJPEGEncoder.h
55
--- modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h   20 May 2006 17:20:48 -0000  1.1.14.1
56
+++ modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h   13 Nov 2007 22:07:57 -0000
57
@@ -36,14 +36,16 @@
58
  *
59
  * ***** END LICENSE BLOCK ***** */
60
61
 #include "imgIEncoder.h"
62
 #ifdef MOZILLA_1_8_BRANCH
63
 #define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH
64
+#ifndef NS_DECL_IMGIENCODER
65
 #define NS_DECL_IMGIENCODER NS_DECL_IMGIENCODER_MOZILLA_1_8_BRANCH
66
 #endif
67
+#endif
68
69
 // needed for JPEG library
70
 #include <stdio.h>
71
72
 extern "C" {
73
 #include "jpeglib.h"
74
@@ -66,12 +68,20 @@ public:
75
   NS_DECL_ISUPPORTS
76
   NS_DECL_IMGIENCODER
77
   NS_DECL_NSIINPUTSTREAM
78
79
   nsJPEGEncoder();
80
81
+  NS_IMETHOD InitFromData(const PRUint8* aData,
82
+                          PRUint32 aLength, // (unused, req'd by JS)
83
+                          PRUint32 aWidth,
84
+                          PRUint32 aHeight,
85
+                          PRUint32 aStride,
86
+                          PRUint32 aInputFormat,
87
+                          const nsAString& aOutputOptions);
88
+
89
 private:
90
   ~nsJPEGEncoder();
91
92
 protected:
93
94
   void ConvertHostARGBRow(const PRUint8* aSrc, PRUint8* aDest,
95
Index: modules/libpr0n/public/imgIEncoder.idl
96
===================================================================
97
RCS file: /cvsroot/mozilla/modules/libpr0n/public/imgIEncoder.idl,v
98
retrieving revision 1.1.10.3
99
diff -u -p -r1.1.10.3 imgIEncoder.idl
100
--- modules/libpr0n/public/imgIEncoder.idl  20 May 2006 17:20:49 -0000  1.1.10.3
101
+++ modules/libpr0n/public/imgIEncoder.idl  14 Nov 2007 10:41:40 -0000
102
@@ -96,6 +96,6 @@ interface nsIFile;
103
 [scriptable, uuid(CCC5B3AD-3E67-4e3d-97E1-B06B2E96FEF8)]
104
 interface imgIEncoder : nsISupports
105
 {
106
-  void encodeClipboardImage(in nsIClipboardImage aClipboardImage, out nsIFile aImageFile);
107
+  /* void encodeClipboardImage(in nsIClipboardImage aClipboardImage, out nsIFile aImageFile); */
108
 };
109
110
Index: xpcom/obsolete/component/nsFileSpecImpl.h
111
===================================================================
112
RCS file: /cvsroot/mozilla/xpcom/obsolete/component/nsFileSpecImpl.h,v
113
retrieving revision 1.3
114
diff -u -p -6 -r1.3 nsFileSpecImpl.h
115
--- xpcom/obsolete/component/nsFileSpecImpl.h   18 Apr 2004 14:18:15 -0000  1.3
116
+++ xpcom/obsolete/component/nsFileSpecImpl.h   14 Nov 2007 12:11:12 -0000
117
@@ -40,13 +40,13 @@
118
119
 #include "nscore.h"
120
 #include "nsIFileSpec.h"
121
 #include "nsFileSpec.h"
122
123
 //========================================================================================
124
-class nsFileSpecImpl
125
+class NS_COM nsFileSpecImpl
126
 //========================================================================================
127
    : public nsIFileSpec
128
 {
129
130
  public:
131
132
@@ -78,13 +78,13 @@ class nsFileSpecImpl
133
134
 private:
135
    ~nsFileSpecImpl();
136
 }; // class nsFileSpecImpl
137
138
 //========================================================================================
139
-class nsDirectoryIteratorImpl
140
+class NS_COM nsDirectoryIteratorImpl
141
 //========================================================================================
142
    : public nsIDirectoryIterator
143
 {
144
145
 public:
146
147
​

Cancel