diff options
Diffstat (limited to 'editors/pdfedit/files/patch-src-kernel-cpageannots.cc')
| -rw-r--r-- | editors/pdfedit/files/patch-src-kernel-cpageannots.cc | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/editors/pdfedit/files/patch-src-kernel-cpageannots.cc b/editors/pdfedit/files/patch-src-kernel-cpageannots.cc index 3d7e87d13a98..7ff35ee21ad7 100644 --- a/editors/pdfedit/files/patch-src-kernel-cpageannots.cc +++ b/editors/pdfedit/files/patch-src-kernel-cpageannots.cc @@ -1,6 +1,6 @@ ---- src/kernel/cpageannots.cc.orig 2016-06-12 03:18:12.132253000 +0900 -+++ src/kernel/cpageannots.cc 2016-06-12 03:21:24.901602000 +0900 -@@ -180,24 +180,24 @@ +--- src/kernel/cpageannots.cc.orig 2009-07-27 08:18:10 UTC ++++ src/kernel/cpageannots.cc +@@ -180,24 +180,24 @@ namespace { typedef struct reg_annots { @@ -29,7 +29,7 @@ if(isRef(annots)) { egister(annots, _prop_wd); -@@ -237,7 +237,7 @@ +@@ -237,7 +237,7 @@ namespace { // // void @@ -38,7 +38,7 @@ { kernelPrintDbg(DBG_DBG, ""); -@@ -251,7 +251,7 @@ +@@ -251,7 +251,7 @@ CPageAnnots::reg_observers(shared_ptr<IP REGISTER_SHAREDPTR_OBSERVER(_page->getDictionary(), _prop_wd); if(_page->getDictionary()->containsProperty(Specification::Page::ANNOTS)) { @@ -47,7 +47,7 @@ reg_observers(annotsProp); } } -@@ -275,7 +275,7 @@ +@@ -275,7 +275,7 @@ CPageAnnots::unreg_observers(boost::shar UNREGISTER_SHAREDPTR_OBSERVER(_page->getDictionary(), _prop_wd); if(_page->getDictionary()->containsProperty(Specification::Page::ANNOTS)) { @@ -56,7 +56,7 @@ unreg_observers(annotsProp); } } -@@ -299,12 +299,12 @@ +@@ -299,12 +299,12 @@ CPageAnnots::consolidate(boost::shared_p { try { @@ -71,7 +71,7 @@ if(annot->getDictionary()==annotDict) { kernelPrintDbg(debug::DBG_DBG, "Annotation maintaining oldValue found and removed. Invalidating annotation"); -@@ -334,11 +334,11 @@ +@@ -334,11 +334,11 @@ CPageAnnots::consolidate(boost::shared_p { try { @@ -85,7 +85,7 @@ _annotations.push_back(annot); }catch(ElementBadTypeException & ) { -@@ -362,7 +362,7 @@ +@@ -362,7 +362,7 @@ CPageAnnots::add(boost::shared_ptr<CAnno // gets Annots array from page dictionary. If no found, creates it. If bad // typed, throws an exception @@ -94,7 +94,7 @@ try { annotsArray=getAnnotsArray(_page->getDictionary()); -@@ -395,7 +395,7 @@ +@@ -395,7 +395,7 @@ CPageAnnots::add(boost::shared_ptr<CAnno IndiRef annotRef=pdf->addIndirectProperty(annot->getDictionary()); // gets added annotation dictionary @@ -103,7 +103,7 @@ pdf->getIndirectProperty(annotRef) ); -@@ -403,7 +403,7 @@ +@@ -403,7 +403,7 @@ CPageAnnots::add(boost::shared_ptr<CAnno // updates P field with reference to this page // This is not explictly required by specification for all annotation types, // but is not an error to supply this information @@ -112,7 +112,7 @@ checkAndReplace(annotDict, "P", *pageRef); kernelPrintDbg(debug::DBG_INFO, "Adding reference "<<annotRef<<" to annotation dictionary to Annots array"); -@@ -427,7 +427,7 @@ +@@ -427,7 +427,7 @@ CPageAnnots::del(boost::shared_ptr<CAnno size_t pos=0; for(Annotations::iterator i=_annotations.begin(); i!=_annotations.end(); ++i,++pos) { @@ -121,7 +121,7 @@ if(annot!=element) continue; -@@ -436,7 +436,7 @@ +@@ -436,7 +436,7 @@ CPageAnnots::del(boost::shared_ptr<CAnno kernelPrintDbg(debug::DBG_DBG, "Annotation found. Indiref="<<annotRef); try { @@ -130,7 +130,7 @@ // deleting of this reference triggers annotsWatchDog observer which // will synchronize _annotations with current state annotArray->delProperty(pos); -@@ -476,13 +476,13 @@ +@@ -476,13 +476,13 @@ using namespace observer; } kernelPrintDbg(DBG_DBG, "context type="<<context->getType()); @@ -146,7 +146,7 @@ dynamic_pointer_cast<const BasicChangeContext<IProperty>, const observer::IChangeContext<IProperty> >(context); oldValue=basicContext->getOriginalValue(); assert(isRef(newValue)); -@@ -494,7 +494,7 @@ +@@ -494,7 +494,7 @@ using namespace observer; case ComplexChangeContextType: { // Annots array content has changed @@ -155,7 +155,7 @@ dynamic_pointer_cast<const CArray::CArrayComplexObserverContext, const IChangeContext<IProperty> >(context); if(!context) -@@ -540,14 +540,14 @@ +@@ -540,14 +540,14 @@ CPageAnnots::PropWatchDog::notify( } kernelPrintDbg(DBG_DBG, "context type="<<context->getType()); @@ -172,7 +172,7 @@ dynamic_pointer_cast<const observer::BasicChangeContext<IProperty>, const observer::IChangeContext<IProperty> >(context); oldValue=basicContext->getOriginalValue(); assert(isRef(newValue)); -@@ -559,7 +559,7 @@ +@@ -559,7 +559,7 @@ CPageAnnots::PropWatchDog::notify( // page dictionary has changed // checks identificator of changed property and if it is not // Annots, immediately returns @@ -181,7 +181,7 @@ dynamic_pointer_cast<const CDict::CDictComplexObserverContext, const IChangeContext<IProperty> >(context); if(!basicContext) -@@ -588,7 +588,7 @@ +@@ -588,7 +588,7 @@ CPageAnnots::PropWatchDog::notify( // gets original annots array and unregisters all observers // doesn't unregister observer from Annots property, because it is done only // in case of complex context @@ -190,7 +190,7 @@ if(isRef(oldValue)) { try -@@ -618,7 +618,7 @@ +@@ -618,7 +618,7 @@ CPageAnnots::PropWatchDog::notify( // registers obsevers to newValue annotation array - Annots property doesn't // need obsever registration for same reason as oldValue doesn't need // unregistration |