Attempt to fix bustage

gfx/src/mac/nsMacUnicodeFontInfo.cpp

@@ -510,7 +510,7 @@ GetEncoding(const nsString& aFontName, PRUnichar** aValue)
       return NS_ERROR_NOT_AVAILABLE; // error mean do not get a special encoding
 
     // init the property now
-    rv = InitFontEncodingProperties();
+    nsresult rv = InitFontEncodingProperties();
     if NS_FAILED(rv)
       return rv;
   }
@@ -568,7 +568,8 @@ GetCCMapThroughConverter(nsIUnicodeEncoder *converter)
 static PRBool PR_CALLBACK
 HashtableFreeCCMap(nsHashKey *aKey, void *aData, void *closure)
 {
-    FreeCCMap((PRUint16*) aData);
+    PRUint16* ccmap = (PRUint16*)aData;
+    FreeCCMap(ccmap);
     return PR_TRUE;
 }
 

gfx/src/mac/nsUnicodeFontMappingMac.cpp

@@ -51,7 +51,12 @@
 
 
 //------------------------------------------------------------------------
-static UnicodeToTextInfo gConverters[32] = { nsnull };
+static UnicodeToTextInfo gConverters[32] = { 
+       nsnull, nsnull, nsnull, nsnull, nsnull, nsnull, nsnull, nsnull,
+       nsnull, nsnull, nsnull, nsnull, nsnull, nsnull, nsnull, nsnull,
+       nsnull, nsnull, nsnull, nsnull, nsnull, nsnull, nsnull, nsnull,
+       nsnull, nsnull, nsnull, nsnull, nsnull, nsnull, nsnull, nsnull
+};
 //------------------------------------------------------------------------
 static UnicodeToTextInfo
 GetConverterByScript(ScriptCode sc)
@@ -121,7 +126,8 @@ public:
         UnicodeToTextInfo converter = GetConverterByScript(mScript);
         if(converter)
         {
-            OSStatus err = ::ConvertFromUnicodeToText(converter, 2 * aStringLength, aString,
+            OSStatus err = ::ConvertFromUnicodeToText(converter, 2 * aStringLength,
+                (ConstUniCharArrayPtr) aString,
                 opts, 0, NULL, 0, NULL,
                 aBufferLength, &oBytesRead, &oActualLength,
                 (LogicalAddress) aBuffer);
@@ -256,7 +262,7 @@ PRBool nsUnicodeFontMappingMac::FontEnumCallback(const nsString& aFamily, PRBool
 }
 
 PRBool nsUnicodeFontMappingMac::ConvertUnicodeToGlyphs(short aFontNum, 
-    ConstUniCharArrayPtr aString, ByteCount aStringLength,
+    PRUnichar* aString, ByteCount aStringLength,
     char *aBuffer, ByteCount aBufferLength, ByteCount& oActualLength,
     ByteCount& oBytesRead, OptionBits opts)
 {

gfx/src/mac/nsUnicodeFontMappingMac.h

@@ -59,7 +59,7 @@ public:
    }
    PRBool Equals(const nsUnicodeFontMappingMac& anther);
    
-   PRBool ConvertUnicodeToGlyphs(short aFontNum, ConstUniCharArrayPtr aString,
+   PRBool ConvertUnicodeToGlyphs(short aFontNum, PRUnichar* aString,
        ByteCount aStringLength, char *aBuffer, ByteCount aBufferLength, 
        ByteCount& oActualLength, ByteCount& oBytesRead, OptionBits opts);
 

gfx/src/mac/nsUnicodeRenderingToolkit.cpp

@@ -50,6 +50,8 @@
 #include "nsMacUnicodeFontInfo.h"
 #include "nsICharRepresentable.h"
 
+#include <FixMath.h>
+
 
 #define BAD_FONT_NUM -1
 #define BAD_SCRIPT 0x7F