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

Merge pull request #19 from stephengaito/poppler-0.86.1

Browse Source 
Update to poppler-0.86.1
findDest now returns stg::unique_ptr and getURI no longer returns GooString but simply std::string
This commit is contained in:
stephengaito 2020-05-30 19:20:43 +01:00 committed by GitHub
commit ae063c3a44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildScripts/versionEnvs
View File

@ -9,9 +9,9 @@
#export POPPLER_VERSION=poppler-0.89.0 #export POPPLER_VERSION=poppler-0.89.0
#export POPPLER_VERSION=poppler-0.88.0 #export POPPLER_VERSION=poppler-0.88.0
#export POPPLER_VERSION=poppler-0.87.0 #export POPPLER_VERSION=poppler-0.87.0
#export POPPLER_VERSION=poppler-0.86.1 export POPPLER_VERSION=poppler-0.86.1
#export POPPLER_VERSION=poppler-0.86.0 #export POPPLER_VERSION=poppler-0.86.0
export POPPLER_VERSION=poppler-0.85.0 #export POPPLER_VERSION=poppler-0.85.0
#export POPPLER_VERSION=poppler-0.84.0 #export POPPLER_VERSION=poppler-0.84.0
#export POPPLER_VERSION=poppler-0.83.0 #export POPPLER_VERSION=poppler-0.83.0
#export POPPLER_VERSION=poppler-0.82.0 #export POPPLER_VERSION=poppler-0.82.0

30
pdf2htmlEX/src/HTMLRenderer/link.cc
View File

@ -34,7 +34,11 @@ using std::endl;
* The string will be put into a HTML attribute, surrounded by single quotes * The string will be put into a HTML attribute, surrounded by single quotes
* So pay attention to the characters used here * So pay attention to the characters used here
*/ */
static string get_linkdest_detail_str(LinkDest * dest, Catalog * catalog, int & pageno) static string get_linkdest_detail_str(
LinkDest * dest, // borrow the caller's std::unique_ptr
Catalog * catalog,
int & pageno
)
{ {
pageno = 0; pageno = 0;
if(dest->isPageRef()) if(dest->isPageRef())
@ -126,7 +130,10 @@ static string get_linkdest_detail_str(LinkDest * dest, Catalog * catalog, int &
return sout.str(); return sout.str();
} }
string HTMLRenderer::get_linkaction_str(const LinkAction * action, string & detail) string HTMLRenderer::get_linkaction_str(
const LinkAction * action,
string & detail
)
{ {
string dest_str; string dest_str;
detail = ""; detail = "";
@ -137,21 +144,26 @@ string HTMLRenderer::get_linkaction_str(const LinkAction * action, string & deta
{ {
case actionGoTo: case actionGoTo:
{ {
auto * real_action = dynamic_cast<const LinkGoTo*>(action); auto * real_action =
LinkDest * dest = nullptr; dynamic_cast<const LinkGoTo*>(action);
std::unique_ptr<LinkDest> dest = nullptr;
if(auto _ = real_action->getDest()) if(auto _ = real_action->getDest())
dest = _->copy(); dest = std::unique_ptr<LinkDest>( _->copy() );
else if (auto _ = real_action->getNamedDest()) else if (auto _ = real_action->getNamedDest())
dest = cur_catalog->findDest(_); dest = cur_catalog->findDest(_);
if(dest) if(dest)
{ {
int pageno = 0; int pageno = 0;
detail = get_linkdest_detail_str(dest, cur_catalog, pageno); detail = get_linkdest_detail_str(
dest.get(), cur_catalog, pageno
);
if(pageno > 0) if(pageno > 0)
{ {
dest_str = (char*)str_fmt("#%s%x", CSS::PAGE_FRAME_CN, pageno); dest_str = (char*)str_fmt(
"#%s%x", CSS::PAGE_FRAME_CN, pageno
);
} }
delete dest; dest.reset();
} }
} }
break; break;
@ -164,7 +176,7 @@ string HTMLRenderer::get_linkaction_str(const LinkAction * action, string & deta
{ {
auto * real_action = dynamic_cast<const LinkURI*>(action); auto * real_action = dynamic_cast<const LinkURI*>(action);
assert(real_action != nullptr); assert(real_action != nullptr);
dest_str = real_action->getURI()->toStr(); dest_str = real_action->getURI();
} }
break; break;
case actionLaunch: case actionLaunch: