DenysMedvid/pdf2htmlEX
1
0
Fork 0
mirror of https://github.com/pdf2htmlEX/pdf2htmlEX.git synced 2024-12-22 04:50:09 +00:00
Code

add encoding confliction warning in the 2nd phase

Browse Source
This commit is contained in:
Lu Wang 2012-09-08 10:24:04 +08:00
parent b9e954eccb
commit 5cf7f2fdf2
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/HTMLRenderer/text.cc
View File

@ -214,7 +214,6 @@ void HTMLRenderer::embed_font(const path & filepath, GfxFont * font, FontInfo &
else
{
// move the slot such that it's consistent with the encoding seen in PDF
unordered_set<string> nameset;
bool name_conflict_warned = false;
@ -284,10 +283,12 @@ void HTMLRenderer::embed_font(const path & filepath, GfxFont * font, FontInfo &
{
unordered_set<int> codeset;
bool name_conflict_warned = false;
auto ctu = font->getToUnicode();
memset(cur_mapping, 0, maxcode * sizeof(int32_t));
if(code2GID)
maxcode = min(maxcode, code2GID_len - 1);
@ -322,7 +323,19 @@ void HTMLRenderer::embed_font(const path & filepath, GfxFont * font, FontInfo &
u = unicode_from_font(i, font);
}
cur_mapping[k] = u;
if(codeset.insert(u).second)
{
cur_mapping[k] = u;
}
else
{
if(!name_conflict_warned)
{
name_conflict_warned = true;
//TODO: may be resolved using advanced font properties?
cerr << "Warning: encoding confliction detected in font: " << hex << info.id << dec << endl;
}
}
}
ff_reencode_raw(cur_mapping, max_key + 1, 1);