|
|
90aef94 |
--- gambas-3.11.4/gb.pdf/src/CPdfDocument.cpp
|
|
|
90aef94 |
+++ gambas-3.11.4/gb.pdf/src/CPdfDocument.cpp
|
|
|
90aef94 |
@@ -120,7 +120,7 @@ static void return_unicode_string(const
|
|
|
90aef94 |
gstr.append(buf, n);
|
|
|
90aef94 |
}
|
|
|
90aef94 |
|
|
|
90aef94 |
- GB.ReturnNewZeroString(gstr.getCString());
|
|
|
90aef94 |
+ GB.ReturnNewZeroString(gstr.c_str());
|
|
|
90aef94 |
}
|
|
|
90aef94 |
|
|
|
90aef94 |
|
|
|
90aef94 |
@@ -151,11 +151,11 @@ static void aux_return_string_info(void
|
|
|
90aef94 |
|
|
|
90aef94 |
if (goo_value->hasUnicodeMarker())
|
|
|
90aef94 |
{
|
|
|
90aef94 |
- GB.ConvString (&tmpstr,goo_value->getCString()+2,goo_value->getLength()-2,"UTF-16BE","UTF-8");
|
|
|
90aef94 |
+ GB.ConvString (&tmpstr,goo_value->c_str()+2,goo_value->getLength()-2,"UTF-16BE","UTF-8");
|
|
|
90aef94 |
GB.ReturnNewZeroString(tmpstr);
|
|
|
90aef94 |
}
|
|
|
90aef94 |
else
|
|
|
90aef94 |
- GB.ReturnNewString(goo_value->getCString(),goo_value->getLength());
|
|
|
90aef94 |
+ GB.ReturnNewString(goo_value->c_str(),goo_value->getLength());
|
|
|
90aef94 |
}
|
|
|
90aef94 |
#if ! POPPLER_VERSION_0_58
|
|
|
90aef94 |
dst.free();
|
|
|
90aef94 |
@@ -194,10 +194,10 @@ static void aux_return_date_info(void *_
|
|
|
90aef94 |
{
|
|
|
90aef94 |
goo = dst.getString();
|
|
|
90aef94 |
if (goo->hasUnicodeMarker())
|
|
|
90aef94 |
- GB.ConvString (&datestr,goo->getCString()+2,goo->getLength()-2,"UTF-16BE","UTF-8");
|
|
|
90aef94 |
+ GB.ConvString (&datestr,goo->c_str()+2,goo->getLength()-2,"UTF-16BE","UTF-8");
|
|
|
90aef94 |
else
|
|
|
90aef94 |
{
|
|
|
90aef94 |
- datestr = GB.NewString(goo->getCString(),goo->getLength());
|
|
|
90aef94 |
+ datestr = GB.NewString(goo->c_str(),goo->getLength());
|
|
|
90aef94 |
tofree=datestr;
|
|
|
90aef94 |
}
|
|
|
90aef94 |
|
|
|
90aef94 |
@@ -333,11 +333,11 @@ static char* aux_get_target_from_action(
|
|
|
90aef94 |
|
|
|
90aef94 |
if (tmp->hasUnicodeMarker())
|
|
|
90aef94 |
{
|
|
|
90aef94 |
- GB.ConvString (&uni,tmp->getCString()+2,tmp->getLength()-2,"UTF-16BE","UTF-8");
|
|
|
90aef94 |
+ GB.ConvString (&uni,tmp->c_str()+2,tmp->getLength()-2,"UTF-16BE","UTF-8");
|
|
|
90aef94 |
vl = GB.AddString(vl, uni, 0);
|
|
|
90aef94 |
}
|
|
|
90aef94 |
else
|
|
|
90aef94 |
- vl = GB.AddString(vl,tmp->getCString(),tmp->getLength());
|
|
|
90aef94 |
+ vl = GB.AddString(vl,tmp->c_str(),tmp->getLength());
|
|
|
90aef94 |
|
|
|
90aef94 |
|
|
|
90aef94 |
return vl;
|
|
|
90aef94 |
@@ -454,7 +454,7 @@ int32_t open_document (void *_object, ch
|
|
|
90aef94 |
if ( GB.LoadFile(sfile,lfile,&buf,&len) ) return -1;
|
|
|
90aef94 |
|
|
|
90aef94 |
#if POPPLER_VERSION_0_58
|
|
|
90aef94 |
- stream=new MemStream(buf,0,(Guint)len,std::move(obj));
|
|
|
90aef94 |
+ stream=new MemStream(buf,0,(unsigned int)len,std::move(obj));
|
|
|
90aef94 |
#else
|
|
|
90aef94 |
obj.initNull();
|
|
|
90aef94 |
stream=new MemStream(buf,0,(Guint)len,&obj);
|
|
|
90aef94 |
@@ -478,7 +478,7 @@ int32_t open_document (void *_object, ch
|
|
|
90aef94 |
THIS->len=len;
|
|
|
90aef94 |
|
|
|
90aef94 |
white[0] = 0xFF; white[1] = 0xFF; white[2] = 0xFF;
|
|
|
90aef94 |
- THIS->dev=new SplashOutputDev(splashModeRGB8, 3, gFalse, white);
|
|
|
90aef94 |
+ THIS->dev=new SplashOutputDev(splashModeRGB8, 3, false, white);
|
|
|
90aef94 |
|
|
|
90aef94 |
#if POPPLER_VERSION_0_20
|
|
|
90aef94 |
THIS->dev->startDoc(THIS->doc);
|
|
|
90aef94 |
@@ -922,10 +922,10 @@ static uint32_t *get_page_data(CPDFDOCUM
|
|
|
90aef94 |
#if POPPLER_VERSION_0_20
|
|
|
90aef94 |
THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale,
|
|
|
90aef94 |
rotation,
|
|
|
90aef94 |
- gFalse,
|
|
|
90aef94 |
- gTrue,
|
|
|
90aef94 |
+ false,
|
|
|
90aef94 |
+ true,
|
|
|
90aef94 |
x,y,w,h,
|
|
|
90aef94 |
- gFalse);
|
|
|
90aef94 |
+ false);
|
|
|
90aef94 |
#else
|
|
|
90aef94 |
THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale,
|
|
|
90aef94 |
rotation,
|
|
|
90aef94 |
@@ -994,8 +994,8 @@ BEGIN_METHOD(PDFPAGE_select, GB_INTEGER
|
|
|
90aef94 |
h = VARGOPT(H, (int32_t)THIS->page->getMediaHeight());
|
|
|
90aef94 |
|
|
|
90aef94 |
#if POPPLER_VERSION_0_20
|
|
|
90aef94 |
- dev = new TextOutputDev (NULL, gTrue, 0, gFalse, gFalse);
|
|
|
90aef94 |
- gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse, NULL, NULL);
|
|
|
90aef94 |
+ dev = new TextOutputDev (NULL, true, 0, false, false);
|
|
|
90aef94 |
+ gfx = THIS->page->createGfx(dev,72.0,72.0,0,false,true,-1, -1, -1, -1, false, NULL, NULL);
|
|
|
90aef94 |
#else
|
|
|
90aef94 |
dev = new TextOutputDev (NULL, gTrue, gFalse, gFalse);
|
|
|
90aef94 |
gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse,THIS->doc->getCatalog (),NULL, NULL, NULL, NULL);
|
|
|
90aef94 |
@@ -1015,7 +1015,7 @@ BEGIN_METHOD(PDFPAGE_select, GB_INTEGER
|
|
|
90aef94 |
return;
|
|
|
90aef94 |
}
|
|
|
90aef94 |
|
|
|
90aef94 |
- GB.ReturnNewString(str->getCString(),str->getLength());
|
|
|
90aef94 |
+ GB.ReturnNewString(str->c_str(),str->getLength());
|
|
|
90aef94 |
delete str;
|
|
|
90aef94 |
|
|
|
90aef94 |
END_METHOD
|
|
|
90aef94 |
@@ -1081,7 +1081,7 @@ BEGIN_PROPERTY (PDFPAGELINKDATA_paramete
|
|
|
90aef94 |
return;
|
|
|
90aef94 |
}
|
|
|
90aef94 |
|
|
|
90aef94 |
- GB.ReturnNewZeroString(((LinkLaunch*)THIS->action)->getParams()->getCString());
|
|
|
90aef94 |
+ GB.ReturnNewZeroString(((LinkLaunch*)THIS->action)->getParams()->c_str());
|
|
|
90aef94 |
|
|
|
90aef94 |
END_PROPERTY
|
|
|
90aef94 |
|
|
|
90aef94 |
@@ -1226,7 +1226,7 @@ BEGIN_METHOD (PDFPAGE_find,GB_STRING Tex
|
|
|
90aef94 |
|
|
|
90aef94 |
count = 0;
|
|
|
90aef94 |
#if POPPLER_VERSION_0_20
|
|
|
90aef94 |
- while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,gFalse,&x0,&y0,&x1,&y1))
|
|
|
90aef94 |
+ while (textdev->findText (block,nlen,false,true,true,false,sensitive,false,false,&x0,&y0,&x1,&y1))
|
|
|
90aef94 |
#else
|
|
|
90aef94 |
while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,&x0,&y0,&x1,&y1))
|
|
|
90aef94 |
#endif
|