ICU-8.11.tar.gz

[apple/icu.git] / icuSources / test / letest / FontTableCache.cpp

diff --git a/icuSources/test/letest/FontTableCache.cpp b/icuSources/test/letest/FontTableCache.cpp
index 84d76041eaf6e50415175ccb62de2146b44568a6..cf28de2228b21f5c5e680e097f7b31568b8aed6e 100644 (file)
--- a/icuSources/test/letest/FontTableCache.cpp
+++ b/icuSources/test/letest/FontTableCache.cpp
@@ -1,12 +1,13 @@
 /*
  **********************************************************************
- *   Copyright (C) 2003, International Business Machines
+ *   Copyright (C) 2003-2006, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  **********************************************************************
  */
 
 #include "layout/LETypes.h"
 
+#include "letest.h"
 #include "FontTableCache.h"
 
 #define TABLE_CACHE_INIT 5
@@ -21,7 +22,7 @@ struct FontTableCacheEntry
 FontTableCache::FontTableCache()
     : fTableCacheCurr(0), fTableCacheSize(TABLE_CACHE_INIT)
 {
-    fTableCache = LE_NEW_ARRAY(FontTableCacheEntry, fTableCacheSize);
+    fTableCache = NEW_ARRAY(FontTableCacheEntry, fTableCacheSize);
 
     if (fTableCache == NULL) {
         fTableCacheSize = 0;
@@ -37,13 +38,15 @@ FontTableCache::FontTableCache()
 FontTableCache::~FontTableCache()
 {
     for (int i = fTableCacheCurr - 1; i >= 0; i -= 1) {
-        LE_DELETE_ARRAY(fTableCache[i].table);
+        DELETE_ARRAY(fTableCache[i].table);
 
         fTableCache[i].tag   = 0;
         fTableCache[i].table = NULL;
     }
 
     fTableCacheCurr = 0;
+
+    DELETE_ARRAY(fTableCache);
 }
 
 const void *FontTableCache::find(LETag tableTag) const
@@ -66,7 +69,7 @@ void FontTableCache::add(LETag tableTag, const void *table)
     if (fTableCacheCurr >= fTableCacheSize) {
         le_int32 newSize = fTableCacheSize + TABLE_CACHE_GROW;
 
-        fTableCache = (FontTableCacheEntry *) LE_GROW_ARRAY(fTableCache, newSize);
+        fTableCache = (FontTableCacheEntry *) GROW_ARRAY(fTableCache, newSize);
 
         for (le_int32 i = fTableCacheSize; i < newSize; i += 1) {
             fTableCache[i].tag   = 0;