|
 |
c8c57f7 |
diff -up gambas-3.12.2/gb.pdf/src/CPdfDocument.cpp.poppler_0.73.0 gambas-3.12.2/gb.pdf/src/CPdfDocument.cpp
|
|
|
c8c57f7 |
--- gambas-3.12.2/gb.pdf/src/CPdfDocument.cpp.poppler_0.73.0 2019-01-12 09:47:15.000000000 -0500
|
|
|
c8c57f7 |
+++ gambas-3.12.2/gb.pdf/src/CPdfDocument.cpp 2019-04-10 16:34:17.895613483 -0400
|
|
|
c8c57f7 |
@@ -123,7 +123,7 @@ static void return_unicode_string(const
|
|
|
c8c57f7 |
gstr.append(buf, n);
|
|
|
c8c57f7 |
}
|
|
|
c8c57f7 |
|
|
|
c8c57f7 |
- GB.ReturnNewZeroString(gstr.getCString());
|
|
|
c8c57f7 |
+ GB.ReturnNewZeroString(gstr.c_str());
|
|
|
c8c57f7 |
}
|
|
|
c8c57f7 |
|
|
|
c8c57f7 |
|
|
|
c8c57f7 |
@@ -154,11 +154,11 @@ static void aux_return_string_info(void
|
|
|
c8c57f7 |
|
|
|
c8c57f7 |
if (goo_value->hasUnicodeMarker())
|
|
|
c8c57f7 |
{
|
|
|
c8c57f7 |
- GB.ConvString (&tmpstr,goo_value->getCString()+2,goo_value->getLength()-2,"UTF-16BE","UTF-8");
|
|
|
c8c57f7 |
+ GB.ConvString (&tmpstr,goo_value->c_str()+2,goo_value->getLength()-2,"UTF-16BE","UTF-8");
|
|
|
c8c57f7 |
GB.ReturnNewZeroString(tmpstr);
|
|
|
c8c57f7 |
}
|
|
|
c8c57f7 |
else
|
|
|
c8c57f7 |
- GB.ReturnNewString(goo_value->getCString(),goo_value->getLength());
|
|
|
c8c57f7 |
+ GB.ReturnNewString(goo_value->c_str(),goo_value->getLength());
|
|
|
c8c57f7 |
}
|
|
|
c8c57f7 |
#if ! POPPLER_VERSION_0_58
|
|
|
c8c57f7 |
dst.free();
|
|
|
c8c57f7 |
@@ -197,10 +197,10 @@ static void aux_return_date_info(void *_
|
|
|
c8c57f7 |
{
|
|
|
c8c57f7 |
goo = dst.getString();
|
|
|
c8c57f7 |
if (goo->hasUnicodeMarker())
|
|
|
c8c57f7 |
- GB.ConvString (&datestr,goo->getCString()+2,goo->getLength()-2,"UTF-16BE","UTF-8");
|
|
|
c8c57f7 |
+ GB.ConvString (&datestr,goo->c_str()+2,goo->getLength()-2,"UTF-16BE","UTF-8");
|
|
|
c8c57f7 |
else
|
|
|
c8c57f7 |
{
|
|
|
c8c57f7 |
- datestr = GB.NewString(goo->getCString(),goo->getLength());
|
|
|
c8c57f7 |
+ datestr = GB.NewString(goo->c_str(),goo->getLength());
|
|
|
c8c57f7 |
tofree=datestr;
|
|
|
c8c57f7 |
}
|
|
|
c8c57f7 |
|
|
|
c8c57f7 |
@@ -336,11 +336,11 @@ static char* aux_get_target_from_action(
|
|
|
c8c57f7 |
|
|
|
c8c57f7 |
if (tmp->hasUnicodeMarker())
|
|
|
c8c57f7 |
{
|
|
|
c8c57f7 |
- GB.ConvString (&uni,tmp->getCString()+2,tmp->getLength()-2,"UTF-16BE","UTF-8");
|
|
|
c8c57f7 |
+ GB.ConvString (&uni,tmp->c_str()+2,tmp->getLength()-2,"UTF-16BE","UTF-8");
|
|
|
c8c57f7 |
vl = GB.AddString(vl, uni, 0);
|
|
|
c8c57f7 |
}
|
|
|
c8c57f7 |
else
|
|
|
c8c57f7 |
- vl = GB.AddString(vl,tmp->getCString(),tmp->getLength());
|
|
|
c8c57f7 |
+ vl = GB.AddString(vl,tmp->c_str(),tmp->getLength());
|
|
|
c8c57f7 |
|
|
|
c8c57f7 |
|
|
|
c8c57f7 |
return vl;
|
|
|
c8c57f7 |
@@ -457,7 +457,7 @@ int32_t open_document (void *_object, ch
|
|
|
c8c57f7 |
if ( GB.LoadFile(sfile,lfile,&buf,&len) ) return -1;
|
|
|
c8c57f7 |
|
|
|
c8c57f7 |
#if POPPLER_VERSION_0_58
|
|
|
c8c57f7 |
- stream=new MemStream(buf,0,(Guint)len,std::move(obj));
|
|
|
c8c57f7 |
+ stream=new MemStream(buf,0,(unsigned int)len,std::move(obj));
|
|
|
c8c57f7 |
#else
|
|
|
c8c57f7 |
obj.initNull();
|
|
|
c8c57f7 |
stream=new MemStream(buf,0,(Guint)len,&obj);
|
|
|
c8c57f7 |
@@ -1018,7 +1018,7 @@ BEGIN_METHOD(PDFPAGE_select, GB_INTEGER
|
|
|
c8c57f7 |
return;
|
|
|
c8c57f7 |
}
|
|
|
c8c57f7 |
|
|
|
c8c57f7 |
- GB.ReturnNewString(str->getCString(),str->getLength());
|
|
|
c8c57f7 |
+ GB.ReturnNewString(str->c_str(),str->getLength());
|
|
|
c8c57f7 |
delete str;
|
|
|
c8c57f7 |
|
|
|
c8c57f7 |
END_METHOD
|
|
|
c8c57f7 |
@@ -1084,7 +1084,7 @@ BEGIN_PROPERTY (PDFPAGELINKDATA_paramete
|
|
|
c8c57f7 |
return;
|
|
|
c8c57f7 |
}
|
|
|
c8c57f7 |
|
|
|
c8c57f7 |
- GB.ReturnNewZeroString(((LinkLaunch*)THIS->action)->getParams()->getCString());
|
|
|
c8c57f7 |
+ GB.ReturnNewZeroString(((LinkLaunch*)THIS->action)->getParams()->c_str());
|
|
|
c8c57f7 |
|
|
|
c8c57f7 |
END_PROPERTY
|
|
|
c8c57f7 |
|