--- a/jdk/src/share/native/sun/font/layout/CanonShaping.h Mon Sep 28 11:52:22 2009 -0700
+++ b/jdk/src/share/native/sun/font/layout/CanonShaping.h Tue Sep 29 14:06:13 2009 -0700
@@ -34,20 +34,22 @@
#include "LETypes.h"
+U_NAMESPACE_BEGIN
+
class LEGlyphStorage;
-class CanonShaping
+class CanonShaping /* not : public UObject because all members are static */
{
public:
static const le_uint8 glyphSubstitutionTable[];
static const le_uint8 glyphDefinitionTable[];
- static void reorderMarks(const LEUnicode *inChars, le_int32 charCount,
- le_bool rightToLeft, LEUnicode *outChars, LEGlyphStorage &glyphStorage);
+ static void reorderMarks(const LEUnicode *inChars, le_int32 charCount, le_bool rightToLeft,
+ LEUnicode *outChars, LEGlyphStorage &glyphStorage);
private:
- static void sortMarks(le_int32 *indices, const le_int32 *combiningClasses,
- le_int32 index, le_int32 limit);
+ static void sortMarks(le_int32 *indices, const le_int32 *combiningClasses, le_int32 index, le_int32 limit);
};
+U_NAMESPACE_END
#endif