Date: Sat, 11 Jun 2016 21:07:11 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416755 - in head/editors/pdfedit: . files Message-ID: <201606112107.u5BL7Bdq022719@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Sat Jun 11 21:07:11 2016 New Revision: 416755 URL: https://svnweb.freebsd.org/changeset/ports/416755 Log: Regenerate patch files and remove an extra post-patch target. Added: head/editors/pdfedit/files/patch-src-kernel-cstream.cc - copied, changed from r416754, head/editors/pdfedit/files/patch-src-kernel-cstream.c head/editors/pdfedit/files/patch-src-qsa-configure (contents, props changed) head/editors/pdfedit/files/patch-src-tools-Makefile - copied, changed from r416754, head/editors/pdfedit/files/patch-src-tools-Makfile Deleted: head/editors/pdfedit/files/patch-src-kernel-cstream.c head/editors/pdfedit/files/patch-src-tools-Makfile Modified: head/editors/pdfedit/Makefile head/editors/pdfedit/files/patch-Makefile head/editors/pdfedit/files/patch-Makefile.flags.in head/editors/pdfedit/files/patch-doc__Makefile head/editors/pdfedit/files/patch-src-kernel-cannotation.cc head/editors/pdfedit/files/patch-src-kernel-carray.cc head/editors/pdfedit/files/patch-src-kernel-ccontentstream.cc head/editors/pdfedit/files/patch-src-kernel-cdict.cc head/editors/pdfedit/files/patch-src-kernel-cdict.h head/editors/pdfedit/files/patch-src-kernel-cobject.cc head/editors/pdfedit/files/patch-src-kernel-cobject2string.cc head/editors/pdfedit/files/patch-src-kernel-cobject2xpdf.cc head/editors/pdfedit/files/patch-src-kernel-cobjecthelpers.cc head/editors/pdfedit/files/patch-src-kernel-contentschangetag.cc head/editors/pdfedit/files/patch-src-kernel-cpage.cc head/editors/pdfedit/files/patch-src-kernel-cpageannots.cc head/editors/pdfedit/files/patch-src-kernel-cpageattributes.cc head/editors/pdfedit/files/patch-src-kernel-cpagechanges.cc head/editors/pdfedit/files/patch-src-kernel-cpdf.cc head/editors/pdfedit/files/patch-src-kernel-pdfoperators.cc head/editors/pdfedit/files/patch-src-kernel-pdfoperatorsbase.cc head/editors/pdfedit/files/patch-src-kernel-pdfwriter.cc head/editors/pdfedit/files/patch-src-kernel-stateupdater.cc head/editors/pdfedit/files/patch-src-kernel-textoutputengines.cc head/editors/pdfedit/files/patch-src-tools-add_image.cc head/editors/pdfedit/files/patch-src-tools-add_text.cc head/editors/pdfedit/files/patch-src-tools-displaycs.cc head/editors/pdfedit/files/patch-src-tools-pagemetrics.cc head/editors/pdfedit/files/patch-src-tools-pdf_images.cc head/editors/pdfedit/files/patch-src-tools-replace_text.cc head/editors/pdfedit/files/patch-src-utils-algorithms.h head/editors/pdfedit/files/patch-src-xpdf-fofi-FoFiEncodings.cc head/editors/pdfedit/files/patch-src-xpdf-fofi-FoFiEncodings.h head/editors/pdfedit/files/patch-src-xpdf-fofi-FoFiTrueType.cc head/editors/pdfedit/files/patch-src-xpdf-fofi-FoFiTrueType.h head/editors/pdfedit/files/patch-src-xpdf-fofi-FoFiType1.cc head/editors/pdfedit/files/patch-src-xpdf-fofi-FoFiType1C.cc head/editors/pdfedit/files/patch-src-xpdf-goo-GString.cc head/editors/pdfedit/files/patch-src-xpdf-goo-GString.h head/editors/pdfedit/files/patch-src-xpdf-xpdf-BuiltinFont.cc head/editors/pdfedit/files/patch-src-xpdf-xpdf-BuiltinFont.h head/editors/pdfedit/files/patch-src-xpdf-xpdf-NameToUnicodeTable.h head/editors/pdfedit/files/patch-src-xpdf-xpdf-Object.h head/editors/pdfedit/files/patch-src__gui__base.cc head/editors/pdfedit/files/patch-src__gui__pdfutil.cc head/editors/pdfedit/files/patch-src__kernel__cpagecontents.cc head/editors/pdfedit/files/patch-src__tools__pdf_to_text.cc Modified: head/editors/pdfedit/Makefile ============================================================================== --- head/editors/pdfedit/Makefile Sat Jun 11 20:54:31 2016 (r416754) +++ head/editors/pdfedit/Makefile Sat Jun 11 21:07:11 2016 (r416755) @@ -38,17 +38,6 @@ OPTIONS_DEFAULT=DOCS post-extract: ${INSTALL_DATA} ${WRKSRC}/doc/AUTHORS ${WRKSRC} -post-patch: - ${REINPLACE_CMD} -e \ - 's|-pedantic||g ; \ - s| $$(OPTIM)||g ; \ - s| $$(ARCH)||g ; \ - s| -pipe.*$$||g ; \ - s|^CFLAGS =|CFLAGS +=|g ; \ - s|^CXXFLAGS =|CXXFLAGS +=|g' ${WRKSRC}/Makefile.flags.in - ${REINPLACE_CMD} -e \ - '/QMAKE/s| make| $$MAKE|g' ${WRKSRC}/src/qsa/configure - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} Modified: head/editors/pdfedit/files/patch-Makefile ============================================================================== --- head/editors/pdfedit/files/patch-Makefile Sat Jun 11 20:54:31 2016 (r416754) +++ head/editors/pdfedit/files/patch-Makefile Sat Jun 11 21:07:11 2016 (r416755) @@ -1,6 +1,6 @@ ---- Makefile.orig 2008-11-13 23:11:39.000000000 +0900 -+++ Makefile 2016-06-12 05:32:04.209014000 +0900 -@@ -44,6 +44,9 @@ +--- Makefile.orig 2008-11-13 14:11:39 UTC ++++ Makefile +@@ -44,6 +44,9 @@ install-core-dev: pdfedit-core-dev cd $(KERNELROOT) && $(MAKE) install-dev cd $(OSROOT) && $(MAKE) install-dev Modified: head/editors/pdfedit/files/patch-Makefile.flags.in ============================================================================== --- head/editors/pdfedit/files/patch-Makefile.flags.in Sat Jun 11 20:54:31 2016 (r416754) +++ head/editors/pdfedit/files/patch-Makefile.flags.in Sat Jun 11 21:07:11 2016 (r416755) @@ -1,6 +1,6 @@ ---- Makefile.flags.in.bak 2010-02-24 03:28:09.000000000 +0900 -+++ Makefile.flags.in 2016-06-12 05:13:20.961050000 +0900 -@@ -131,20 +131,20 @@ +--- Makefile.flags.in.orig 2010-02-23 18:28:09 UTC ++++ Makefile.flags.in +@@ -131,20 +131,20 @@ EXTRA_XPDF_CFLAGS = @EXTRA_XPDF_CFLAGS@ # from autoconf --enable-observer-debug OBSERVER_CXXFLAGS = @OBSERVER_CXXFLAGS@ Modified: head/editors/pdfedit/files/patch-doc__Makefile ============================================================================== --- head/editors/pdfedit/files/patch-doc__Makefile Sat Jun 11 20:54:31 2016 (r416754) +++ head/editors/pdfedit/files/patch-doc__Makefile Sat Jun 11 21:07:11 2016 (r416755) @@ -1,6 +1,6 @@ ---- doc/Makefile.orig 2008-12-03 09:16:03.000000000 +0900 -+++ doc/Makefile 2011-03-21 20:34:48.000000000 +0900 -@@ -18,9 +18,6 @@ +--- doc/Makefile.orig 2008-12-03 00:16:03 UTC ++++ doc/Makefile +@@ -18,9 +18,6 @@ doc_dist_install: $(MAN_INSTALL_TARGET) $(USER_MANUAL_INSTALL_TARGET) \ $(DOXYGEN_INSTALL_TARGET) \ $(ADVANCED_DOC_INSTALL_TARGET) Modified: head/editors/pdfedit/files/patch-src-kernel-cannotation.cc ============================================================================== --- head/editors/pdfedit/files/patch-src-kernel-cannotation.cc Sat Jun 11 20:54:31 2016 (r416754) +++ head/editors/pdfedit/files/patch-src-kernel-cannotation.cc Sat Jun 11 21:07:11 2016 (r416755) @@ -1,6 +1,6 @@ ---- src/kernel/cannotation.cc.orig 2009-07-27 17:18:10.000000000 +0900 -+++ src/kernel/cannotation.cc 2016-06-11 05:49:08.538858000 +0900 -@@ -114,13 +114,13 @@ +--- src/kernel/cannotation.cc.orig 2009-07-27 08:18:10 UTC ++++ src/kernel/cannotation.cc +@@ -114,13 +114,13 @@ bool UniversalAnnotInitializer::operator AnnotList::const_iterator implElem; if((implElem=implList.find(annotType))==implList.end()) return false; @@ -16,7 +16,7 @@ { AnnotList::iterator elem=implList.find(annotType); if(elem!=implList.end()) -@@ -229,10 +229,10 @@ +@@ -229,10 +229,10 @@ bool LinkAnnotInitializer::operator()(bo } // namespace utils // initialization of static @@ -30,7 +30,7 @@ { using namespace debug; using namespace utils; -@@ -240,7 +240,7 @@ +@@ -240,7 +240,7 @@ using namespace utils; kernelPrintDbg(DBG_DBG, ""); // creates new empty dictionary for annotation @@ -39,7 +39,7 @@ // initializes annotation dictionary maintaining information: // Type of annotation dictionary has to be Annot (this is not strongly -@@ -249,7 +249,7 @@ +@@ -249,7 +249,7 @@ using namespace utils; checkAndReplace(annotDictionary, "Type", *typeField); // Rectangle of annotation is constructed from given parameter @@ -48,7 +48,7 @@ checkAndReplace(annotDictionary, "Rect", *rectField); // last modified date field (M) is initialized to current local time -@@ -257,7 +257,7 @@ +@@ -257,7 +257,7 @@ using namespace utils; time(&currTime); struct tm currLocalTime; localtime_r(&currTime, &currLocalTime); @@ -57,7 +57,7 @@ checkAndReplace(annotDictionary, "M", *mField); // initializes annotation dictionary according desired type - at least Type -@@ -270,7 +270,7 @@ +@@ -270,7 +270,7 @@ using namespace utils; if(!initialized) kernelPrintDbg(DBG_WARN, "Unable to initialize annotation dictionary with type="<<annotType); @@ -66,7 +66,7 @@ } void CAnnotation::invalidate() -@@ -285,8 +285,8 @@ +@@ -285,8 +285,8 @@ using namespace utils; // Uses this instance as newValue, but uses EmptyDeallocator to keep // instance alive when shared_ptr tries to destroy its content. // context is empty @@ -77,7 +77,7 @@ } CAnnotation::AnnotType CAnnotation::getType()const -@@ -295,14 +295,14 @@ +@@ -295,14 +295,14 @@ using namespace debug; try { Modified: head/editors/pdfedit/files/patch-src-kernel-carray.cc ============================================================================== --- head/editors/pdfedit/files/patch-src-kernel-carray.cc Sat Jun 11 20:54:31 2016 (r416754) +++ head/editors/pdfedit/files/patch-src-kernel-carray.cc Sat Jun 11 21:07:11 2016 (r416755) @@ -1,6 +1,6 @@ ---- src/kernel/carray.cc.orig 2009-09-11 21:02:56.000000000 +0900 -+++ src/kernel/carray.cc 2016-06-11 05:52:59.028080000 +0900 -@@ -80,7 +80,7 @@ +--- src/kernel/carray.cc.orig 2009-09-11 12:02:56 UTC ++++ src/kernel/carray.cc +@@ -80,7 +80,7 @@ CArray::getStringRepresentation (string& // // // @@ -9,7 +9,7 @@ CArray::getProperty (PropertyId id) const { //kernelPrintDbg (debug::DBG_DBG,"getProperty() " << id); -@@ -88,7 +88,7 @@ +@@ -88,7 +88,7 @@ CArray::getProperty (PropertyId id) cons if (id >= value.size()) throw OutOfRange (); @@ -18,7 +18,7 @@ // Set mode only if pdf is valid _setMode (ip,id); -@@ -146,7 +146,7 @@ +@@ -146,7 +146,7 @@ CArray::delProperty (PropertyId id) // Check whether we can make the change this->canChange(); @@ -27,7 +27,7 @@ // Delete that item value.erase (remove (value.begin(), value.end(), oldip)); -@@ -156,11 +156,11 @@ +@@ -156,11 +156,11 @@ CArray::delProperty (PropertyId id) assert (hasValidRef (this)); // Create contest @@ -41,7 +41,7 @@ }catch (PdfException&) { -@@ -181,7 +181,7 @@ +@@ -181,7 +181,7 @@ CArray::delProperty (PropertyId id) // // Correctly to add an object (without name) can be done only to Array object // @@ -50,7 +50,7 @@ CArray::addProperty (const IProperty& newIp) { //kernelPrintDbg (debug::DBG_DBG,"addProperty(...)"); -@@ -193,7 +193,7 @@ +@@ -193,7 +193,7 @@ CArray::addProperty (const IProperty& ne // // REMARK: because of the compiler, we can't put PropertyId here // @@ -59,7 +59,7 @@ CArray::addProperty (PropertyId position, const IProperty& newIp) { //kernelPrintDbg (debug::DBG_DBG,"addProperty(" << position << ")"); -@@ -208,7 +208,7 @@ +@@ -208,7 +208,7 @@ CArray::addProperty (PropertyId position this->canChange(); // Clone the added property @@ -68,7 +68,7 @@ assert (newIpClone); // Inherit id, gen number and pdf -@@ -230,7 +230,7 @@ +@@ -230,7 +230,7 @@ CArray::addProperty (PropertyId position assert (hasValidRef (this)); // Create contest @@ -77,7 +77,7 @@ try { // notify observers and dispatch the change -@@ -256,7 +256,7 @@ +@@ -256,7 +256,7 @@ CArray::addProperty (PropertyId position // // // @@ -86,7 +86,7 @@ CArray::setProperty (PropertyId id, IProperty& newIp) { //kernelPrintDbg (debug::DBG_DBG, "setProperty(" << id << ")"); -@@ -269,9 +269,9 @@ +@@ -269,9 +269,9 @@ CArray::setProperty (PropertyId id, IPro this->canChange(); // Save the old one @@ -98,7 +98,7 @@ assert (newIpClone); // Inherit id, gen number and pdf -@@ -289,7 +289,7 @@ +@@ -289,7 +289,7 @@ CArray::setProperty (PropertyId id, IPro assert (hasValidRef (this)); // Create contest @@ -107,7 +107,7 @@ try { // notify observers and dispatch the change -@@ -437,7 +437,7 @@ +@@ -437,7 +437,7 @@ CArray::doClone () const // // IProperty::ObserverContext* Modified: head/editors/pdfedit/files/patch-src-kernel-ccontentstream.cc ============================================================================== --- head/editors/pdfedit/files/patch-src-kernel-ccontentstream.cc Sat Jun 11 20:54:31 2016 (r416754) +++ head/editors/pdfedit/files/patch-src-kernel-ccontentstream.cc Sat Jun 11 21:07:11 2016 (r416755) @@ -1,6 +1,6 @@ ---- src/kernel/ccontentstream.cc.orig 2010-04-28 03:42:09.000000000 +0900 -+++ src/kernel/ccontentstream.cc 2016-06-11 06:33:26.838638000 +0900 -@@ -68,7 +68,7 @@ +--- src/kernel/ccontentstream.cc.orig 2010-04-27 18:42:09 UTC ++++ src/kernel/ccontentstream.cc +@@ -68,7 +68,7 @@ namespace { * @param observer Operand observer. */ void @@ -9,7 +9,7 @@ boost::weak_ptr<CPdf> pdf, IndiRef rf, CContentStream& cs, -@@ -204,7 +204,7 @@ +@@ -204,7 +204,7 @@ namespace { }else {// We have an OPERAND @@ -18,7 +18,7 @@ operands.push_back (pIp); } -@@ -223,14 +223,14 @@ +@@ -223,14 +223,14 @@ namespace { * @param streamreader CStreams parser from which we get an xpdf object. * @param operands Operands of operator. They are shared through subcalls. */ @@ -35,7 +35,7 @@ // // SPECIAL CASE for inline image (stream within a text stream) -@@ -246,8 +246,8 @@ +@@ -246,8 +246,8 @@ namespace { throw ElementBadTypeException ("Content stream operator has incorrect operand type."); } @@ -46,7 +46,7 @@ } // factory function for all other operators -@@ -269,11 +269,11 @@ +@@ -269,11 +269,11 @@ namespace { * * @return New pdf operator. */ @@ -60,7 +60,7 @@ if (result && isCompositeOp (result) && !isInlineImageOp (result)) { -@@ -283,7 +283,7 @@ +@@ -283,7 +283,7 @@ namespace { bool foundEndTag = false; // The same as in (re)parse @@ -69,7 +69,7 @@ // // Use recursion to get all operators -@@ -348,7 +348,7 @@ +@@ -348,7 +348,7 @@ namespace { if (!hasValidPdf (*it) || !hasValidRef (*it)) throw CObjInvalidObject (); } @@ -78,7 +78,7 @@ assert (pdf.lock()); IndiRef rf = streams.front()->getIndiRef (); -@@ -357,8 +357,8 @@ +@@ -357,8 +357,8 @@ namespace { streamreader.open (); PdfOperator::Operands operands; @@ -89,7 +89,7 @@ // // Parsing can throw, if so the stream is invalid -@@ -469,10 +469,10 @@ +@@ -469,10 +469,10 @@ namespace { typedef PdfOperator::BBox BBox; // Init resources @@ -102,7 +102,7 @@ { // If not initialized, means an error occured (missing font etc..) if (!BBox::isInitialized (rc)) -@@ -736,7 +736,7 @@ +@@ -736,7 +736,7 @@ CContentStream::_objectChanged () // Notify observers boost::shared_ptr<CContentStream> current (this, EmptyDeallocator<CContentStream> ()); @@ -111,7 +111,7 @@ } -@@ -856,7 +856,7 @@ +@@ -856,7 +856,7 @@ CContentStream::insertOperator (Operator // Set correct IndiRef, CPdf and cs to inserted operator assert (hasValidRef (cstreams.front())); assert (hasValidPdf (cstreams.front())); @@ -120,7 +120,7 @@ assert (pdf.lock()); IndiRef rf = cstreams.front()->getIndiRef (); opsSetPdfRefCs (newOper, pdf, rf, *this, operandobserver); -@@ -937,7 +937,7 @@ +@@ -937,7 +937,7 @@ CContentStream::frontInsertOperator (boo // Check whether we can make the change cstreams.front()->canChange(); IndiRef rf = cstreams.front()->getIndiRef (); @@ -129,7 +129,7 @@ assert (pdf.lock()); // set accordingly opsSetPdfRefCs (newoper, pdf, rf, *this, operandobserver); -@@ -949,9 +949,9 @@ +@@ -949,9 +949,9 @@ CContentStream::frontInsertOperator (boo { // Insert into opsSetPdfRefCs (newoper, pdf, rf, *this, operandobserver); @@ -141,7 +141,7 @@ secondoper->setPrev (lastofnew); lastofnew->setNext (secondoper); } -@@ -992,7 +992,7 @@ +@@ -992,7 +992,7 @@ CContentStream::replaceOperator (Operato // Set correct IndiRef, CPdf and cs to inserted operator assert (hasValidRef (cstreams.front())); assert (hasValidPdf (cstreams.front())); Modified: head/editors/pdfedit/files/patch-src-kernel-cdict.cc ============================================================================== --- head/editors/pdfedit/files/patch-src-kernel-cdict.cc Sat Jun 11 20:54:31 2016 (r416754) +++ head/editors/pdfedit/files/patch-src-kernel-cdict.cc Sat Jun 11 21:07:11 2016 (r416755) @@ -1,6 +1,6 @@ ---- src/kernel/cdict.cc.orig 2010-04-28 03:42:09.000000000 +0900 -+++ src/kernel/cdict.cc 2016-06-11 06:01:28.994503000 +0900 -@@ -95,7 +95,7 @@ +--- src/kernel/cdict.cc.orig 2010-04-27 18:42:09 UTC ++++ src/kernel/cdict.cc +@@ -95,7 +95,7 @@ CDict::containsProperty (const string& n // // // @@ -9,7 +9,7 @@ CDict::getProperty (PropertyId id) const { //kernelPrintDbg (debug::DBG_DBG,"getProperty() " << id); -@@ -111,7 +111,7 @@ +@@ -111,7 +111,7 @@ CDict::getProperty (PropertyId id) const if (it == value.end()) throw ElementNotFoundException ("", ""); @@ -18,7 +18,7 @@ // Set mode only if pdf is valid _setMode (ip,id); -@@ -188,7 +188,7 @@ +@@ -188,7 +188,7 @@ CDict::delProperty (PropertyId id) if (oldit == value.end()) throw ElementNotFoundException ("CDict", "item not found"); @@ -27,7 +27,7 @@ // Delete that item value.erase (oldit); -@@ -198,11 +198,11 @@ +@@ -198,11 +198,11 @@ CDict::delProperty (PropertyId id) assert (hasValidRef (this)); // Indicate that this object has changed @@ -41,7 +41,7 @@ }catch (PdfException&) { -@@ -224,7 +224,7 @@ +@@ -224,7 +224,7 @@ CDict::delProperty (PropertyId id) // // Correctly add an object (with name) can be done only to Dict and Stream object // @@ -50,7 +50,7 @@ CDict::addProperty (const string& propertyName, const IProperty& newIp) { kernelPrintDbg (debug::DBG_DBG,"addProperty( " << propertyName << ",...)"); -@@ -239,7 +239,7 @@ +@@ -239,7 +239,7 @@ CDict::addProperty (const string& proper throw CObjInvalidObject (); // Clone the added property @@ -59,7 +59,7 @@ if (newIpClone) { // Inherit id, gen number and pdf -@@ -260,7 +260,7 @@ +@@ -260,7 +260,7 @@ CDict::addProperty (const string& proper assert (hasValidRef (this)); // notify observers and dispatch change @@ -68,7 +68,7 @@ try { // notify observers and dispatch the change -@@ -285,7 +285,7 @@ +@@ -285,7 +285,7 @@ CDict::addProperty (const string& proper // // // @@ -77,7 +77,7 @@ CDict::setProperty (PropertyId id, IProperty& newIp) { kernelPrintDbg (debug::DBG_DBG, "setProperty(" << id << ")"); -@@ -308,9 +308,9 @@ +@@ -308,9 +308,9 @@ CDict::setProperty (PropertyId id, IProp return addProperty (id, newIp); // Save the old one @@ -89,7 +89,7 @@ assert (newIpClone); // Inherit id, gen number and pdf -@@ -328,7 +328,7 @@ +@@ -328,7 +328,7 @@ CDict::setProperty (PropertyId id, IProp assert (hasValidRef (this)); // Notify observers and dispatch change @@ -98,7 +98,7 @@ try { // notify observers and dispatch the change -@@ -382,7 +382,7 @@ +@@ -382,7 +382,7 @@ CDict::_makeXpdfObject () const Value::const_iterator it = value.begin(); for (; it != value.end(); ++it) { @@ -107,7 +107,7 @@ Object * propObj = prop->_makeXpdfObject(); dictObj->dictAdd(copyString((it->first).c_str()), propObj); gfree(propObj); -@@ -398,7 +398,7 @@ +@@ -398,7 +398,7 @@ CDict::_makeXpdfObject () const // void CDict::_objectChanged @@ -116,7 +116,7 @@ { // Do not notify anything if we are not in a valid pdf if (!hasValidPdf (this)) -@@ -424,10 +424,10 @@ +@@ -424,10 +424,10 @@ CDict::_objectChanged // Set mode // void @@ -129,7 +129,7 @@ if ( p && (NULL != (modecontroller=p->getModeController()))) { assert (modecontroller); -@@ -451,7 +451,7 @@ +@@ -451,7 +451,7 @@ CDict::_setMode (shared_ptr<IProperty> i }else { // We have found a type string tmp; @@ -138,7 +138,7 @@ if (isName (type)) IProperty::getSmartCObjectPtr<CName>(type)->getValue(tmp); mode = modecontroller->getMode (tmp, id); -@@ -498,7 +498,7 @@ +@@ -498,7 +498,7 @@ CDict::doClone () const // // IProperty::ObserverContext* Modified: head/editors/pdfedit/files/patch-src-kernel-cdict.h ============================================================================== --- head/editors/pdfedit/files/patch-src-kernel-cdict.h Sat Jun 11 20:54:31 2016 (r416754) +++ head/editors/pdfedit/files/patch-src-kernel-cdict.h Sat Jun 11 21:07:11 2016 (r416755) @@ -1,6 +1,6 @@ ---- src/kernel/cdict.h.orig 2016-06-11 05:41:31.261535000 +0900 -+++ src/kernel/cdict.h 2016-06-11 05:44:42.503741000 +0900 -@@ -799,7 +799,7 @@ +--- src/kernel/cdict.h.orig 2010-04-27 18:42:09 UTC ++++ src/kernel/cdict.h +@@ -799,7 +799,7 @@ setSimpleValueInDict (const IProperty& i } // Cast it to dict @@ -9,7 +9,7 @@ setSimpleValueInDict<Value, ItemType, ItemPType> (*dict, name, val); } -@@ -812,7 +812,7 @@ +@@ -812,7 +812,7 @@ setSimpleValueInDict (const IProperty& i throw ElementBadTypeException (""); // Cast it to dict Modified: head/editors/pdfedit/files/patch-src-kernel-cobject.cc ============================================================================== --- head/editors/pdfedit/files/patch-src-kernel-cobject.cc Sat Jun 11 20:54:31 2016 (r416754) +++ head/editors/pdfedit/files/patch-src-kernel-cobject.cc Sat Jun 11 21:07:11 2016 (r416755) @@ -1,6 +1,6 @@ ---- src/kernel/cobject.cc.orig 2016-06-11 06:02:30.123217000 +0900 -+++ src/kernel/cobject.cc 2016-06-11 06:02:50.095614000 +0900 -@@ -60,7 +60,7 @@ +--- src/kernel/cobject.cc.orig 2009-09-11 12:02:56 UTC ++++ src/kernel/cobject.cc +@@ -60,7 +60,7 @@ objHasParent (const IProperty& ip, boost if (!hasValidPdf (ip)) throw CObjInvalidOperation (); Modified: head/editors/pdfedit/files/patch-src-kernel-cobject2string.cc ============================================================================== --- head/editors/pdfedit/files/patch-src-kernel-cobject2string.cc Sat Jun 11 20:54:31 2016 (r416754) +++ head/editors/pdfedit/files/patch-src-kernel-cobject2string.cc Sat Jun 11 21:07:11 2016 (r416755) @@ -1,6 +1,6 @@ ---- src/kernel/cobject2string.cc.orig 2016-06-11 06:20:13.726775000 +0900 -+++ src/kernel/cobject2string.cc 2016-06-11 06:20:28.472463000 +0900 -@@ -81,7 +81,7 @@ +--- src/kernel/cobject2string.cc.orig 2010-05-03 19:05:24 UTC ++++ src/kernel/cobject2string.cc +@@ -81,7 +81,7 @@ simpleValueFromString (const std::string void simpleValueFromString (const std::string& str, double& val) { Modified: head/editors/pdfedit/files/patch-src-kernel-cobject2xpdf.cc ============================================================================== --- head/editors/pdfedit/files/patch-src-kernel-cobject2xpdf.cc Sat Jun 11 20:54:31 2016 (r416754) +++ head/editors/pdfedit/files/patch-src-kernel-cobject2xpdf.cc Sat Jun 11 21:07:11 2016 (r416755) @@ -1,6 +1,6 @@ ---- src/kernel/cobject2xpdf.cc.orig 2016-06-11 06:17:18.518993000 +0900 -+++ src/kernel/cobject2xpdf.cc 2016-06-11 06:18:14.021576000 +0900 -@@ -453,16 +453,16 @@ +--- src/kernel/cobject2xpdf.cc.orig 2009-09-11 12:02:56 UTC ++++ src/kernel/cobject2xpdf.cc +@@ -453,16 +453,16 @@ namespace { // Get Object at i-th position array.arrayGetNF (i, obj.get()); @@ -20,7 +20,7 @@ } if (cobj) -@@ -504,12 +504,12 @@ +@@ -504,12 +504,12 @@ namespace { obj->free (); dict.dictGetValNF (i,obj.get()); @@ -36,7 +36,7 @@ if (cobj) { -@@ -1021,7 +1021,7 @@ +@@ -1021,7 +1021,7 @@ size_t streamToCharBuffer (const Object // for Dict -> String conversion // initDict increases streamDict's reference thus we need to // decrease it back by free Modified: head/editors/pdfedit/files/patch-src-kernel-cobjecthelpers.cc ============================================================================== --- head/editors/pdfedit/files/patch-src-kernel-cobjecthelpers.cc Sat Jun 11 20:54:31 2016 (r416754) +++ head/editors/pdfedit/files/patch-src-kernel-cobjecthelpers.cc Sat Jun 11 21:07:11 2016 (r416755) @@ -1,6 +1,6 @@ ---- src/kernel/cobjecthelpers.cc.orig 2016-06-11 06:22:02.988983000 +0900 -+++ src/kernel/cobjecthelpers.cc 2016-06-11 06:23:38.529873000 +0900 -@@ -42,14 +42,14 @@ +--- src/kernel/cobjecthelpers.cc.orig 2009-04-06 15:24:58 UTC ++++ src/kernel/cobjecthelpers.cc +@@ -42,14 +42,14 @@ int getIntFromDict(std::string name, boo { using namespace boost; @@ -17,7 +17,7 @@ return int_ptr->getValue(); } -@@ -57,14 +57,14 @@ +@@ -57,14 +57,14 @@ IndiRef getRefFromDict(std::string name, { using namespace boost; @@ -34,7 +34,7 @@ return int_ptr->getValue(); } -@@ -72,14 +72,14 @@ +@@ -72,14 +72,14 @@ std::string getStringFromDict(std::strin { using namespace boost; @@ -51,7 +51,7 @@ return str_ptr->getValue(); } -@@ -87,14 +87,14 @@ +@@ -87,14 +87,14 @@ std::string getNameFromDict(std::string { using namespace boost; @@ -68,7 +68,7 @@ std::string value; name_ptr->getValue(value); -@@ -125,7 +125,7 @@ +@@ -125,7 +125,7 @@ boost::shared_ptr<CDict> getDictFromRef( // gets reference value and dereferences indirect object IndiRef ref; IProperty::getSmartCObjectPtr<CRef>(refProp)->getValue(ref); @@ -77,7 +77,7 @@ assert(pdf); boost::shared_ptr<IProperty> indirect_ptr=pdf->getIndirectProperty(ref); if(indirect_ptr->getType() != pDict) -@@ -237,7 +237,7 @@ +@@ -237,7 +237,7 @@ getReferencedObject (boost::shared_ptr<I IndiRef ref; IProperty::getSmartCObjectPtr<CRef>(ip)->getValue(ref); @@ -86,7 +86,7 @@ assert(pdf); return pdf->getIndirectProperty (ref); -@@ -254,7 +254,7 @@ +@@ -254,7 +254,7 @@ using namespace boost; // pdf specification says that two diagonal corners should be used and // readers has to be prepared to normalize it @@ -95,7 +95,7 @@ scoped_ptr<IProperty> llx(CRealFactory::getInstance(rect.xleft)); scoped_ptr<IProperty> lly(CRealFactory::getInstance(rect.yleft)); scoped_ptr<IProperty> urx(CRealFactory::getInstance(rect.xright)); -@@ -267,12 +267,12 @@ +@@ -267,12 +267,12 @@ using namespace boost; return array; } @@ -110,7 +110,7 @@ if(array->getPropertyCount() != 4) throw CObjBadValue(); -@@ -286,7 +286,7 @@ +@@ -286,7 +286,7 @@ boost::shared_ptr<IProperty> getIPropert { using namespace boost; @@ -119,7 +119,7 @@ char buffer[30]; memset(buffer, '\0', sizeof(buffer)); -@@ -304,7 +304,7 @@ +@@ -304,7 +304,7 @@ bool checkAndReplace(boost::shared_ptr<C { using namespace boost; @@ -128,7 +128,7 @@ try { value=annotDict->getProperty(fieldName); -@@ -323,9 +323,9 @@ +@@ -323,9 +323,9 @@ using namespace boost; // // ::XRef* Modified: head/editors/pdfedit/files/patch-src-kernel-contentschangetag.cc ============================================================================== --- head/editors/pdfedit/files/patch-src-kernel-contentschangetag.cc Sat Jun 11 20:54:31 2016 (r416754) +++ head/editors/pdfedit/files/patch-src-kernel-contentschangetag.cc Sat Jun 11 21:07:11 2016 (r416755) @@ -1,6 +1,6 @@ ---- src/kernel/contentschangetag.cc.orig 2016-06-12 02:53:06.107246000 +0900 -+++ src/kernel/contentschangetag.cc 2016-06-12 02:53:37.952146000 +0900 -@@ -51,11 +51,11 @@ +--- src/kernel/contentschangetag.cc.orig 2009-07-27 08:18:10 UTC ++++ src/kernel/contentschangetag.cc +@@ -51,11 +51,11 @@ ContentsChangeTag::create () PdfOperator::Operands opers; // Name or our application @@ -14,7 +14,7 @@ time_t t = time (NULL); ostringstream oss; oss << t; -@@ -72,7 +72,7 @@ +@@ -72,7 +72,7 @@ ContentsChangeTag::create () // // time_t Modified: head/editors/pdfedit/files/patch-src-kernel-cpage.cc ============================================================================== --- head/editors/pdfedit/files/patch-src-kernel-cpage.cc Sat Jun 11 20:54:31 2016 (r416754) +++ head/editors/pdfedit/files/patch-src-kernel-cpage.cc Sat Jun 11 21:07:11 2016 (r416755) @@ -1,6 +1,6 @@ ---- src/kernel/cpage.cc.orig 2016-06-11 10:20:24.977833000 +0900 -+++ src/kernel/cpage.cc 2016-06-11 10:21:15.509192000 +0900 -@@ -88,9 +88,9 @@ +--- src/kernel/cpage.cc.orig 2009-07-27 08:18:10 UTC ++++ src/kernel/cpage.cc +@@ -88,9 +88,9 @@ CPage::CPage (boost::shared_ptr<CDict>& // // Init modules // @@ -12,7 +12,7 @@ _modules.push_back (_display); _fonts = boost::shared_ptr<CPageFonts> (new CPageFonts(this)); _modules.push_back (_fonts); -@@ -252,7 +252,7 @@ +@@ -252,7 +252,7 @@ size_t CPage::getPagePosition () const { if (hasValidPdf (_dict)) @@ -21,7 +21,7 @@ throw CObjInvalidOperation (); } -@@ -284,9 +284,9 @@ +@@ -284,9 +284,9 @@ CPage::_objectChanged (bool invalid) // Notify observers if (invalid) Modified: head/editors/pdfedit/files/patch-src-kernel-cpageannots.cc ============================================================================== --- head/editors/pdfedit/files/patch-src-kernel-cpageannots.cc Sat Jun 11 20:54:31 2016 (r416754) +++ head/editors/pdfedit/files/patch-src-kernel-cpageannots.cc Sat Jun 11 21:07:11 2016 (r416755) @@ -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 Modified: head/editors/pdfedit/files/patch-src-kernel-cpageattributes.cc ============================================================================== --- head/editors/pdfedit/files/patch-src-kernel-cpageattributes.cc Sat Jun 11 20:54:31 2016 (r416754) +++ head/editors/pdfedit/files/patch-src-kernel-cpageattributes.cc Sat Jun 11 21:07:11 2016 (r416755) @@ -1,6 +1,6 @@ ---- src/kernel/cpageattributes.cc.orig 2016-06-11 10:28:48.940221000 +0900 -+++ src/kernel/cpageattributes.cc 2016-06-11 10:29:31.800132000 +0900 -@@ -47,7 +47,7 @@ +--- src/kernel/cpageattributes.cc.orig 2009-07-27 08:18:10 UTC ++++ src/kernel/cpageattributes.cc +@@ -47,7 +47,7 @@ using namespace utils; // // void @@ -9,7 +9,7 @@ { int initialized=0; -@@ -59,7 +59,7 @@ +@@ -59,7 +59,7 @@ CPageAttributes::fillInherited(const sha // attrs.__resources field is not specified yet, so tries this dictionary if(pageDict->containsProperty(Specification::Page::RESOURCES)) { @@ -18,7 +18,7 @@ if(isRef(prop)) { attrs._resources=getCObjectFromRef<CDict>(prop); -@@ -81,7 +81,7 @@ +@@ -81,7 +81,7 @@ CPageAttributes::fillInherited(const sha // attrs._mediaBox field is not specified yet, so tries this array if(pageDict->containsProperty(Specification::Page::MEDIABOX)) { @@ -27,7 +27,7 @@ if(isRef(prop)) { attrs._mediaBox=getCObjectFromRef<CArray>(prop); -@@ -102,7 +102,7 @@ +@@ -102,7 +102,7 @@ CPageAttributes::fillInherited(const sha // attrs._cropBox field is not specified yet, so tries this array if(pageDict->containsProperty(Specification::Page::CROPBOX)) { @@ -36,7 +36,7 @@ if(isRef(prop)) { attrs._cropBox=getCObjectFromRef<CArray>(prop); -@@ -123,7 +123,7 @@ +@@ -123,7 +123,7 @@ CPageAttributes::fillInherited(const sha // attrs._rotate field is not specified yet, so tries this array if(pageDict->containsProperty(Specification::Page::ROTATE)) { @@ -45,7 +45,7 @@ if(isRef(prop)) { attrs._rotate=getCObjectFromRef<CInt>(prop); -@@ -147,19 +147,19 @@ +@@ -147,19 +147,19 @@ CPageAttributes::fillInherited(const sha // stops recursion and initializes values with default if(pageDict->containsProperty(Specification::Page::PARENT)) { @@ -68,7 +68,7 @@ // default A4 sized box libs::Rectangle defaultRect( -@@ -191,7 +191,7 @@ +@@ -191,7 +191,7 @@ CPageAttributes::fillInherited(const sha // direct usage of static DEFAULT_ROTATE value caused linkage // error int defRot=DisplayParams::DEFAULT_ROTATE; @@ -77,7 +77,7 @@ } } } -@@ -203,7 +203,7 @@ +@@ -203,7 +203,7 @@ CPageAttributes::fillInherited(const sha // // void Modified: head/editors/pdfedit/files/patch-src-kernel-cpagechanges.cc ============================================================================== --- head/editors/pdfedit/files/patch-src-kernel-cpagechanges.cc Sat Jun 11 20:54:31 2016 (r416754) +++ head/editors/pdfedit/files/patch-src-kernel-cpagechanges.cc Sat Jun 11 21:07:11 2016 (r416755) @@ -1,6 +1,6 @@ ---- src/kernel/cpagechanges.cc.orig 2016-06-11 10:31:04.066936000 +0900 -+++ src/kernel/cpagechanges.cc 2016-06-11 10:31:47.070535000 +0900 -@@ -50,7 +50,7 @@ +--- src/kernel/cpagechanges.cc.orig 2009-04-06 15:24:59 UTC ++++ src/kernel/cpagechanges.cc +@@ -50,7 +50,7 @@ void CPageChanges::displayChange (::OutputDev& out, const Container& cont) const { @@ -9,7 +9,7 @@ assert (fakeDict); CPageContents::setContents (fakeDict, cont); -@@ -66,7 +66,7 @@ +@@ -66,7 +66,7 @@ CPageChanges::displayChange (::OutputDev // Display page using our dictionary _page->display()->displayPage (out, fakeDict); } @@ -18,7 +18,7 @@ // -@@ -87,10 +87,10 @@ +@@ -87,10 +87,10 @@ CPageChanges::displayChange (::OutputDev // // // @@ -31,7 +31,7 @@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606112107.u5BL7Bdq022719>