You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
100 lines
3.0 KiB
100 lines
3.0 KiB
6 years ago
|
--- gdcm-2.8.4/Applications/Cxx/gdcminfo.cxx
|
||
|
|
+++ gdcm-2.8.4/Applications/Cxx/gdcminfo.cxx
|
||
|
|
@@ -200,7 +200,7 @@ static std::string getInfoDate(Dict *inf
|
||
|
|
if (infoDict->lookup((char*)key, &obj)->isString())
|
||
|
|
#endif
|
||
|
|
{
|
||
|
|
- s = obj.getString()->getCString();
|
||
|
|
+ s = obj.getString()->c_str();
|
||
|
|
if (s[0] == 'D' && s[1] == ':')
|
||
|
|
{
|
||
|
|
s += 2;
|
||
|
|
@@ -256,7 +256,7 @@ static std::string getInfoString(Dict *i
|
||
|
|
{
|
||
|
|
Object obj;
|
||
|
|
const GooString *s1;
|
||
|
|
- GBool isUnicode;
|
||
|
|
+ bool isUnicode;
|
||
|
|
Unicode u;
|
||
|
|
char buf[8];
|
||
|
|
int i, n;
|
||
|
|
@@ -272,12 +272,12 @@ static std::string getInfoString(Dict *i
|
||
|
|
if ((s1->getChar(0) & 0xff) == 0xfe &&
|
||
|
|
(s1->getChar(1) & 0xff) == 0xff)
|
||
|
|
{
|
||
|
|
- isUnicode = gTrue;
|
||
|
|
+ isUnicode = true;
|
||
|
|
i = 2;
|
||
|
|
}
|
||
|
|
else
|
||
|
|
{
|
||
|
|
- isUnicode = gFalse;
|
||
|
|
+ isUnicode = false;
|
||
|
|
i = 0;
|
||
|
|
}
|
||
|
|
while (i < obj.getString()->getLength())
|
||
|
|
@@ -523,10 +523,10 @@ static int ProcessOneFile( std::string c
|
||
|
|
int pages = doc->getNumPages();
|
||
|
|
const char *encrypted = doc->isEncrypted() ? "yes" : "no";
|
||
|
|
// printf("yes (print:%s copy:%s change:%s addNotes:%s)\n",
|
||
|
|
- // doc->okToPrint(gTrue) ? "yes" : "no",
|
||
|
|
- // doc->okToCopy(gTrue) ? "yes" : "no",
|
||
|
|
- // doc->okToChange(gTrue) ? "yes" : "no",
|
||
|
|
- // doc->okToAddNotes(gTrue) ? "yes" : "no");
|
||
|
|
+ // doc->okToPrint(true) ? "yes" : "no",
|
||
|
|
+ // doc->okToCopy(true) ? "yes" : "no",
|
||
|
|
+ // doc->okToChange(true) ? "yes" : "no",
|
||
|
|
+ // doc->okToAddNotes(true) ? "yes" : "no");
|
||
|
|
|
||
|
|
// print linearization info
|
||
|
|
const char *optimized = doc->isLinearized() ? "yes" : "no";
|
||
|
|
--- gdcm-2.8.4/Applications/Cxx/gdcmpdf.cxx
|
||
|
|
+++ gdcm-2.8.4/Applications/Cxx/gdcmpdf.cxx
|
||
|
|
@@ -49,7 +49,7 @@ static std::string getInfoDate(Dict *inf
|
||
|
|
if (infoDict->lookup((char*)key, &obj)->isString())
|
||
|
|
#endif
|
||
|
|
{
|
||
|
|
- s = obj.getString()->getCString();
|
||
|
|
+ s = obj.getString()->c_str();
|
||
|
|
if (s[0] == 'D' && s[1] == ':')
|
||
|
|
{
|
||
|
|
s += 2;
|
||
|
|
@@ -101,11 +101,11 @@ static std::string getInfoDate(Dict *inf
|
||
|
|
return out;
|
||
|
|
}
|
||
|
|
|
||
|
|
-static std::string getInfoString(Dict *infoDict, const char *key, UnicodeMap *uMap, GBool & unicode)
|
||
|
|
+static std::string getInfoString(Dict *infoDict, const char *key, UnicodeMap *uMap, bool & unicode)
|
||
|
|
{
|
||
|
|
Object obj;
|
||
|
|
const GooString *s1;
|
||
|
|
- GBool isUnicode = gFalse;
|
||
|
|
+ bool isUnicode = false;
|
||
|
|
Unicode u;
|
||
|
|
char buf[8];
|
||
|
|
int i, n;
|
||
|
|
@@ -121,12 +121,12 @@ static std::string getInfoString(Dict *i
|
||
|
|
if ((s1->getChar(0) & 0xff) == 0xfe &&
|
||
|
|
(s1->getChar(1) & 0xff) == 0xff)
|
||
|
|
{
|
||
|
|
- isUnicode = gTrue;
|
||
|
|
+ isUnicode = true;
|
||
|
|
i = 2;
|
||
|
|
}
|
||
|
|
else
|
||
|
|
{
|
||
|
|
- isUnicode = gFalse;
|
||
|
|
+ isUnicode = false;
|
||
|
|
i = 0;
|
||
|
|
}
|
||
|
|
while (i < obj.getString()->getLength())
|
||
|
|
@@ -397,7 +397,7 @@ http://msdn.microsoft.com/en-us/library/
|
||
|
|
std::string creationdate;
|
||
|
|
std::string moddate;
|
||
|
|
|
||
|
|
- GBool isUnicode = gFalse;
|
||
|
|
+ bool isUnicode = false;
|
||
|
|
if (doc->isOk())
|
||
|
|
{
|
||
|
|
#ifdef LIBPOPPLER_NEW_OBJECT_API
|