Commit 9c7adb31 authored by Albert Astals Cid's avatar Albert Astals Cid

* poppler/UnicodeMap.cc: More grealloc -> greallocn

        * poppler/UnicodeTypeTable.cc: Merge from xpdf 3.01
parent 2c4c9b85
2005-09-20 Albert Astals Cid <aacid@kde.org> 2005-09-20 Albert Astals Cid <aacid@kde.org>
* poppler/GlobalParams.[cc|h]: Merge from xpdf 3.01 * poppler/GlobalParams.[cc|h]: Merge from xpdf 3.01
* poppler/Link.cc: 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 <mpg@redhat.com> 2005-09-20 Marco Pesenti Gritti <mpg@redhat.com>
......
...@@ -69,7 +69,7 @@ UnicodeMap *UnicodeMap::parse(GooString *encodingNameA) { ...@@ -69,7 +69,7 @@ UnicodeMap *UnicodeMap::parse(GooString *encodingNameA) {
if (map->len == size) { if (map->len == size) {
size *= 2; size *= 2;
map->ranges = (UnicodeMapRange *) map->ranges = (UnicodeMapRange *)
grealloc(map->ranges, size * sizeof(UnicodeMapRange)); greallocn(map->ranges, size, sizeof(UnicodeMapRange));
} }
range = &map->ranges[map->len]; range = &map->ranges[map->len];
sscanf(tok1, "%x", &range->start); sscanf(tok1, "%x", &range->start);
...@@ -81,7 +81,7 @@ UnicodeMap *UnicodeMap::parse(GooString *encodingNameA) { ...@@ -81,7 +81,7 @@ UnicodeMap *UnicodeMap::parse(GooString *encodingNameA) {
if (map->eMapsLen == eMapsSize) { if (map->eMapsLen == eMapsSize) {
eMapsSize += 16; eMapsSize += 16;
map->eMaps = (UnicodeMapExt *) map->eMaps = (UnicodeMapExt *)
grealloc(map->eMaps, eMapsSize * sizeof(UnicodeMapExt)); greallocn(map->eMaps, eMapsSize, sizeof(UnicodeMapExt));
} }
eMap = &map->eMaps[map->eMapsLen]; eMap = &map->eMaps[map->eMapsLen];
sscanf(tok1, "%x", &eMap->u); sscanf(tok1, "%x", &eMap->u);
......
//======================================================================== //========================================================================
// //
// UnicodeMapTables.cc // UnicodeTypeTable.cc
// //
// Copyright 2003 Glyph & Cog, LLC // Copyright 2004 Glyph & Cog, LLC
// //
//======================================================================== //========================================================================
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment