mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-01 01:17:02 +00:00
Code Issues Releases Activity

Regenerate patch files and remove an extra post-patch target.

Browse Source
This commit is contained in:
Hiroki Sato 2016-06-11 21:07:11 +00:00
parent 2a38f93df5
commit 910992c384
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=416755
50 changed files with 414 additions and 414 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
editors/pdfedit/Makefile
View File

@ -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}

6
editors/pdfedit/files/patch-Makefile
View File

@ -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

6
editors/pdfedit/files/patch-Makefile.flags.in
View File

@ -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@

6
editors/pdfedit/files/patch-doc__Makefile
View File

@ -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)

20
editors/pdfedit/files/patch-src-kernel-cannotation.cc
View File

@ -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
{

28
editors/pdfedit/files/patch-src-kernel-carray.cc
View File

@ -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*

32
editors/pdfedit/files/patch-src-kernel-ccontentstream.cc
View File

@ -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()));

34
editors/pdfedit/files/patch-src-kernel-cdict.cc
View File

@ -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*

8
editors/pdfedit/files/patch-src-kernel-cdict.h
View File

@ -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

6
editors/pdfedit/files/patch-src-kernel-cobject.cc
View File

@ -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 ();

6
editors/pdfedit/files/patch-src-kernel-cobject2string.cc
View File

@ -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)
{

10
editors/pdfedit/files/patch-src-kernel-cobject2xpdf.cc
View File

@ -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

26
editors/pdfedit/files/patch-src-kernel-cobjecthelpers.cc
View File

@ -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*

8
editors/pdfedit/files/patch-src-kernel-contentschangetag.cc
View File

@ -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

10
editors/pdfedit/files/patch-src-kernel-cpage.cc
View File

@ -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)

38
editors/pdfedit/files/patch-src-kernel-cpageannots.cc
View File

@ -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

20
editors/pdfedit/files/patch-src-kernel-cpageattributes.cc
View File

@ -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

14
editors/pdfedit/files/patch-src-kernel-cpagechanges.cc
View File

