ICU-531.48.tar.gz

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

diff --git a/icuSources/layout/GXLayoutEngine.cpp b/icuSources/layout/GXLayoutEngine.cpp
index fbd366775eb59779d8e4349e313c95f674c7616e..c16229e3880fc28f56aac2749eb984b94307334c 100644 (file)
--- a/icuSources/layout/GXLayoutEngine.cpp
+++ b/icuSources/layout/GXLayoutEngine.cpp
@@ -1,7 +1,7 @@
 
 /*
  *
 
 /*
  *

- * (C) Copyright IBM Corp. 1998-2004 - All Rights Reserved
+ * (C) Copyright IBM Corp. 1998-2013 - All Rights Reserved

  *
  */
 
  *
  */
 


@@ -16,9 +16,10 @@ U_NAMESPACE_BEGIN
 
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(GXLayoutEngine)
 
 
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(GXLayoutEngine)
 

-GXLayoutEngine::GXLayoutEngine(const LEFontInstance *fontInstance, le_int32 scriptCode, le_int32 languageCode, const MorphTableHeader *morphTable) 
-    : LayoutEngine(fontInstance, scriptCode, languageCode), fMorphTable(morphTable)
+  GXLayoutEngine::GXLayoutEngine(const LEFontInstance *fontInstance, le_int32 scriptCode, le_int32 languageCode, const LEReferenceTo<MorphTableHeader> &morphTable, LEErrorCode &success) 
+    : LayoutEngine(fontInstance, scriptCode, languageCode, 0, success), fMorphTable(morphTable)

 {
 {

+  fMorphTable.orphan();

     // nothing else to do?
 }
 
     // nothing else to do?
 }
 


@@ -45,7 +46,7 @@ le_int32 GXLayoutEngine::computeGlyphs(const LEUnicode chars[], le_int32 offset,
         return 0;
     }
 
         return 0;
     }
 

-    fMorphTable->process(glyphStorage);
+    fMorphTable->process(fMorphTable, glyphStorage, success);

 
     return count;
 }
 
     return count;
 }