File pdfedit-fix-ambiguous.patch of Package pdfedit
diff -Naru pdfedit-0.4.5-build_orig/pdfedit-0.4.5/src/gui/annotdialog.cc pdfedit-0.4.5-build/pdfedit-0.4.5/src/gui/annotdialog.cc
--- pdfedit-0.4.5-build_orig/pdfedit-0.4.5/src/gui/annotdialog.cc 2017-12-07 09:09:15.731648647 +0900
+++ pdfedit-0.4.5-build/pdfedit-0.4.5/src/gui/annotdialog.cc 2025-02-28 18:47:55.538118365 +0900
@@ -309,7 +309,7 @@
// creates CAnnotation instance with factory, this should
// use TextAnnotInitializer with values which we have
// set above
- shared_ptr<CAnnotation> annotInstance=CAnnotation::createAnnotation(rect, "Text");
+ boost::shared_ptr<CAnnotation> annotInstance=CAnnotation::createAnnotation(rect, "Text");
page.get()->addAnnotation(annotInstance);
@@ -342,7 +342,7 @@
// creates CAnnotation instance with factory, this should
// use LinkAnnotInitializer with values which we have
// set above
- shared_ptr<CAnnotation> annotInstance=CAnnotation::createAnnotation(rect, "Link");
+ boost::shared_ptr<CAnnotation> annotInstance=CAnnotation::createAnnotation(rect, "Link");
page.get()->addAnnotation(annotInstance);
// sets back default values
diff -Naru pdfedit-0.4.5-build_orig/pdfedit-0.4.5/src/gui/base.cc pdfedit-0.4.5-build/pdfedit-0.4.5/src/gui/base.cc
--- pdfedit-0.4.5-build_orig/pdfedit-0.4.5/src/gui/base.cc 2017-12-07 09:09:15.731648647 +0900
+++ pdfedit-0.4.5-build/pdfedit-0.4.5/src/gui/base.cc 2025-02-28 19:36:29.841666278 +0900
@@ -616,7 +616,7 @@
// Save it
ofstream of;
- of.open (outFile);
+ of.open ((const char *) outFile);
of << XmlOutputBuilder::xml (out) << flush;
of.close();
diff -Naru pdfedit-0.4.5-build_orig/pdfedit-0.4.5/src/gui/pdfeditwindow.cc pdfedit-0.4.5-build/pdfedit-0.4.5/src/gui/pdfeditwindow.cc
--- pdfedit-0.4.5-build_orig/pdfedit-0.4.5/src/gui/pdfeditwindow.cc 2017-12-07 09:09:15.919648648 +0900
+++ pdfedit-0.4.5-build/pdfedit-0.4.5/src/gui/pdfeditwindow.cc 2025-02-28 19:17:05.225939639 +0900
@@ -418,7 +418,7 @@
guiPrintDbg(debug::DBG_DBG,"Removed reference to deleted tree item");
selectedTreeItem=NULL;
//Unset from property editor
- prop->setObject(NULL);
+ prop->unsetObject();
//Selection have probably just changed
//base->call("onTreeSelectionChange");
}
diff -Naru pdfedit-0.4.5-build_orig/pdfedit-0.4.5/src/kernel/cpdf.cc pdfedit-0.4.5-build/pdfedit-0.4.5/src/kernel/cpdf.cc
--- pdfedit-0.4.5-build_orig/pdfedit-0.4.5/src/kernel/cpdf.cc 2017-12-07 09:09:15.975648648 +0900
+++ pdfedit-0.4.5-build/pdfedit-0.4.5/src/kernel/cpdf.cc 2025-02-28 18:30:58.776004467 +0900
@@ -2041,7 +2041,7 @@
// prevent from endless loops for cyclick referencies
// returned reference must be same as registered one
refEntry->second = STATE_RESOLVING;
- IndiRef addIndiRef=addProperty(followedIp, refEntry->first, container, followedIp);
+ IndiRef addIndiRef=addProperty(followedIp, refEntry->first, container, (bool)followedIp);
assert(addIndiRef==refEntry->first);
refEntry->second = STATE_RESOLVED;
}
diff -Naru pdfedit-0.4.5-build_orig/pdfedit-0.4.5/src/kernel/pdfoperators.cc pdfedit-0.4.5-build/pdfedit-0.4.5/src/kernel/pdfoperators.cc
--- pdfedit-0.4.5-build_orig/pdfedit-0.4.5/src/kernel/pdfoperators.cc 2017-12-07 09:09:15.983648648 +0900
+++ pdfedit-0.4.5-build/pdfedit-0.4.5/src/kernel/pdfoperators.cc 2025-02-28 17:42:01.905875313 +0900
@@ -283,7 +283,7 @@
}
else if (name == "TJ")
{
- shared_ptr<IProperty> op = ops[0];
+ boost::shared_ptr<IProperty> op = ops[0];
if (!isArray(op) || ops.size() != 1)
{
utilsPrintDbg(debug::DBG_WARN, "Bad operands for TJ operator: ops[type="<< op->getType() <<" size="<<ops.size()<<"]");
@@ -294,10 +294,10 @@
// formatting and add the given string as an only one
// parameter in the array.
if (isArray(op)) {
- shared_ptr<CArray> array = IProperty::getSmartCObjectPtr<CArray>(op);
+ boost::shared_ptr<CArray> array = IProperty::getSmartCObjectPtr<CArray>(op);
while (array->getPropertyCount() > 1)
array->delProperty(array->getPropertyCount()-1);
- shared_ptr<IProperty> p = array->getProperty(0);
+ boost::shared_ptr<IProperty> p = array->getProperty(0);
setValueToSimple<CString, pString>(p, codeStr);
}else
setValueToSimple<CString, pString>(ops[0], codeStr);
diff -Naru pdfedit-0.4.5-build_orig/pdfedit-0.4.5/src/kernel/pdfwriter.cc pdfedit-0.4.5-build/pdfedit-0.4.5/src/kernel/pdfwriter.cc
--- pdfedit-0.4.5-build_orig/pdfedit-0.4.5/src/kernel/pdfwriter.cc 2017-12-07 09:09:15.983648648 +0900
+++ pdfedit-0.4.5-build/pdfedit-0.4.5/src/kernel/pdfwriter.cc 2025-02-28 18:28:43.768134099 +0900
@@ -427,7 +427,7 @@
// contain binary data
if(obj.isStream())
{
- shared_ptr<FilterStreamWriter> filter = FilterStreamWriter::getInstance(obj);
+ boost::shared_ptr<FilterStreamWriter> filter = FilterStreamWriter::getInstance(obj);
assert(filter->supportObject(obj));
filter->compress(obj, ref, stream);
}else
@@ -502,11 +502,11 @@
size_t index=0;
// creates context for observers
- shared_ptr<OperationScope> scope(new OperationScope());
+ boost::shared_ptr<OperationScope> scope(new OperationScope());
scope->total=objectList.size();
scope->task=CONTENT;
- shared_ptr<ChangeContext> context(new ChangeContext(scope));
- shared_ptr<OperationStep> newValue(new OperationStep());
+ boost::shared_ptr<ChangeContext> context(new ChangeContext(scope));
+ boost::shared_ptr<OperationStep> newValue(new OperationStep());
// prepares offTable and writes objects
for(i=objectList.begin(); i!=objectList.end(); ++i, index++)
diff -Naru pdfedit-0.4.5-build_orig/pdfedit-0.4.5/src/kernel/stateupdater.cc pdfedit-0.4.5-build/pdfedit-0.4.5/src/kernel/stateupdater.cc
--- pdfedit-0.4.5-build_orig/pdfedit-0.4.5/src/kernel/stateupdater.cc 2025-02-28 17:21:51.680639445 +0900
+++ pdfedit-0.4.5-build/pdfedit-0.4.5/src/kernel/stateupdater.cc 2025-02-28 17:48:18.287622363 +0900
@@ -1236,7 +1236,7 @@
{ // Convert it to real
double dval = 0.0;
dval = IProperty::getSmartCObjectPtr<CInt>(*it)->getValue();
- shared_ptr<IProperty> pIp (new CReal (dval));
+ boost::shared_ptr<IProperty> pIp (new CReal (dval));
std::replace (operands.begin(), operands.end(), *it, pIp);
}
}