@ -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 @@
CCs ccs;
getChanges (ccs);
@@ -122,9 +122,9 @@
@@ -122,9 +122,9 @@ namespace {
*/
struct ccs_change_sorter
{
@ -43,7 +43,7 @@
static const bool FIRST_IS_OUR_LAST = true;
static const bool SECOND_IS_OUR_LAST = false;
@@ -163,7 +163,7 @@
@@ -163,7 +163,7 @@ CPageChanges::getChanges (Changes& cont)
_page->contents()->getContentStreams (ccs);
for (CCs::const_iterator it = ccs.begin(); it != ccs.end(); ++it)
{

166
editors/pdfedit/files/patch-src-kernel-cpdf.cc
View File

@ -1,6 +1,6 @@
--- src/kernel/cpdf.cc.orig 2016-06-12 03:22:58.998911000 +0900
+++ src/kernel/cpdf.cc 2016-06-12 03:32:11.057006000 +0900
@@ -81,13 +81,13 @@
--- src/kernel/cpdf.cc.orig 2010-04-27 18:42:09 UTC
+++ src/kernel/cpdf.cc
@@ -81,13 +81,13 @@ ostream & operator<<(ostream & stream, P
return stream;
}
@ -17,7 +17,7 @@
if(!isRef(pagesProp))
// returns null dictionary
return result;
@@ -106,7 +106,7 @@
@@ -106,7 +106,7 @@ PageTreeNodeType getNodeType(const boost
PageTreeNodeType nodeType=UnknownNode;
// checks nodeProp - must be dictionary or reference to dictionary
@ -26,7 +26,7 @@
if(isDict(nodeProp))
nodeDict=IProperty::getSmartCObjectPtr<CDict>(nodeProp);
else
@@ -126,9 +126,9 @@
@@ -126,9 +126,9 @@ PageTreeNodeType getNodeType(const boost
return ErrorNode;
// checks root node at first
@ -38,7 +38,7 @@
if(rootDict==nodeDict)
// root dictionary found and it is same as internode
return RootNode;
@@ -136,7 +136,7 @@
@@ -136,7 +136,7 @@ PageTreeNodeType getNodeType(const boost
// given node is not root of page tree, chcecks Type field
if(nodeDict->containsProperty("Type"))
{
@ -47,7 +47,7 @@
try
{
if(isRef(nodeType))
@@ -159,7 +159,7 @@
@@ -159,7 +159,7 @@ PageTreeNodeType getNodeType(const boost
// Internode should contain at least Kids array field
if(nodeDict->containsProperty("Kids"))
{
@ -56,7 +56,7 @@
if(isArray(kidsProp))
return InterNode;
if(isRef(kidsProp))
@@ -189,8 +189,8 @@
@@ -189,8 +189,8 @@ void getKidsFromInterNode(const boost::s
// tries to get Kids array
if(interNodeDict->containsProperty("Kids"))
{
@ -67,7 +67,7 @@
if(isRef(kidsProp))
{
try
@@ -341,17 +341,17 @@
@@ -341,17 +341,17 @@ using namespace debug;
if(!withSubTree)
return;
@ -88,7 +88,7 @@
if(!isRef(child))
// skip array mess
continue;
@@ -373,7 +373,7 @@
@@ -373,7 +373,7 @@ size_t getKidsCount(const boost::shared_
// gets dictionary from given property. If reference, gets target object. If
// it is not a dictionary, returns with 0
@ -97,7 +97,7 @@
if(isRef(interNodeProp))
{
try
@@ -409,7 +409,7 @@
@@ -409,7 +409,7 @@ size_t getKidsCount(const boost::shared_
getKidsFromInterNode(interNodeDict, children);
for(ChildrenStorage::const_iterator i=children.begin(); i!=children.end(); ++i)
{
@ -106,7 +106,7 @@
if(isRef(childProp))
count+=getKidsCount(childProp, cache);
}
@@ -441,7 +441,7 @@
@@ -441,7 +441,7 @@ boost::shared_ptr<CDict> findPageDict(
// dictionary smart pointer holder
// it is initialized according pagesDict parameter - if it is reference
// it has to be dereferenced
@ -115,7 +115,7 @@
// checks if given parameter is reference and if so, dereference it
// using getIndirectProperty method and casts to dict_ptr
@@ -523,7 +523,7 @@
@@ -523,7 +523,7 @@ boost::shared_ptr<CDict> findPageDict(
size_t min_pos=startPos, index=0;
for(ChildrenStorage::iterator i=children.begin(); i!=children.end(); ++i, ++index)
{
@ -124,7 +124,7 @@
if(!isRef(child))
{
@@ -542,7 +542,7 @@
@@ -542,7 +542,7 @@ boost::shared_ptr<CDict> findPageDict(
// gets child dictionary (everything is checked, so no exception can
// be thrown here)
@ -133,7 +133,7 @@
utilsPrintDbg(DBG_DBG, "kid["<<index<<"] node type="<<nodeType);
@@ -632,9 +632,9 @@
@@ -632,9 +632,9 @@ boost::shared_ptr<CDict> findPageDict(
* superNode.
*/
size_t searchTreeNode(
@ -146,7 +146,7 @@
size_t startValue,
PageTreeNodeCountCache * cache)
{
@@ -673,7 +673,7 @@
@@ -673,7 +673,7 @@ size_t searchTreeNode(
getKidsFromInterNode(superNode, children);
for(i=children.begin(); i!=children.end(); ++i, ++index)
{
@ -155,7 +155,7 @@
// each element has to be reference
if(!isRef(child))
@@ -693,7 +693,7 @@
@@ -693,7 +693,7 @@ size_t searchTreeNode(
// dereference target dictionary - never throws, because we have checked
// node type
@ -164,7 +164,7 @@
// compares elementDict_ptr (kid) with node, if they are same, returns
// startValue
@@ -723,7 +723,7 @@
@@ -723,7 +723,7 @@ size_t searchTreeNode(
IndiRef nodeRef=node->getIndiRef();
for(;i!=children.end(); ++i, ++index)
{
@ -173,7 +173,7 @@
if(isRef(child) && getValueFromSimple<CRef>(child)==nodeRef)
{
utilsPrintDbg(DBG_WARN, "Internode "<<superNode->getIndiRef()<<" is ambiguous. Kids["<<index<<"] duplicates reference to node.");
@@ -735,7 +735,7 @@
@@ -735,7 +735,7 @@ size_t searchTreeNode(
return position;
}
@ -182,7 +182,7 @@
{
utilsPrintDbg(DBG_DBG, "");
// node must be from given pdf
@@ -746,7 +746,7 @@
@@ -746,7 +746,7 @@ size_t getNodePosition(const shared_ptr<
}
// gets page tree root - if not found, then PageNotFoundException is thrown
@ -191,7 +191,7 @@
if(!rootDict_ptr.get())
throw PageNotFoundException(0);
@@ -760,7 +760,7 @@
@@ -760,7 +760,7 @@ size_t getNodePosition(const shared_ptr<
utilsPrintDbg(DBG_ERR, "Given node is not reference nor dictionary. type="<<nodeType);
throw ElementBadTypeException("node");
}
@ -200,7 +200,7 @@
if(isRef(node))
nodeDict_ptr=getCObjectFromRef<CDict>(node);
else
@@ -776,7 +776,7 @@
@@ -776,7 +776,7 @@ size_t getNodePosition(const shared_ptr<
throw PageNotFoundException(0);
}
@ -209,7 +209,7 @@
{
using namespace utils;
@@ -787,7 +787,7 @@
@@ -787,7 +787,7 @@ using namespace utils;
}
// gets parent property
@ -218,7 +218,7 @@
if(!isRef(parentProp))
{
// parent is incorect
@@ -804,7 +804,7 @@
@@ -804,7 +804,7 @@ using namespace utils;
// referencies are not same, so gets parent dictionary and checks its parent
try
{
@ -227,7 +227,7 @@
return isNodeDescendant(pdf, parent, parentDict);
}catch(CObjectException & )
{
@@ -830,7 +830,7 @@
@@ -830,7 +830,7 @@ using namespace pdfobjects::utils;
return;
// gets dictionary from given property
@ -236,7 +236,7 @@
if(isRef(prop))
{
try
@@ -854,8 +854,8 @@
@@ -854,8 +854,8 @@ using namespace pdfobjects::utils;
if(!dict_ptr->containsProperty("Kids"))
return;
@ -247,7 +247,7 @@
if(isRef(kidsProp_ptr))
{
// Kids property is reference - this is not offten but may occure and
@@ -901,7 +901,7 @@
@@ -901,7 +901,7 @@ using namespace pdfobjects::utils;
kids_ptr->_getAllChildObjects(container);
for(ChildrenStorage::iterator i=container.begin(); i!=container.end(); ++i)
{
@ -256,7 +256,7 @@
if(isRef(elemProp_ptr))
{
REGISTER_SHAREDPTR_OBSERVER(elemProp_ptr, pageTreeKidsObserver);
@@ -922,7 +922,7 @@
@@ -922,7 +922,7 @@ using namespace pdfobjects::utils;
return;
// gets dictionary from given property
@ -265,7 +265,7 @@
if(isRef(prop))
{
try
@@ -974,8 +974,8 @@
@@ -974,8 +974,8 @@ using namespace pdfobjects::utils;
if(!dict_ptr->containsProperty("Kids"))
return;
@ -276,7 +276,7 @@
if(isRef(kidsProp_ptr))
{
// Kids property is reference - this is not offten but may occure and
@@ -1021,7 +1021,7 @@
@@ -1021,7 +1021,7 @@ using namespace pdfobjects::utils;
kids_ptr->_getAllChildObjects(container);
for(ChildrenStorage::iterator i=container.begin(); i!=container.end(); ++i)
{
@ -285,7 +285,7 @@
if(isRef(elemProp_ptr))
{
UNREGISTER_SHAREDPTR_OBSERVER(elemProp_ptr, pageTreeKidsObserver);
@@ -1042,7 +1042,7 @@
@@ -1042,7 +1042,7 @@ using namespace observer;
using namespace utils;
assert(isActive());
@ -294,7 +294,7 @@
if(!context)
{
kernelPrintDbg(DBG_WARN, "No context available. Ignoring calling.");
@@ -1055,7 +1055,7 @@
@@ -1055,7 +1055,7 @@ using namespace utils;
case BasicChangeContextType:
{
// Pages reference value has changed
@ -303,7 +303,7 @@
dynamic_pointer_cast<const BasicChangeContext<IProperty>, const IChangeContext<IProperty> >(context);
oldValue=basicContext->getOriginalValue();
@@ -1068,7 +1068,7 @@
@@ -1068,7 +1068,7 @@ using namespace utils;
{
// document catalog dictionary has changed. Checks valueId and
// proceede just if Pages property has changed
@ -312,7 +312,7 @@
dynamic_pointer_cast<const CDict::CDictComplexObserverContext, const IChangeContext<IProperty> >(context);
if(!complexContex)
{
@@ -1115,7 +1115,7 @@
@@ -1115,7 +1115,7 @@ using namespace utils;
{
try
{
@ -321,7 +321,7 @@
kernelPrintDbg(DBG_DBG, "unregistering observers from old page tree.");
pdf->unregisterPageTreeObservers(oldValueDict);
}catch(CObjectException & e)
@@ -1136,7 +1136,7 @@
@@ -1136,7 +1136,7 @@ using namespace utils;
kernelPrintDbg(DBG_DBG, "Invalidating pageList with "<<pdf->pageList.size()<<" elements");
for(PageList::iterator i=pdf->pageList.begin(); i!=pdf->pageList.end(); ++i)
{
@ -330,7 +330,7 @@
page->invalidate();
}
pdf->pageList.clear();
@@ -1154,7 +1154,7 @@
@@ -1154,7 +1154,7 @@ using namespace utils;
return;
}
IndiRef newValueRef=utils::getValueFromSimple<CRef>(newValue);
@ -339,7 +339,7 @@
if(!isDict(newValueProp))
{
kernelPrintDbg(DBG_WARN, "Pages property doesn't refer to dictionary. type="<<newValueProp->getType());
@@ -1183,7 +1183,7 @@
@@ -1183,7 +1183,7 @@ using namespace observer;
kernelPrintDbg(DBG_WARN, "No context available. Ignoring calling.");
return;
}
@ -348,7 +348,7 @@
ChildrenStorage oldValues, newValues;
kernelPrintDbg(DBG_DBG, "context type="<<context->getType());
switch(context->getType())
@@ -1193,7 +1193,7 @@
@@ -1193,7 +1193,7 @@ using namespace observer;
// this means that node contains Kids array with reference type
// and this reference has changed its value - both oldValue and
// newValue has to be referencies
@ -357,7 +357,7 @@
dynamic_pointer_cast<const BasicChangeContext<IProperty>, const IChangeContext<IProperty> >(context);
oldValue=basicContext->getOriginalValue();
assert(isRef(oldValue));
@@ -1204,7 +1204,7 @@
@@ -1204,7 +1204,7 @@ using namespace observer;
{
// this means that inter node dictionary has changed
// if changed property is not Kids, immediatelly returns
@ -366,7 +366,7 @@
dynamic_pointer_cast<const CDict::CDictComplexObserverContext, const IChangeContext<IProperty> >(context);
if(!complexContex)
{
@@ -1245,7 +1245,7 @@
@@ -1245,7 +1245,7 @@ using namespace observer;
try
{
// collects all children from array
@ -375,7 +375,7 @@
if(isRef(oldValue))
kidsArray=utils::getCObjectFromRef<CArray>(oldValue);
else
@@ -1273,7 +1273,7 @@
@@ -1273,7 +1273,7 @@ using namespace observer;
try
{
// collects all children from array
@ -384,7 +384,7 @@
if(isRef(newValue))
kidsArray=utils::getCObjectFromRef<CArray>(newValue);
else
@@ -1299,10 +1299,10 @@
@@ -1299,10 +1299,10 @@ using namespace observer;
IndiRef interNodeRef=(!isNull(oldValue))?oldValue->getIndiRef():newValue->getIndiRef();
try
{
@ -397,7 +397,7 @@
// if consolidatePageTree hasn't kept page count numbers, total number
// of pages must be invalidated
if(!pdf->consolidatePageTree(interNode, true))
@@ -1317,12 +1317,12 @@
@@ -1317,12 +1317,12 @@ using namespace observer;
}
// removes all pages from removed array
@ -412,7 +412,7 @@
// consider just referencies, other elements are just mess in array
// unregisters observers and consolidates pageList like this node has
// been removed
@@ -1341,7 +1341,7 @@
@@ -1341,7 +1341,7 @@ using namespace observer;
kernelPrintDbg(DBG_DBG, "Consolidating page list by adding newValues.");
for(ChildrenStorage::iterator i=newValues.begin(); i!=newValues.end(); ++i)
{
@ -421,7 +421,7 @@
// consider just referencies, other elements are just mess in array
// registers observers and consolidates pageList like this node has
// been added
@@ -1372,7 +1372,7 @@
@@ -1372,7 +1372,7 @@ using namespace utils;
kernelPrintDbg(DBG_DBG, "contextType="<<contextType);
// gets original value from given context. It has to at least
// BasicChangeContext
@ -430,7 +430,7 @@
switch(contextType)
{
// This context means that just simple value has been changed and so
@@ -1381,7 +1381,7 @@
@@ -1381,7 +1381,7 @@ using namespace utils;
case BasicChangeContextType:
{
// this means that reference property has changed its value
@ -439,7 +439,7 @@
dynamic_pointer_cast<const BasicChangeContext<IProperty>, const IChangeContext<IProperty> >(context);
oldValue=basicContext->getOriginalValue();
@@ -1393,7 +1393,7 @@
@@ -1393,7 +1393,7 @@ using namespace utils;
case ComplexChangeContextType:
{
// this means that array content has changed
@ -448,7 +448,7 @@
dynamic_pointer_cast<const CArray::CArrayComplexObserverContext, const IChangeContext<IProperty> >(context);
if(!complexContex)
{
@@ -1455,7 +1455,7 @@
@@ -1455,7 +1455,7 @@ using namespace utils;
{
try
{
@ -457,7 +457,7 @@
pdf->unregisterPageTreeObservers(oldValueDict);
}catch(CObjectException & e)
{
@@ -1482,7 +1482,7 @@
@@ -1482,7 +1482,7 @@ using namespace utils;
IndiRef parentRef=ref;
if(getCachedValue(ref, parentRef, pdf->pageTreeKidsParentCache))
kernelPrintDbg(DBG_DBG, "Uses pageTreeKidsParentCache with mapping from"<<ref<<" to "<<parentRef);
@ -466,7 +466,7 @@
if(parentProp_ptr->getType()!=pDict)
{
// target of the parent reference is not dictionary,
@@ -1492,7 +1492,7 @@
@@ -1492,7 +1492,7 @@ using namespace utils;
}
// starts consolidation from parent intermediate node
@ -475,7 +475,7 @@
try
{
// if consolidatePageTree hasn't kept page count numbers, total number
@@ -1530,7 +1530,7 @@
@@ -1530,7 +1530,7 @@ using namespace utils;
{
try
{
@ -484,7 +484,7 @@
pdf->registerPageTreeObservers(newValueDict);
}catch(CObjectException & e)
{
@@ -1559,11 +1559,11 @@
@@ -1559,11 +1559,11 @@ using namespace observer;
}
if(docCatalog->containsProperty("Pages"))
{
@ -498,7 +498,7 @@
if(pageTreeRoot.get())
{
try
@@ -1623,7 +1623,7 @@
@@ -1623,7 +1623,7 @@ void CPdf::initRevisionSpecific()
for(IndirectMapping::iterator i=indMap.begin(); i!=indMap.end(); ++i)
{
IndiRef ref=i->first;
@ -507,7 +507,7 @@
if(!value.unique())
kernelPrintDbg(debug::DBG_WARN, "Somebody still holds property with with "<<ref);
}
@@ -1654,7 +1654,7 @@
@@ -1654,7 +1654,7 @@ void CPdf::initRevisionSpecific()
// is thrown
kernelPrintDbg(debug::DBG_DBG, "Getting Root field - document catalog");
IndiRef rootRef(xref->getRootNum(), xref->getRootGen());
@ -516,7 +516,7 @@
if(prop_ptr->getType()!=pDict)
{
kernelPrintDbg(debug::DBG_ERR, "Trailer dictionary doesn't point to correct document catalog "
@@ -1670,7 +1670,7 @@
@@ -1670,7 +1670,7 @@ void CPdf::initRevisionSpecific()
REGISTER_SHAREDPTR_OBSERVER(docCatalog, pageTreeRootObserver);
if(docCatalog->containsProperty("Pages"))
{
@ -525,7 +525,7 @@
if(isRef(pagesProp))
REGISTER_SHAREDPTR_OBSERVER(pagesProp, pageTreeRootObserver);
else
@@ -1680,7 +1680,7 @@
@@ -1680,7 +1680,7 @@ void CPdf::initRevisionSpecific()
// registers pageTreeNodeObserver and pageTreeKidsObserver to page tree root
// dictionary which registers these observers to whole page tree structure
@ -534,7 +534,7 @@
if(pageTreeRoot.get())
registerPageTreeObservers(pageTreeRoot);
}
@@ -1870,7 +1870,7 @@
@@ -1870,7 +1870,7 @@ boost::shared_ptr<IProperty> CPdf::getIn
// mapping doesn't exist yet, so tries to create one
// fetches object according reference
@ -543,7 +543,7 @@
assert(xref);
xref->fetch(ref.num, ref.gen, obj.get());
@@ -1883,13 +1883,13 @@
@@ -1883,13 +1883,13 @@ boost::shared_ptr<IProperty> CPdf::getIn
if(obj->getType()!=objNull)
{
IProperty * prop=utils::createObjFromXpdfObj(_this.lock(), *obj, ref);
@ -559,7 +559,7 @@
}
return prop_ptr;
@@ -1913,7 +1913,7 @@
@@ -1913,7 +1913,7 @@ using namespace utils;
// so no type check fails). We have to set this pdf temporarily, because
// _makeXpdfObject function sets xref to created Object from ip->getPdf().
// Finally restores original pdf value
@ -568,7 +568,7 @@
ip->setPdf(_this);
::Object * obj=ip->_makeXpdfObject();
ip->setPdf(original);
@@ -1940,7 +1940,7 @@
@@ -1940,7 +1940,7 @@ IndiRef CPdf::addProperty(const boost::s
// ip is not from same pdf - may be in different one or stand alone object
// toSubstitute is deep copy of ip to prevent changes in original data.
// Also sets same pdf as orignal to cloned to enable dereferencing
@ -577,7 +577,7 @@
if(hasValidPdf(ip))
{
// locks cloned object to prevent making changes (kind of workaround)
@@ -2060,8 +2060,8 @@
@@ -2060,8 +2060,8 @@ using namespace utils;
<<refEntry->first);
// ip is from read pdf and so dereferences target value
// FIXME check for valid pdf
@ -588,7 +588,7 @@
// adds dereferenced value using addProperty with collected
// container. Current mapping is set to resolving state to
@@ -2097,7 +2097,7 @@
@@ -2097,7 +2097,7 @@ using namespace utils;
ChildrenStorage::iterator i;
for(i=childrenStorage.begin(); i!=childrenStorage.end(); ++i)
{
@ -597,7 +597,7 @@
if(!isRef(*child) && !isDict(*child) && !isArray(*child) && !isStream(*child))
{
// child is none of interesting type which may hold reference
@@ -2146,7 +2146,7 @@
@@ -2146,7 +2146,7 @@ using namespace boost;
}
// checks whether given ip is from same pdf
@ -606,7 +606,7 @@
if(ipPdf.get()==this)
{
// ip is from same pdf and so all possible referencies are already in
@@ -2245,7 +2245,7 @@
@@ -2245,7 +2245,7 @@ void CPdf::changeIndirectProperty(const
throw ReadOnlyDocumentException("Document is in read-only mode.");
}
@ -615,7 +615,7 @@
if(utils::isEncrypted(_thisP))
{
kernelPrintDbg(DBG_WARN, "Changing properties for encrypted documents si not implemented");
@@ -2272,7 +2272,7 @@
@@ -2272,7 +2272,7 @@ void CPdf::changeIndirectProperty(const
// changeObject may throw if we are in read only mode or if xrefwriter is
// in paranoid mode and type check fails - to make it easier for such a case
// we are using shared_ptr which handles propObject cleanup correctly
@ -624,7 +624,7 @@
kernelPrintDbg(DBG_DBG, "Registering change to the XRefWriter");
xref->changeObject(indiRef.num, indiRef.gen, propObject.get());
@@ -2359,10 +2359,10 @@
@@ -2359,10 +2359,10 @@ using namespace std;
kernelPrintDbg(debug::DBG_DBG,"File stream created");
// stream is ready, creates CPdf instance
@ -637,7 +637,7 @@
instance->_this = instance;
// initializes revision specific data for the newest revision
@@ -2423,14 +2423,14 @@
@@ -2423,14 +2423,14 @@ using namespace utils;
// page is not available in pageList, searching has to be done
// find throws an exception if any problem found, otherwise pageDict_ptr
// contians Page dictionary at specified position.
@ -655,7 +655,7 @@
pageList.insert(PageList::value_type(pos, page_ptr));
kernelPrintDbg(DBG_DBG, "New page added to the pageList size="<<pageList.size());
@@ -2452,7 +2452,7 @@
@@ -2452,7 +2452,7 @@ using namespace utils;
return pageCount;
}
@ -664,7 +664,7 @@
if(!rootDict.get())
return 0;
pageCount=getKidsCount(rootDict, &nodeCountCache);
@@ -2531,7 +2531,7 @@
@@ -2531,7 +2531,7 @@ size_t CPdf::getPagePosition(const boost
}
@ -673,7 +673,7 @@
{
using namespace utils;
@@ -2562,12 +2562,12 @@
@@ -2562,12 +2562,12 @@ using namespace utils;
{
kernelPrintDbg(DBG_DBG, "oldValue was simple page dictionary");
difference = -1;
@ -688,7 +688,7 @@
if(page->getDictionary() == oldDict_ptr)
{
i->second->invalidate();
@@ -2598,7 +2598,7 @@
@@ -2598,7 +2598,7 @@ using namespace utils;
bool found=false;
for(PageList::iterator i=pageList.begin(); i!=pageList.end();)
{
@ -697,7 +697,7 @@
// checks page's dictionary whether it is in oldDict_ptr sub
// tree and if so removes it from pageList
if(isNodeDescendant(_this.lock(), ref, page->getDictionary()))
@@ -2698,7 +2698,7 @@
@@ -2698,7 +2698,7 @@ using namespace utils;
for(i=pageList.begin(); i!=pageList.end();)
{
size_t pos=i->first;
@ -706,7 +706,7 @@
if(pos>=minPos)
{
@@ -2782,8 +2782,8 @@
@@ -2782,8 +2782,8 @@ using namespace utils;
bool countChanged=false;
if(interNode->containsProperty("Count"))
{
@ -717,7 +717,7 @@
if(isRef(countProp))
{
try
@@ -2803,7 +2803,7 @@
@@ -2803,7 +2803,7 @@ using namespace utils;
interNode->delProperty("Count");
// adds new Count property with correct value
@ -726,7 +726,7 @@
kernelPrintDbg(DBG_DBG, "replacing old Count property with new property value="<<count);
interNode->addProperty("Count", *countInt);
countChanged=true;
@@ -2842,7 +2842,7 @@
@@ -2842,7 +2842,7 @@ using namespace utils;
size_t index=0;
for(i=kids.begin(); i!=kids.end(); ++i, ++index)
{
@ -735,7 +735,7 @@
if(!isRef(child))
{
// element is not reference, so we print warning and skip it
@@ -2861,16 +2861,16 @@
@@ -2861,16 +2861,16 @@ using namespace utils;
// gets target dictionary to check and consolidate - this doesn't throw
// because it is leaf or intermediate node
@ -755,7 +755,7 @@
if(isRef(parentProp))
parentRef=IProperty::getSmartCObjectPtr<CRef>(parentProp);
@@ -2881,7 +2881,7 @@
@@ -2881,7 +2881,7 @@ using namespace utils;
childDict->delProperty("Parent");
// adds new Parent property with correct value
@ -764,7 +764,7 @@
kernelPrintDbg(DBG_DBG, "replacing old Parent property with new");
childDict->addProperty("Parent", *parentRef);
}else
@@ -2920,12 +2920,12 @@
@@ -2920,12 +2920,12 @@ using namespace utils;
// just prints warning messages and stops recursion
if(interNode->containsProperty("Parent"))
{
@ -779,7 +779,7 @@
return consolidatePageTree(parentDict, true);
}catch(CObjectException & e)
{
@@ -2977,8 +2977,8 @@
@@ -2977,8 +2977,8 @@ using namespace utils;
// gets intermediate node where to insert new page
// in degenerated case, when there are no pages in the tree, we have to
// handle it special way
@ -790,7 +790,7 @@
// by default it is root of page tree
interNode_ptr=getPageTreeRoot(_this.lock());
if(!interNode_ptr.get())
@@ -2993,23 +2993,23 @@
@@ -2993,23 +2993,23 @@ using namespace utils;
// searches for page at storePosition and gets its reference
// page dictionary has to be an indirect object, so getIndiRef returns
// dictionary reference
@ -819,7 +819,7 @@
// gets index in Kids array where to store.
// by default insert at 1st position (index is 0)
@@ -3032,8 +3032,8 @@
@@ -3032,8 +3032,8 @@ using namespace utils;
// Now it is safe to add indirect object, because there is nothing that can
// fail
@ -830,7 +830,7 @@
if(pageDictPdf && pageDictPdf !=_this.lock())
{
// page comes from different valid pdf - we have to create clone and
@@ -3085,8 +3085,8 @@
@@ -3085,8 +3085,8 @@ using namespace utils;
// page dictionary is stored in the tree, consolidation is also done at this
// moment
// CPage can be created and inserted to the pageList
@ -841,7 +841,7 @@
pageList.insert(PageList::value_type(storePostion+append, newPage_ptr));
kernelPrintDbg(DBG_DBG, "New page added to the pageList size="<<pageList.size());
return newPage_ptr;
@@ -3113,21 +3113,21 @@
@@ -3113,21 +3113,21 @@ using namespace utils;
// Searches for page dictionary at given pos and gets its reference.
// getPageTreeRoot doesn't fail, because we are in page range and so it has
// to exist

18
editors/pdfedit/files/patch-src-kernel-cstream.c → editors/pdfedit/files/patch-src-kernel-cstream.cc
View File

@ -1,6 +1,6 @@
--- ./src/kernel/cstream.cc.orig 2015-08-23 03:19:33.639621000 +0900
+++ ./src/kernel/cstream.cc 2015-08-23 03:20:30.110651000 +0900
@@ -123,7 +123,7 @@
--- src/kernel/cstream.cc.orig 2010-04-27 18:42:09 UTC
+++ src/kernel/cstream.cc
@@ -123,7 +123,7 @@ void
CStream::createReqEntries ()
{
// Add one required entry in the stream dictionary (according to pdf specification)
@ -9,7 +9,7 @@
assert (len);
dictionary.addProperty ("Length", *len);
}
@@ -152,7 +152,7 @@
@@ -152,7 +152,7 @@ CStream::doClone () const
CDict::Value::const_iterator it = dictionary.value.begin ();
for (; it != dictionary.value.end (); ++it)
{
@ -18,7 +18,7 @@
assert (newIp);
CDict::Value::value_type item = make_pair ((*it).first, newIp);
clone_->dictionary.value.push_back (item);
@@ -204,7 +204,7 @@
@@ -204,7 +204,7 @@ CStream::setRawBuffer (const Buffer& buf
this->canChange();
// Create context
@ -27,7 +27,7 @@
// Copy buf to buffer
buffer.clear ();
@@ -324,7 +324,7 @@
@@ -324,7 +324,7 @@ CStream::getDecodedStringRepresentation
size_t
CStream::getLength () const
{
@ -36,7 +36,7 @@
if (isInt (len))
{
int length;
@@ -345,7 +345,7 @@
@@ -345,7 +345,7 @@ CStream::getLength () const
IProperty::ObserverContext*
CStream::_createContext () const
{
@ -45,7 +45,7 @@
}
@@ -353,7 +353,7 @@
@@ -353,7 +353,7 @@ CStream::_createContext () const
//
//
void
@ -54,7 +54,7 @@
{
// Do not notify anything if we are not in a valid pdf
if (!hasValidPdf (this))
@@ -380,7 +380,7 @@
@@ -380,7 +380,7 @@ CStream::_objectChanged (shared_ptr<cons
// doesn't clone but rather wrap this with shared pointer
// and empty deallocator to prevent from this instance
// deallocation

22
editors/pdfedit/files/patch-src-kernel-pdfoperators.cc
View File

@ -1,6 +1,6 @@
--- src/kernel/pdfoperators.cc.orig 2016-06-11 06:39:28.304555000 +0900
+++ src/kernel/pdfoperators.cc 2016-06-11 06:42:54.331017000 +0900
@@ -129,7 +129,7 @@
--- src/kernel/pdfoperators.cc.orig 2010-04-27 18:42:09 UTC
+++ src/kernel/pdfoperators.cc
@@ -129,7 +129,7 @@ SimpleGenericOperator::getStringRepresen
//
//
//
@ -9,7 +9,7 @@
SimpleGenericOperator::clone ()
{
// Clone operands
@@ -144,7 +144,7 @@
@@ -144,7 +144,7 @@ SimpleGenericOperator::clone ()
void
@ -18,7 +18,7 @@
boost::weak_ptr<CPdf> pdf,
IndiRef* rf)
{
@@ -204,20 +204,20 @@
@@ -204,20 +204,20 @@ using namespace utils;
}
else if (name == "TJ")
{
@ -44,7 +44,7 @@
// TODO consider spacing coming from values
if(!(isString(p)))
@@ -264,7 +264,7 @@
@@ -264,7 +264,7 @@ TextSimpleOperator::setRawText (std::str
}
else if (name == "TJ")
{
@ -53,7 +53,7 @@
if (!isArray(op) || ops.size() != 1)
{
utilsPrintDbg(debug::DBG_WARN, "Bad operands for TJ operator: ops[type="<< op->getType() <<" size="<<ops.size()<<"]");
@@ -311,7 +311,7 @@
@@ -311,7 +311,7 @@ GfxFont* TextSimpleOperator::getCurrentF
{
assert(fontData);
const char* tag = fontData->getFontTag();
@ -62,7 +62,7 @@
GfxFont* font = res->lookupFont(tag);
if(!font)
utilsPrintDbg(debug::DBG_ERR, "Unable to get font(name="
@@ -407,10 +407,10 @@
@@ -407,10 +407,10 @@ UnknownCompositePdfOperator::getStringRe
//
//
//
@ -75,7 +75,7 @@
for (PdfOperators::iterator it = _children.begin(); it != _children.end(); ++it)
clone->push_back ((*it)->clone(),getLastOperator(clone));
@@ -482,13 +482,13 @@
@@ -482,13 +482,13 @@ InlineImageCompositePdfOperator::getPara
//
//
//
@ -92,7 +92,7 @@
}
@@ -505,7 +505,7 @@
@@ -505,7 +505,7 @@ boost::shared_ptr<PdfOperator> createOpe
const StateUpdater::CheckTypes* chcktp = StateUpdater::findOp (name.c_str());
// Operator not found, create unknown operator
if (NULL == chcktp)
@ -101,7 +101,7 @@
assert (chcktp);
utilsPrintDbg (DBG_DBG, "Operator found. " << chcktp->name);
@@ -524,13 +524,13 @@
@@ -524,13 +524,13 @@ boost::shared_ptr<PdfOperator> createOpe
// If endTag is "" it is a simple operator, composite otherwise
//
if (isTextOp(*chcktp))

20
editors/pdfedit/files/patch-src-kernel-pdfoperatorsbase.cc
View File

@ -1,6 +1,6 @@
--- src/kernel/pdfoperatorsbase.cc.orig 2016-06-11 06:35:15.369169000 +0900
+++ src/kernel/pdfoperatorsbase.cc 2016-06-11 06:36:00.937632000 +0900
@@ -48,7 +48,7 @@
--- src/kernel/pdfoperatorsbase.cc.orig 2009-04-06 15:25:00 UTC
+++ src/kernel/pdfoperatorsbase.cc
@@ -48,7 +48,7 @@ using namespace debug;
//
//
//
@ -9,7 +9,7 @@
PdfOperator::getContentStream () const
{
assert (_contentstream);
@@ -57,7 +57,7 @@
@@ -57,7 +57,7 @@ PdfOperator::getContentStream () const
}
void
@ -18,7 +18,7 @@
{
if (behindWhich && which)
{
@@ -92,7 +92,7 @@
@@ -92,7 +92,7 @@ PdfOperator::putBehind (shared_ptr<PdfOp
//
//
void
@ -27,7 +27,7 @@
{
assert (oper);
kernelPrintDbg (debug::DBG_DBG, "");
@@ -136,7 +136,7 @@
@@ -136,7 +136,7 @@ CompositePdfOperator::push_back (const s
//
//
void
@ -36,7 +36,7 @@
{
PdfOperators::iterator it = find (_children.begin(), _children.end(), op);
assert (it != _children.end());
@@ -160,8 +160,8 @@
@@ -160,8 +160,8 @@ CompositePdfOperator::getChildren (PdfOp
//
//
void
@ -47,7 +47,7 @@
{
PdfOperators::iterator it = std::find (_children.begin(), _children.end(), oper);
_children.insert (++it, newOper);
@@ -189,7 +189,7 @@
@@ -189,7 +189,7 @@ CompositePdfOperator::getStringRepresent
}
void
@ -56,7 +56,7 @@
{
for (PdfOperators::iterator it = _children.begin (); it != _children.end(); ++it)
(*it)->init_operands (observer, pdf, rf);
@@ -204,8 +204,8 @@
@@ -204,8 +204,8 @@ CompositePdfOperator::init_operands (sha
//
//
//
@ -67,7 +67,7 @@
{
if (!isCompositeOp (oper) || 0 == oper->getChildrenCount())
return oper;
@@ -213,7 +213,7 @@
@@ -213,7 +213,7 @@ getLastOperator (shared_ptr<PdfOperator>
PdfOperator::PdfOperators opers;
oper->getChildren (opers);
assert (!opers.empty());

14
editors/pdfedit/files/patch-src-kernel-pdfwriter.cc
View File

@ -1,6 +1,6 @@
--- src/kernel/pdfwriter.cc.orig 2016-06-11 06:46:45.675949000 +0900
+++ src/kernel/pdfwriter.cc 2016-06-11 06:47:46.394754000 +0900
@@ -110,7 +110,7 @@
--- src/kernel/pdfwriter.cc.orig 2010-04-26 11:39:32 UTC
+++ src/kernel/pdfwriter.cc
@@ -110,7 +110,7 @@ using namespace observer;
printf("Unsupported context.\n");
return;
}
@ -9,7 +9,7 @@
dynamic_pointer_cast<const IPdfWriter::ChangeContext>(context);
size_t total=progressContext->getScope()->total;
if(!started)
@@ -427,7 +427,7 @@
@@ -427,7 +427,7 @@ using namespace std;
// contain binary data
if(obj.isStream())
{
@ -18,7 +18,7 @@
assert(filter->supportObject(obj));
filter->compress(obj, ref, stream);
}else
@@ -502,11 +502,11 @@
@@ -502,11 +502,11 @@ using namespace boost;
size_t index=0;
// creates context for observers
@ -33,7 +33,7 @@
// prepares offTable and writes objects
for(i=objectList.begin(); i!=objectList.end(); i++, index++)
@@ -659,10 +659,10 @@
@@ -659,10 +659,10 @@ size_t OldStylePdfWriter::writeTrailer(c
utilsPrintDbg(DBG_DBG, "Writing "<<subSectionTable.size()<<" subsections");
// creates context for observers
@ -46,7 +46,7 @@
// writes all subsection
size_t index=1;
@@ -704,7 +704,7 @@
@@ -704,7 +704,7 @@ size_t OldStylePdfWriter::writeTrailer(c
}
// notifies observers

6
editors/pdfedit/files/patch-src-kernel-stateupdater.cc
View File

@ -1,6 +1,6 @@
--- src/kernel/stateupdater.cc.orig 2016-06-11 06:44:12.114485000 +0900
+++ src/kernel/stateupdater.cc 2016-06-11 06:45:25.066472000 +0900
@@ -1227,7 +1227,7 @@
--- src/kernel/stateupdater.cc.orig 2009-09-11 12:02:56 UTC
+++ src/kernel/stateupdater.cc
@@ -1227,7 +1227,7 @@ bool checkAndFixOperator (const StateUpd
{ // Convert it to real
double dval = 0.0;
dval = IProperty::getSmartCObjectPtr<CInt>(*it)->getValue();

8
editors/pdfedit/files/patch-src-kernel-textoutputengines.cc
View File

@ -1,6 +1,6 @@
--- src/kernel/textoutputengines.cc.orig 2016-06-12 03:44:13.431031000 +0900
+++ src/kernel/textoutputengines.cc 2016-06-12 03:44:31.197856000 +0900
@@ -232,13 +232,13 @@
--- src/kernel/textoutputengines.cc.orig 2009-09-11 12:02:56 UTC
+++ src/kernel/textoutputengines.cc
@@ -232,13 +232,13 @@ namespace {
PdfOperator::Operands ops;
op->getParameters (ops);
assert (1 == ops.size());
@ -16,7 +16,7 @@
if (isNumber (ip))
{
int wMode = s->getFont()->getWMode();
@@ -253,8 +253,8 @@
@@ -253,8 +253,8 @@ namespace {
// Create Tj with text and add it to output
string txt = getStringFromIProperty (ip);
PdfOperator::Operands opers;

11
editors/pdfedit/files/patch-src-qsa-configure Normal file
View File

@ -0,0 +1,11 @@
--- src/qsa/configure.orig 2008-01-16 13:50:31 UTC
+++ src/qsa/configure
@@ -15,7 +15,7 @@ fi
# invoke 2nd stage
echo Building second stage2 configure
cd configure2
-$QMAKE && make > /dev/null
+$QMAKE && $MAKE > /dev/null
if [ $? -gt 0 -o ! -x configure2 ];
then
echo Failed to build

6
editors/pdfedit/files/patch-src-tools-Makfile → editors/pdfedit/files/patch-src-tools-Makefile
View File

@ -1,6 +1,6 @@
--- src/tools/Makefile.orig 2016-06-12 05:05:10.782469000 +0900
+++ src/tools/Makefile 2016-06-12 05:06:44.155717000 +0900
@@ -25,6 +25,10 @@
--- src/tools/Makefile.orig 2010-04-30 11:45:45 UTC
+++ src/tools/Makefile
@@ -25,6 +25,10 @@ TARGET = displaycs pagemetrics parse_obj
.PHONY: all clean
all: $(TARGET)

14
editors/pdfedit/files/patch-src-tools-add_image.cc
View File

@ -1,6 +1,6 @@
--- src/tools/add_image.cc.orig 2010-04-30 18:32:18.000000000 +0900
+++ src/tools/add_image.cc 2016-06-12 04:11:42.137365000 +0900
@@ -104,10 +104,10 @@
--- src/tools/add_image.cc.orig 2010-04-30 09:32:18 UTC
+++ src/tools/add_image.cc
@@ -104,10 +104,10 @@ namespace {
png_read_info(png_ptr, info_ptr);
@ -15,7 +15,7 @@
number_of_passes = png_set_interlace_handling(png_ptr);
png_read_update_info(png_ptr, info_ptr);
@@ -116,13 +116,13 @@
@@ -116,13 +116,13 @@ namespace {
if (setjmp(png_jmpbuf(png_ptr)))
return;
@ -32,7 +32,7 @@
}
fclose(fp);
@@ -132,7 +132,7 @@
@@ -132,7 +132,7 @@ namespace {
};
struct _add {
@ -41,7 +41,7 @@
const Position& where,
Point image_dim,
size_t bit_depth,
@@ -191,14 +191,14 @@
@@ -191,14 +191,14 @@ main(int argc, char ** argv)
return 1;
// open pdf
@ -58,7 +58,7 @@
if (!del) return -1;
del->delinearize(out.c_str());
}
@@ -226,7 +226,7 @@
@@ -226,7 +226,7 @@ main(int argc, char ** argv)
continue;
}

10
editors/pdfedit/files/patch-src-tools-add_text.cc
View File

@ -1,6 +1,6 @@
--- src/tools/add_text.cc.orig 2016-06-12 03:53:24.278803000 +0900
+++ src/tools/add_text.cc 2016-06-12 03:53:43.440512000 +0900
@@ -54,7 +54,7 @@
--- src/tools/add_text.cc.orig 2010-04-30 12:44:31 UTC
+++ src/tools/add_text.cc
@@ -54,7 +54,7 @@ namespace {
};
struct _add {
@ -9,7 +9,7 @@
const string& what,
const Position& where,
std::string font_id)
@@ -126,14 +126,14 @@
@@ -126,14 +126,14 @@ main(int argc, char ** argv)
return 1;
// open pdf
@ -26,7 +26,7 @@
if (!del) return -1;
del->delinearize(out.c_str());
}
@@ -154,7 +154,7 @@
@@ -154,7 +154,7 @@ main(int argc, char ** argv)
continue;
}

8
editors/pdfedit/files/patch-src-tools-displaycs.cc
View File

@ -1,6 +1,6 @@
--- src/tools/displaycs.cc.orig 2016-06-12 03:46:15.039573000 +0900
+++ src/tools/displaycs.cc 2016-06-12 03:46:33.669788000 +0900
@@ -74,7 +74,7 @@
--- src/tools/displaycs.cc.orig 2010-02-23 18:28:09 UTC
+++ src/tools/displaycs.cc
@@ -74,7 +74,7 @@ int main(int argc, char ** argv)
size_t from = vm["from"].as<size_t>();
// open pdf
@ -9,7 +9,7 @@
// sane values
size_t to = pdf->getPageCount()+1;
@@ -90,8 +90,8 @@
@@ -90,8 +90,8 @@ int main(int argc, char ** argv)
{
std::cout << "=====================" << endl;
std::cout << "PAGE NUMBER " << i << endl;

14
editors/pdfedit/files/patch-src-tools-pagemetrics.cc
View File

@ -1,6 +1,6 @@
--- src/tools/pagemetrics.cc.orig 2016-06-12 03:48:34.337781000 +0900
+++ src/tools/pagemetrics.cc 2016-06-12 03:48:53.651846000 +0900
@@ -48,7 +48,7 @@
--- src/tools/pagemetrics.cc.orig 2010-04-23 06:58:36 UTC
+++ src/tools/pagemetrics.cc
@@ -48,7 +48,7 @@ namespace {
struct stm {
static const string name;
@ -9,7 +9,7 @@
{
if (p.size() < 6) throw std::runtime_error ("too few p params");
page->setTransformMatrix (&p[0]);
@@ -58,7 +58,7 @@
@@ -58,7 +58,7 @@ namespace {
struct sr {
static const string name;
@ -18,7 +18,7 @@
{
if (p.size() < 1) throw std::runtime_error ("too few p params");
page->setRotation ((int)(p[0]));
@@ -68,7 +68,7 @@
@@ -68,7 +68,7 @@ namespace {
struct smb {
static const string name;
@ -27,7 +27,7 @@
{
if (p.size() < 4) throw std::runtime_error ("too few p params");
page->setMediabox (libs::Rectangle (p[0], p[1], p[2], p[3]));
@@ -131,7 +131,7 @@
@@ -131,7 +131,7 @@ main(int argc, char ** argv)
return 1;
// open pdf
@ -36,7 +36,7 @@
// sane values
to = std::min(to, pdf->getPageCount()+1);
@@ -139,7 +139,7 @@
@@ -139,7 +139,7 @@ main(int argc, char ** argv)
// now the hard stuff comes
for (unsigned int i = from; i < to; ++i)
{

12
editors/pdfedit/files/patch-src-tools-pdf_images.cc
View File

@ -1,6 +1,6 @@
--- src/tools/pdf_images.cc.orig 2016-06-12 04:13:54.045270000 +0900
+++ src/tools/pdf_images.cc 2016-06-12 04:14:32.874579000 +0900
@@ -51,7 +51,7 @@
--- src/tools/pdf_images.cc.orig 2010-04-27 12:25:28 UTC
+++ src/tools/pdf_images.cc
@@ -51,7 +51,7 @@ namespace {
};
// what to do with a page
struct _extract_images {
@ -9,7 +9,7 @@
{
page->displayPage (img_out, displayparams);
}
@@ -107,7 +107,7 @@
@@ -107,7 +107,7 @@ main(int argc, char ** argv)
return 1;
// open pdf
@ -18,7 +18,7 @@
ImageOutputDev img_out (const_cast<char*> (dir.c_str()), gTrue);
// alter display params
@@ -119,7 +119,7 @@
@@ -119,7 +119,7 @@ main(int argc, char ** argv)
{
for (size_t i = 1; i <= pdf->getPageCount(); ++i)
{
@ -27,7 +27,7 @@
std::cout << "\nPage " << i << ":";
_extract_images()(page, img_out, displayparams);
}
@@ -134,7 +134,7 @@
@@ -134,7 +134,7 @@ main(int argc, char ** argv)
continue;
}

12
editors/pdfedit/files/patch-src-tools-replace_text.cc
View File

@ -1,5 +1,5 @@
--- src/tools/replace_text.cc.orig 2010-02-24 03:28:09.000000000 +0900
+++ src/tools/replace_text.cc 2016-06-12 04:26:38.191487000 +0900
--- src/tools/replace_text.cc.orig 2010-02-23 18:28:09 UTC
+++ src/tools/replace_text.cc
@@ -22,6 +22,7 @@
* Project is hosted on http://sourceforge.net/projects/pdfedit
*/
@ -8,7 +8,7 @@
#include <kernel/pdfedit-core-dev.h>
#include <kernel/cpdf.h>
#include <kernel/cpage.h>
@@ -59,7 +60,7 @@
@@ -59,7 +60,7 @@ namespace {
struct _replace {
static const string name;
@ -17,7 +17,7 @@
{
page->replaceText (what, with);
}
@@ -121,14 +122,14 @@
@@ -121,14 +122,14 @@ main(int argc, char ** argv)
return 1;
// open pdf
@ -34,7 +34,7 @@
if (!del) return -1;
del->delinearize(out.c_str());
}
@@ -137,7 +138,7 @@
@@ -137,7 +138,7 @@ main(int argc, char ** argv)
// sane values
@ -43,7 +43,7 @@
// now the hard stuff comes - do this crazy loops intentionally
for (size_t things_to_replace = 0; things_to_replace < withs.size(); ++things_to_replace)
@@ -150,7 +151,7 @@
@@ -150,7 +151,7 @@ main(int argc, char ** argv)
string with = withs[things_to_replace];
for (size_t i = from; i < to; ++i)
{

4
editors/pdfedit/files/patch-src-utils-algorithms.h
View File

@ -1,5 +1,5 @@
--- src/utils/algorithms.h.orig 2016-06-11 10:27:29.196801000 +0900
+++ src/utils/algorithms.h 2016-06-11 10:27:51.958626000 +0900
--- src/utils/algorithms.h.orig 2009-04-06 15:25:01 UTC
+++ src/utils/algorithms.h
@@ -22,7 +22,7 @@
* Project is hosted on http://sourceforge.net/projects/pdfedit
*/

8
editors/pdfedit/files/patch-src-xpdf-fofi-FoFiEncodings.cc
View File

@ -1,5 +1,5 @@
--- src/xpdf/fofi/FoFiEncodings.cc.orig 2016-06-11 10:34:02.955763000 +0900
+++ src/xpdf/fofi/FoFiEncodings.cc 2016-06-11 10:34:35.315168000 +0900
--- src/xpdf/fofi/FoFiEncodings.cc.orig 2008-09-09 14:21:11 UTC
+++ src/xpdf/fofi/FoFiEncodings.cc
@@ -19,7 +19,7 @@
// Type 1 and 1C font data
//------------------------------------------------------------------------
@ -9,7 +9,7 @@
NULL,
NULL,
NULL,
@@ -278,7 +278,7 @@
@@ -278,7 +278,7 @@ char *fofiType1StandardEncoding[256] = {
NULL
};
@ -18,7 +18,7 @@
NULL,
NULL,
NULL,
@@ -541,7 +541,7 @@
@@ -541,7 +541,7 @@ char *fofiType1ExpertEncoding[256] = {
// Type 1C font data
//------------------------------------------------------------------------

4
editors/pdfedit/files/patch-src-xpdf-fofi-FoFiEncodings.h
View File

@ -1,5 +1,5 @@
--- src/xpdf/fofi/FoFiEncodings.h.orig 2016-06-11 10:35:39.548372000 +0900
+++ src/xpdf/fofi/FoFiEncodings.h 2016-06-11 10:36:01.939673000 +0900
--- src/xpdf/fofi/FoFiEncodings.h.orig 2008-09-09 14:21:11 UTC
+++ src/xpdf/fofi/FoFiEncodings.h
@@ -21,14 +21,14 @@
// Type 1 and 1C font data
//------------------------------------------------------------------------

10
editors/pdfedit/files/patch-src-xpdf-fofi-FoFiTrueType.cc
View File

@ -1,6 +1,6 @@
--- src/xpdf/fofi/FoFiTrueType.cc.orig 2016-06-11 10:37:17.000155000 +0900
+++ src/xpdf/fofi/FoFiTrueType.cc 2016-06-11 10:40:14.853257000 +0900
@@ -143,7 +143,7 @@
--- src/xpdf/fofi/FoFiTrueType.cc.orig 2009-09-11 12:02:56 UTC
+++ src/xpdf/fofi/FoFiTrueType.cc
@@ -143,7 +143,7 @@ static int cmpTrueTypeTableTag(const voi
//------------------------------------------------------------------------
struct T42Table {
@ -9,7 +9,7 @@
GBool required; // required by the TrueType spec?
};
@@ -173,7 +173,7 @@
@@ -173,7 +173,7 @@ static T42Table t42Tables[nT42Tables] =
// Glyph names in some arbitrary standard order that Apple uses for
// their TrueType fonts.
@ -18,7 +18,7 @@
".notdef", "null", "CR", "space",
"exclam", "quotedbl", "numbersign", "dollar",
"percent", "ampersand", "quotesingle", "parenleft",
@@ -2011,7 +2011,7 @@
@@ -2011,7 +2011,7 @@ void FoFiTrueType::readPostTable() {
}
}

6
editors/pdfedit/files/patch-src-xpdf-fofi-FoFiTrueType.h
View File

@ -1,6 +1,6 @@
--- src/xpdf/fofi/FoFiTrueType.h.orig 2016-06-11 10:41:33.311317000 +0900
+++ src/xpdf/fofi/FoFiTrueType.h 2016-06-11 10:41:43.645672000 +0900
@@ -156,7 +156,7 @@
--- src/xpdf/fofi/FoFiTrueType.h.orig 2009-09-11 12:02:56 UTC
+++ src/xpdf/fofi/FoFiTrueType.h
@@ -156,7 +156,7 @@ private:
Guint computeTableChecksum(Guchar *data, int length);
void parse();
void readPostTable();

6
editors/pdfedit/files/patch-src-xpdf-fofi-FoFiType1.cc
View File

@ -1,6 +1,6 @@
--- src/xpdf/fofi/FoFiType1.cc.orig 2016-06-11 10:43:43.363657000 +0900
+++ src/xpdf/fofi/FoFiType1.cc 2016-06-11 10:44:21.857241000 +0900
@@ -194,7 +194,7 @@
--- src/xpdf/fofi/FoFiType1.cc.orig 2008-09-09 14:21:12 UTC
+++ src/xpdf/fofi/FoFiType1.cc
@@ -194,7 +194,7 @@ void FoFiType1::parse() {
// get encoding
} else if (!encoding &&
!strncmp(line, "/Encoding StandardEncoding def", 30)) {

6
editors/pdfedit/files/patch-src-xpdf-fofi-FoFiType1C.cc
View File

@ -1,6 +1,6 @@
--- src/xpdf/fofi/FoFiType1C.cc.orig 2016-06-11 10:45:36.260108000 +0900
+++ src/xpdf/fofi/FoFiType1C.cc 2016-06-11 10:46:10.103508000 +0900
@@ -2261,10 +2261,10 @@
--- src/xpdf/fofi/FoFiType1C.cc.orig 2009-09-11 12:02:56 UTC
+++ src/xpdf/fofi/FoFiType1C.cc
@@ -2261,10 +2261,10 @@ void FoFiType1C::buildEncoding() {
int pos, c, sid, nLeft, nSups, i, j;
if (topDict.encodingOffset == 0) {

22
editors/pdfedit/files/patch-src-xpdf-goo-GString.cc
View File

@ -1,6 +1,6 @@
--- src/xpdf/goo/GString.cc.orig 2009-09-11 21:02:56.000000000 +0900
+++ src/xpdf/goo/GString.cc 2016-06-12 03:02:35.310062000 +0900
@@ -60,7 +60,7 @@
--- src/xpdf/goo/GString.cc.orig 2009-09-11 12:02:56 UTC
+++ src/xpdf/goo/GString.cc
@@ -60,7 +60,7 @@ enum GStringFormatType {
fmtSpace
};
@ -9,7 +9,7 @@
"d", "x", "o", "b", "ud", "ux", "uo", "ub",
"ld", "lx", "lo", "lb", "uld", "ulx", "ulo", "ulb",
"f", "g",
@@ -144,14 +144,14 @@
@@ -144,14 +144,14 @@ GString::GString(const GString *str1, co
GString *GString::fromInt(int x) {
char buf[24]; // enough space for 64-bit ints plus a little extra
@ -26,7 +26,7 @@
va_list argList;
GString *s;
@@ -162,7 +162,7 @@
@@ -162,7 +162,7 @@ GString *GString::format(char *fmt, ...)
return s;
}
@ -35,7 +35,7 @@
GString *s;
s = new GString();
@@ -213,7 +213,7 @@
@@ -213,7 +213,7 @@ GString *GString::append(const char *str
return this;
}
@ -44,7 +44,7 @@
va_list argList;
va_start(argList, fmt);
@@ -222,7 +222,7 @@
@@ -222,7 +222,7 @@ GString *GString::appendf(char *fmt, ...
return this;
}
@ -53,7 +53,7 @@
GStringFormatArg *args;
int argsLen, argsSize;
GStringFormatArg arg;
@@ -231,7 +231,7 @@
@@ -231,7 +231,7 @@ GString *GString::appendfv(char *fmt, va
GStringFormatType ft;
char buf[65];
int len, i;
@ -62,7 +62,7 @@
argsLen = 0;
argsSize = 8;
@@ -465,7 +465,7 @@
@@ -465,7 +465,7 @@ GString *GString::appendfv(char *fmt, va
void GString::formatInt(long x, char *buf, int bufSize,
GBool zeroFill, int width, int base,
@ -71,7 +71,7 @@
static char vals[17] = "0123456789abcdef";
GBool neg;
int start, i, j;
@@ -497,7 +497,7 @@
@@ -497,7 +497,7 @@ void GString::formatInt(long x, char *bu
void GString::formatUInt(Gulong x, char *buf, int bufSize,
GBool zeroFill, int width, int base,
@ -80,7 +80,7 @@
static char vals[17] = "0123456789abcdef";
int i, j;
@@ -520,7 +520,7 @@
@@ -520,7 +520,7 @@ void GString::formatUInt(Gulong x, char
}
void GString::formatDouble(double x, char *buf, int bufSize, int prec,

10
editors/pdfedit/files/patch-src-xpdf-goo-GString.h
View File

@ -1,6 +1,6 @@
--- src/xpdf/goo/GString.h.orig 2009-09-11 21:02:56.000000000 +0900
+++ src/xpdf/goo/GString.h 2016-06-12 03:01:27.367470000 +0900
@@ -67,8 +67,8 @@
--- src/xpdf/goo/GString.h.orig 2009-09-11 12:02:56 UTC
+++ src/xpdf/goo/GString.h
@@ -67,8 +67,8 @@ public:
// t -- GString *
// w -- blank space; arg determines width
// To get literal curly braces, use {{ or }}.
@ -11,7 +11,7 @@
// Destructor.
~GString();
@@ -95,8 +95,8 @@
@@ -95,8 +95,8 @@ public:
GString *append(const char *str, int lengthA);
// Append a formatted string.
@ -22,7 +22,7 @@
// Insert a character or string.
GString *insert(int i, char c);
@@ -125,12 +125,12 @@
@@ -125,12 +125,12 @@ private:
void resize(int length1);
static void formatInt(long x, char *buf, int bufSize,
GBool zeroFill, int width, int base,

8
editors/pdfedit/files/patch-src-xpdf-xpdf-BuiltinFont.cc
View File

@ -1,6 +1,6 @@
--- src/xpdf/xpdf/BuiltinFont.cc.orig 2016-06-12 03:09:00.143158000 +0900
+++ src/xpdf/xpdf/BuiltinFont.cc 2016-06-12 03:09:30.242137000 +0900
@@ -39,7 +39,7 @@
--- src/xpdf/xpdf/BuiltinFont.cc.orig 2008-09-09 14:21:13 UTC
+++ src/xpdf/xpdf/BuiltinFont.cc
@@ -39,7 +39,7 @@ BuiltinFontWidths::~BuiltinFontWidths()
gfree(tab);
}
@ -9,7 +9,7 @@
int h;
BuiltinFontWidth *p;
@@ -53,8 +53,8 @@
@@ -53,8 +53,8 @@ GBool BuiltinFontWidths::getWidth(char *
return gFalse;
}

10
editors/pdfedit/files/patch-src-xpdf-xpdf-BuiltinFont.h
View File

@ -1,6 +1,6 @@
--- src/xpdf/xpdf/BuiltinFont.h.orig 2016-06-12 03:07:21.081040000 +0900
+++ src/xpdf/xpdf/BuiltinFont.h 2016-06-12 03:08:04.015283000 +0900
@@ -23,7 +23,7 @@
--- src/xpdf/xpdf/BuiltinFont.h.orig 2008-09-09 14:21:13 UTC
+++ src/xpdf/xpdf/BuiltinFont.h
@@ -23,7 +23,7 @@ class BuiltinFontWidths;
//------------------------------------------------------------------------
struct BuiltinFont {
@ -9,7 +9,7 @@
char **defaultBaseEnc;
short ascent;
short descent;
@@ -34,7 +34,7 @@
@@ -34,7 +34,7 @@ struct BuiltinFont {
//------------------------------------------------------------------------
struct BuiltinFontWidth {
@ -18,7 +18,7 @@
Gushort width;
BuiltinFontWidth *next;
};
@@ -44,11 +44,11 @@
@@ -44,11 +44,11 @@ public:
BuiltinFontWidths(BuiltinFontWidth *widths, int sizeA);
~BuiltinFontWidths();

4
editors/pdfedit/files/patch-src-xpdf-xpdf-NameToUnicodeTable.h
View File

@ -1,5 +1,5 @@
--- src/xpdf/xpdf/NameToUnicodeTable.h.orig 2016-06-12 03:03:36.755295000 +0900
+++ src/xpdf/xpdf/NameToUnicodeTable.h 2016-06-12 03:03:51.495599000 +0900
--- src/xpdf/xpdf/NameToUnicodeTable.h.orig 2006-02-04 15:51:34 UTC
+++ src/xpdf/xpdf/NameToUnicodeTable.h
@@ -8,7 +8,7 @@
static struct {

6
editors/pdfedit/files/patch-src-xpdf-xpdf-Object.h
View File

@ -1,6 +1,6 @@
--- src/xpdf/xpdf/Object.h.orig 2015-08-23 03:17:00.826883000 +0900
+++ src/xpdf/xpdf/Object.h 2015-08-23 03:17:15.658920000 +0900
@@ -206,7 +206,7 @@
--- src/xpdf/xpdf/Object.h.orig 2009-09-11 12:04:43 UTC
+++ src/xpdf/xpdf/Object.h
@@ -206,7 +206,7 @@ public:
private:
ObjType type; // object type

6
editors/pdfedit/files/patch-src__gui__base.cc
View File

@ -1,6 +1,6 @@
--- src/gui/base.cc.orig 2010-02-22 10:17:40.000000000 +0900
+++ src/gui/base.cc 2011-03-21 20:36:57.000000000 +0900
@@ -688,7 +688,20 @@
--- src/gui/base.cc.orig 2010-02-22 01:17:40 UTC
+++ src/gui/base.cc
@@ -688,7 +688,20 @@ boost::shared_ptr<pdfobjects::CPdf> Base
if (openMode=="readonly") mode=CPdf::ReadOnly;
if (openMode=="readwrite") mode=CPdf::ReadWrite;
//Basic mode without asking a password (we do not know how)

6
editors/pdfedit/files/patch-src__gui__pdfutil.cc
View File

@ -1,6 +1,6 @@
--- src/gui/pdfutil.cc.orig 2009-04-07 00:24:47.000000000 +0900
+++ src/gui/pdfutil.cc 2011-03-21 20:36:57.000000000 +0900
@@ -451,7 +451,20 @@
--- src/gui/pdfutil.cc.orig 2009-04-06 15:24:47 UTC
+++ src/gui/pdfutil.cc
@@ -451,7 +451,20 @@ QString annotTypeName(boost::shared_ptr<
@param askPassword If true, password will be asked for if necessary
*/
boost::shared_ptr<CPdf> getPdfInstance(QWidget *parent, const QString &filename, CPdf::OpenMode mode, bool askPassword) {

72
editors/pdfedit/files/patch-src__kernel__cpagecontents.cc
View File

@ -1,6 +1,6 @@
--- src/kernel/cpagecontents.cc.orig 2010-04-30 21:44:30.000000000 +0900
+++ src/kernel/cpagecontents.cc 2016-06-11 10:25:06.981679000 +0900
@@ -55,8 +55,8 @@
--- src/kernel/cpagecontents.cc.orig 2010-04-30 12:44:30 UTC
+++ src/kernel/cpagecontents.cc
@@ -55,8 +55,8 @@ using namespace utils;
//
//
void
@ -11,7 +11,7 @@
{
kernelPrintDbg (debug::DBG_DBG, "context type=" << context->getType());
@@ -84,7 +84,7 @@
@@ -84,7 +84,7 @@ CPageContents::ContentsWatchDog::notify
case ComplexChangeContextType:
{
// Is it a dictionary Page dictionary
@ -20,7 +20,7 @@
dynamic_pointer_cast<const CDict::CDictComplexObserverContext,
const IChangeContext<IProperty> > (context);
if (ctxtdict)
@@ -102,7 +102,7 @@
@@ -102,7 +102,7 @@ CPageContents::ContentsWatchDog::notify
// 1.2 Contents entry was removed
if (isNull(newValue))
{
@ -29,7 +29,7 @@
// Unregister observer
_cnt->unreg_observer (oldValue);
@@ -116,7 +116,7 @@
@@ -116,7 +116,7 @@ CPageContents::ContentsWatchDog::notify
}
// Is it an array (Contents) -- do nothing just reparse
@ -38,7 +38,7 @@
dynamic_pointer_cast<const CArray::CArrayComplexObserverContext,
const IChangeContext<IProperty> > (context);
if (ctxtarray)
@@ -162,7 +162,7 @@
@@ -162,7 +162,7 @@ namespace {
createStreamFromObjects (const Container& cont, boost::weak_ptr<CPdf> pdf)
{
// Create stream with one default property Length
@ -47,7 +47,7 @@
// Insert our change tag
std::string str;
@@ -234,7 +234,7 @@
@@ -234,7 +234,7 @@ CPageContents::~CPageContents ()
}
@ -56,7 +56,7 @@
CPageContents::getContentStream (CContentStream* cc)
{
init();
@@ -247,7 +247,7 @@
@@ -247,7 +247,7 @@ CPageContents::getContentStream (CConten
}
@ -65,7 +65,7 @@
CPageContents::getContentStream (size_t pos)
{
init();
@@ -265,7 +265,7 @@
@@ -265,7 +265,7 @@ void
CPageContents::addToFront (const Container& cont)
{
// Create cstream from container of pdf operators
@ -74,7 +74,7 @@
assert (hasValidRef (stream)); assert (hasValidPdf (stream));
if (!hasValidPdf(stream) || !hasValidPdf(stream))
throw CObjInvalidObject ();
@@ -294,8 +294,8 @@
@@ -294,8 +294,8 @@ CPageContents::addToFront (const Contain
// Indicate change
change ();
}
@ -85,7 +85,7 @@
//
//
@@ -307,7 +307,7 @@
@@ -307,7 +307,7 @@ CPageContents::addToBack (const Containe
// Create cstream from container of pdf operators
if (!hasValidPdf(_dict))
throw CObjInvalidObject ();
@ -94,7 +94,7 @@
assert (hasValidRef (stream)); assert (hasValidPdf (stream));
if (!hasValidPdf(stream) || !hasValidPdf(stream))
throw CObjInvalidObject ();
@@ -332,8 +332,8 @@
@@ -332,8 +332,8 @@ CPageContents::addToBack (const Containe
// Indicate change
change ();
}
@ -105,7 +105,7 @@
//
@@ -379,6 +379,12 @@
@@ -379,6 +379,12 @@ CPageContents::getText (std::string& tex
// Get the text
libs::Rectangle rec = (rc)? *rc : _page->display()->getPageRect();
@ -118,7 +118,7 @@
scoped_ptr<GString> gtxt (textDev->getText(rec.xleft, rec.yleft, rec.xright, rec.yright));
text = gtxt->getCString();
}
@@ -484,11 +490,11 @@
@@ -484,11 +490,11 @@ CPageContents::addText (const std::strin
if (fontName.empty())
fontName = "PDFEDIT_F1";
double fontSize = 15.0;
@ -134,7 +134,7 @@
q->push_back(BT,q);
BT->push_back(createOperator("Tf", fontOperands), getLastOperator(BT));
@@ -497,13 +503,13 @@
@@ -497,13 +503,13 @@ CPageContents::addText (const std::strin
BT->push_back(createOperator("Tm", posOperands), getLastOperator(BT));
PdfOperator::Operands textOperands;
@ -150,7 +150,7 @@
contents.push_back(q);
addToBack (contents);
@@ -531,7 +537,7 @@
@@ -531,7 +537,7 @@ CPageContents::addInlineImage (const CSt
// EI
// Q
//
@ -159,7 +159,7 @@
// translate
q->push_back(createOperatorTranslation(where.x, where.y), getLastOperator(q));
@@ -540,19 +546,23 @@
@@ -540,19 +546,23 @@ CPageContents::addInlineImage (const CSt
CDict image_dict;
@ -190,7 +190,7 @@
contents.push_back(q);
addToBack (contents);
@@ -595,7 +605,7 @@
@@ -595,7 +605,7 @@ namespace {
// addSomewhere
template<OPERWHERE WHERE>
void
@ -199,7 +199,7 @@
{
// contents not present
if (!_dict->containsProperty (Specification::Page::CONTENTS))
@@ -607,8 +617,8 @@
@@ -607,8 +617,8 @@ namespace {
// contents present
}else
{
@ -210,7 +210,7 @@
assert (content);
// Contents can be either stream or an array of streams
if (isStream (realcontent))
@@ -620,7 +630,7 @@
@@ -620,7 +630,7 @@ namespace {
}else if (isArray (realcontent))
{
// We can be sure that streams are indirect objects (pdf spec)
@ -219,7 +219,7 @@
OpTrait<WHERE>::Oper::add (*array, ref);
}else // Neither stream nor array
@@ -672,7 +682,7 @@
@@ -672,7 +682,7 @@ CPageContents::toBack (CRef& ref)
* Indicats that the page changed.
*/
template<typename Cont>
@ -228,7 +228,7 @@
{
if (dict->containsProperty (Specification::Page::CONTENTS))
@@ -682,7 +692,7 @@
@@ -682,7 +692,7 @@ void CPageContents::setContents (shared_
// Loop throug all content streams and add all cstreams from each
// content streams to Contents entry of page dictionary
//
@ -237,7 +237,7 @@
Css css;
getAllCStreams (cont, css);
@@ -698,14 +708,14 @@
@@ -698,14 +708,14 @@ void CPageContents::setContents (shared_
}
}
// Explicit instantiation
@ -255,7 +255,7 @@
{
if (!_dict->containsProperty (Specification::Page::CONTENTS))
throw CObjInvalidOperation ();
@@ -717,7 +727,7 @@
@@ -717,7 +727,7 @@ CPageContents::remove (shared_ptr<const
// Loop throug all content streams and add all cstreams from each
// content streams to Contents entry of page dictionary
//
@ -264,7 +264,7 @@
Css css;
cs->getCStreams (css);
@@ -743,8 +753,8 @@
@@ -743,8 +753,8 @@ CPageContents::remove (shared_ptr<const
void
CPageContents::remove (const IndiRef& rf)
{
@ -275,7 +275,7 @@
assert (content);
// Contents can be either stream or an array of streams
if (isStream (realcontent))
@@ -756,7 +766,7 @@
@@ -756,7 +766,7 @@ CPageContents::remove (const IndiRef& rf
}else if (isArray (realcontent))
{
// We can be sure that streams are indirect objects (pdf spec)
@ -284,7 +284,7 @@
for (size_t i = 0; i < array->getPropertyCount(); ++i)
{
IndiRef _rf = getRefFromArray (array,i);
@@ -821,7 +831,7 @@
@@ -821,7 +831,7 @@ CPageContents::parse ()
//
if (!_dict->containsProperty (Specification::Page::CONTENTS))
return true;
@ -293,7 +293,7 @@
assert (contents);
CContentStream::CStreams streams;
@@ -831,13 +841,13 @@
@@ -831,13 +841,13 @@ CPageContents::parse ()
//
if (isStream (contents))
{
@ -309,7 +309,7 @@
for (size_t i = 0; i < array->getPropertyCount(); ++i)
streams.push_back (getCStreamFromArray(array,i));
@@ -854,7 +864,7 @@
@@ -854,7 +864,7 @@ CPageContents::parse ()
// True if Contents is not [ ]
while (!streams.empty())
{
@ -318,7 +318,7 @@
// Save smart pointer of the content stream so pdfoperators can return it
cc->setSmartPointer (cc);
_ccs.push_back (cc);
@@ -911,7 +921,7 @@
@@ -911,7 +921,7 @@ CPageContents::reg_observer (boost::shar
// If it contains Contents register observer on it too
if (_dict->containsProperty(Specification::Page::CONTENTS))
{
@ -327,7 +327,7 @@
REGISTER_SHAREDPTR_OBSERVER(prop, _wd);
}
}
@@ -933,7 +943,7 @@
@@ -933,7 +943,7 @@ CPageContents::unreg_observer (boost::sh
// Unregister contents observer
if (_dict->containsProperty(Specification::Page::CONTENTS))
{
@ -336,7 +336,7 @@
UNREGISTER_SHAREDPTR_OBSERVER(prop, _wd);
}
}
@@ -963,7 +973,7 @@
@@ -963,7 +973,7 @@ CPageContents::_page_pos () const
//
//
void
@ -345,7 +345,7 @@
{
// Get the next item
init();
@@ -975,7 +985,7 @@
@@ -975,7 +985,7 @@ CPageContents::moveAbove (shared_ptr<con
throw OutOfRange ();
// Delete next item but store it
@ -354,7 +354,7 @@
_ccs.erase (itNext, itNext + 1);
// Insert stored item before supplied (simply swap ct with the next item)
_ccs.insert (find (_ccs.begin(), _ccs.end(), ct), tmp);
@@ -993,7 +1003,7 @@
@@ -993,7 +1003,7 @@ CPageContents::moveAbove (shared_ptr<con
//
//
void
@ -363,7 +363,7 @@
{
// Get the item index
unsigned int pos = 0;
@@ -1007,7 +1017,7 @@
@@ -1007,7 +1017,7 @@ CPageContents::moveBelow (shared_ptr<con
throw CObjInvalidOperation ();
// Swap

10
editors/pdfedit/files/patch-src__tools__pdf_to_text.cc
View File

@ -1,6 +1,6 @@
--- src/tools/pdf_to_text.cc.orig 2010-04-23 15:58:36.000000000 +0900
+++ src/tools/pdf_to_text.cc 2016-06-12 03:51:28.186690000 +0900
@@ -45,8 +45,16 @@
--- src/tools/pdf_to_text.cc.orig 2010-04-23 06:58:36 UTC
+++ src/tools/pdf_to_text.cc
@@ -45,8 +45,16 @@ namespace {
};
// what to do with a page
struct _textify {
@ -18,7 +18,7 @@
string text;
static const std::string encoding="UTF-8";
page->getText (text, &encoding);
@@ -97,13 +105,13 @@
@@ -97,13 +105,13 @@ main(int argc, char ** argv)
return 1;
// open pdf
@ -34,7 +34,7 @@
std::cout << "\nPage " << i << ":\n" << _textify()(page);
}
}
@@ -117,7 +125,7 @@
@@ -117,7 +125,7 @@ main(int argc, char ** argv)
continue;
}