diff --git a/ChangeLog b/ChangeLog index 5bf8ac6443f14e5069cf94eb2d83d9fc2a99c5e7..e18c095d9f67c71be99f40b50681a66239714a1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 2005-09-20 Albert Astals Cid * poppler/GlobalParams.[cc|h]: Merge from xpdf 3.01 * poppler/Link.cc: Merge from xpdf 3.01 + * poppler/UnicodeMap.cc: More grealloc -> greallocn + * poppler/UnicodeTypeTable.cc: Merge from xpdf 3.01 2005-09-20 Marco Pesenti Gritti diff --git a/poppler/UnicodeMap.cc b/poppler/UnicodeMap.cc index f76fce74279a1de40af6e899633d352671c38bab..381e4ca1fce6257e7757ed02822d0ada86a438be 100644 --- a/poppler/UnicodeMap.cc +++ b/poppler/UnicodeMap.cc @@ -69,7 +69,7 @@ UnicodeMap *UnicodeMap::parse(GooString *encodingNameA) { if (map->len == size) { size *= 2; map->ranges = (UnicodeMapRange *) - grealloc(map->ranges, size * sizeof(UnicodeMapRange)); + greallocn(map->ranges, size, sizeof(UnicodeMapRange)); } range = &map->ranges[map->len]; sscanf(tok1, "%x", &range->start); @@ -81,7 +81,7 @@ UnicodeMap *UnicodeMap::parse(GooString *encodingNameA) { if (map->eMapsLen == eMapsSize) { eMapsSize += 16; map->eMaps = (UnicodeMapExt *) - grealloc(map->eMaps, eMapsSize * sizeof(UnicodeMapExt)); + greallocn(map->eMaps, eMapsSize, sizeof(UnicodeMapExt)); } eMap = &map->eMaps[map->eMapsLen]; sscanf(tok1, "%x", &eMap->u); diff --git a/poppler/UnicodeTypeTable.cc b/poppler/UnicodeTypeTable.cc index 6421ef7bc93750342e3ae741fb202d2c0ae28990..b89604036395254ea2158d80290dfd3bd4a85431 100644 --- a/poppler/UnicodeTypeTable.cc +++ b/poppler/UnicodeTypeTable.cc @@ -1,8 +1,8 @@ //======================================================================== // -// UnicodeMapTables.cc +// UnicodeTypeTable.cc // -// Copyright 2003 Glyph & Cog, LLC +// Copyright 2004 Glyph & Cog, LLC // //========================================================================