ICU-6.2.10.tar.gz

[apple/icu.git] / icuSources / layout / LEFontInstance.cpp

diff --git a/icuSources/layout/LEFontInstance.cpp b/icuSources/layout/LEFontInstance.cpp
index 31641718f18a1024cc68a98a796da2f189658a91..0bbb627946f4b62f8ac422af4d2c010f41eee412 100644 (file)
--- a/icuSources/layout/LEFontInstance.cpp
+++ b/icuSources/layout/LEFontInstance.cpp
@@ -1,7 +1,7 @@
 /*
  *******************************************************************************
  *
 /*
  *******************************************************************************
  *

- *   Copyright (C) 1999-2003, International Business Machines
+ *   Copyright (C) 1999-2004, International Business Machines

  *   Corporation and others.  All Rights Reserved.
  *
  *******************************************************************************
  *   Corporation and others.  All Rights Reserved.
  *
  *******************************************************************************


@@ -14,10 +14,11 @@
 #include "LETypes.h"
 #include "LEScripts.h"
 #include "LEFontInstance.h"
 #include "LETypes.h"
 #include "LEScripts.h"
 #include "LEFontInstance.h"

+#include "LEGlyphStorage.h"

 
 U_NAMESPACE_BEGIN
 
 
 U_NAMESPACE_BEGIN
 

-const char LEFontInstance::fgClassID=0;
+UOBJECT_DEFINE_RTTI_IMPLEMENTATION(LEFontInstance)

 
 const LEFontInstance *LEFontInstance::getSubFont(const LEUnicode chars[], le_int32 *offset, le_int32 limit,
                                                        le_int32 script, LEErrorCode &success) const
 
 const LEFontInstance *LEFontInstance::getSubFont(const LEUnicode chars[], le_int32 *offset, le_int32 limit,
                                                        le_int32 script, LEErrorCode &success) const


@@ -36,7 +37,7 @@ const LEFontInstance *LEFontInstance::getSubFont(const LEUnicode chars[], le_int
 }
 
 void LEFontInstance::mapCharsToGlyphs(const LEUnicode chars[], le_int32 offset, le_int32 count,
 }
 
 void LEFontInstance::mapCharsToGlyphs(const LEUnicode chars[], le_int32 offset, le_int32 count,

-                                      le_bool reverse, const LECharMapper *mapper, LEGlyphID glyphs[]) const
+                                      le_bool reverse, const LECharMapper *mapper, LEGlyphStorage &glyphStorage) const

 {
     le_int32 i, out = 0, dir = 1;
 
 {
     le_int32 i, out = 0, dir = 1;
 


@@ -57,11 +58,11 @@ void LEFontInstance::mapCharsToGlyphs(const LEUnicode chars[], le_int32 offset,
             }
         }
 
             }
         }
 

-        glyphs[out] = mapCharToGlyph(code, mapper);
+        glyphStorage[out] = mapCharToGlyph(code, mapper);

 
         if (code >= 0x10000) {
             i += 1;
 
         if (code >= 0x10000) {
             i += 1;

-            glyphs[out += dir] = 0xFFFF;
+            glyphStorage[out += dir] = 0xFFFF;

         }
     }
 }
         }
     }
 }