git: bf234f895bde - main - editors/pdfedit: Remove expired port
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 31 Dec 2023 00:08:10 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=bf234f895bde988a7efb0bb801463dc70752bfe2
commit bf234f895bde988a7efb0bb801463dc70752bfe2
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-12-29 22:50:45 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-12-31 00:06:25 +0000
editors/pdfedit: Remove expired port
2023-12-31 editors/pdfedit: BROKEN on all supported versions for 2 years after the EOL of 12
---
MOVED | 1 +
editors/Makefile | 1 -
editors/pdfedit/Makefile | 50 --
editors/pdfedit/distinfo | 2 -
editors/pdfedit/files/patch-Makefile | 12 -
editors/pdfedit/files/patch-Makefile.flags.in | 30 -
editors/pdfedit/files/patch-doc__Makefile | 12 -
.../pdfedit/files/patch-src-kernel-cannotation.cc | 96 ---
editors/pdfedit/files/patch-src-kernel-carray.cc | 118 ---
.../files/patch-src-kernel-ccontentstream.cc | 152 ----
editors/pdfedit/files/patch-src-kernel-cdict.cc | 149 ----
editors/pdfedit/files/patch-src-kernel-cdict.h | 20 -
editors/pdfedit/files/patch-src-kernel-cobject.cc | 11 -
.../files/patch-src-kernel-cobject2string.cc | 11 -
.../pdfedit/files/patch-src-kernel-cobject2xpdf.cc | 47 --
.../files/patch-src-kernel-cobjecthelpers.cc | 142 ----
.../files/patch-src-kernel-contentschangetag.cc | 25 -
editors/pdfedit/files/patch-src-kernel-cpage.cc | 35 -
.../pdfedit/files/patch-src-kernel-cpageannots.cc | 201 -----
.../files/patch-src-kernel-cpageattributes.cc | 88 ---
.../pdfedit/files/patch-src-kernel-cpagechanges.cc | 54 --
editors/pdfedit/files/patch-src-kernel-cpdf.cc | 872 ---------------------
editors/pdfedit/files/patch-src-kernel-cstream.cc | 65 --
.../pdfedit/files/patch-src-kernel-pdfoperators.cc | 120 ---
.../files/patch-src-kernel-pdfoperatorsbase.cc | 78 --
.../pdfedit/files/patch-src-kernel-pdfwriter.cc | 57 --
.../pdfedit/files/patch-src-kernel-stateupdater.cc | 20 -
.../files/patch-src-kernel-textoutputengines.cc | 29 -
editors/pdfedit/files/patch-src-qsa-configure | 11 -
editors/pdfedit/files/patch-src-tools-Makefile | 13 -
editors/pdfedit/files/patch-src-tools-add_image.cc | 69 --
editors/pdfedit/files/patch-src-tools-add_text.cc | 37 -
editors/pdfedit/files/patch-src-tools-displaycs.cc | 22 -
.../pdfedit/files/patch-src-tools-pagemetrics.cc | 47 --
.../pdfedit/files/patch-src-tools-pdf_images.cc | 38 -
.../pdfedit/files/patch-src-tools-replace_text.cc | 54 --
editors/pdfedit/files/patch-src-utils-algorithms.h | 18 -
.../files/patch-src-xpdf-fofi-FoFiEncodings.cc | 29 -
.../files/patch-src-xpdf-fofi-FoFiEncodings.h | 20 -
.../files/patch-src-xpdf-fofi-FoFiTrueType.cc | 29 -
.../files/patch-src-xpdf-fofi-FoFiTrueType.h | 11 -
.../pdfedit/files/patch-src-xpdf-fofi-FoFiType1.cc | 11 -
.../files/patch-src-xpdf-fofi-FoFiType1C.cc | 15 -
.../pdfedit/files/patch-src-xpdf-goo-GString.cc | 91 ---
editors/pdfedit/files/patch-src-xpdf-goo-GString.h | 40 -
.../files/patch-src-xpdf-xpdf-BuiltinFont.cc | 22 -
.../files/patch-src-xpdf-xpdf-BuiltinFont.h | 34 -
.../files/patch-src-xpdf-xpdf-NameToUnicodeTable.h | 11 -
editors/pdfedit/files/patch-src-xpdf-xpdf-Object.h | 11 -
editors/pdfedit/files/patch-src__gui__base.cc | 24 -
editors/pdfedit/files/patch-src__gui__pdfutil.cc | 24 -
.../files/patch-src__kernel__cpagecontents.cc | 374 ---------
.../pdfedit/files/patch-src__tools__pdf_to_text.cc | 45 --
editors/pdfedit/pkg-descr | 6 -
editors/pdfedit/pkg-plist | 179 -----
55 files changed, 1 insertion(+), 3782 deletions(-)
diff --git a/MOVED b/MOVED
index 6ba5936ba0a7..15b287eb6480 100644
--- a/MOVED
+++ b/MOVED
@@ -8239,3 +8239,4 @@ net/asterisk16|asterisk18|2023-12-31|Has expired: Upstream EOL reaches on 2023-1
games/quake3||2023-12-31|Has expired: BROKEN for more than 4 years on all supported versions after the EOL of 12
audio/xmradio||2023-12-31|Has expired: Requires defunct bktr
editors/xi-core||2023-12-31|Has expired: Project is currently discontinued, one depend port broken (editors/xi-term set to deprecation too). Upstream recommends editors/lapce
+editors/pdfedit||2023-12-31|Has expired: BROKEN on all supported versions for 2 years after the EOL of 12
diff --git a/editors/Makefile b/editors/Makefile
index f7d8ed7a8204..ec53deb9ab8c 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -233,7 +233,6 @@
SUBDIR += p5-Vimana
SUBDIR += paredit-mode.el
SUBDIR += parinfer-rust
- SUBDIR += pdfedit
SUBDIR += pico-alpine
SUBDIR += picpas
SUBDIR += pluma
diff --git a/editors/pdfedit/Makefile b/editors/pdfedit/Makefile
deleted file mode 100644
index 625c8b893ff3..000000000000
--- a/editors/pdfedit/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-PORTNAME= pdfedit
-PORTVERSION= 0.4.5
-PORTREVISION= 17
-CATEGORIES= editors
-MASTER_SITES= SF
-
-MAINTAINER= hrs@FreeBSD.org
-COMMENT= PDF document manipulating library
-WWW= http://pdfedit.cz/
-
-LICENSE= GPLv2
-
-DEPRECATED= BROKEN on all supported versions for 2 years after the EOL of 12
-EXPIRATION_DATE= 2023-12-31
-BROKEN_powerpc64= fails to configure: error: Could not link against boost_program_options
-BROKEN_sparc64= fails to configure: error: Could not link against boost_program_options
-BROKEN_FreeBSD_13= fails to compile: call to 'advance' is ambiguous
-BROKEN_FreeBSD_14= fails to compile: call to 'advance' is ambiguous
-
-LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \
- libfreetype.so:print/freetype2 \
- libpng.so:graphics/png \
- libt1.so:devel/t1lib
-
-USES= gmake perl5 tar:bzip2
-USE_CXXSTD= c++98
-USE_PERL5= build
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-root-dir=${STAGEDIR} \
- --with-ft-library=${LOCALBASE}/lib \
- --with-ft-includes=${LOCALBASE}/include \
- --with-t1-library=${LOCALBASE}/lib \
- --with-t1-includes=${LOCALBASE}/include \
- --with-parallel-make=off \
- --disable-gui \
- --enable-pdfedit-core-dev \
- --enable-tools
-INSTALL_TARGET= install install-tools
-PORTDOCS= Changelog README AUTHORS
-
-OPTIONS_DEFINE= DOCS
-
-post-extract:
- ${INSTALL_DATA} ${WRKSRC}/doc/AUTHORS ${WRKSRC}
-
-post-install-DOCS-on:
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/editors/pdfedit/distinfo b/editors/pdfedit/distinfo
deleted file mode 100644
index 13f3a323c202..000000000000
--- a/editors/pdfedit/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (pdfedit-0.4.5.tar.bz2) = 33ad8d59f4e51d8befd2dc2c577516e16c0cd11ebd3d22fed38233a793c6a4b9
-SIZE (pdfedit-0.4.5.tar.bz2) = 3026130
diff --git a/editors/pdfedit/files/patch-Makefile b/editors/pdfedit/files/patch-Makefile
deleted file mode 100644
index 004872048fe9..000000000000
--- a/editors/pdfedit/files/patch-Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
-
-+install-tools:
-+ cd $(TOOLSROOT) && $(MAKE) install
-+
-
- # Common uninstall target. It depends on configuration which specific
- # uninstallation target will be used
diff --git a/editors/pdfedit/files/patch-Makefile.flags.in b/editors/pdfedit/files/patch-Makefile.flags.in
deleted file mode 100644
index e91683e5a65b..000000000000
--- a/editors/pdfedit/files/patch-Makefile.flags.in
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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@
-
--EXTRA_UTILS_CXXFLAGS = @EXTRA_UTILS_CXXFLAGS@ -pedantic
--EXTRA_KERNEL_CXXFLAGS = @EXTRA_KERNEL_CXXFLAGS@ -pedantic
-+EXTRA_UTILS_CXXFLAGS = @EXTRA_UTILS_CXXFLAGS@
-+EXTRA_KERNEL_CXXFLAGS = @EXTRA_KERNEL_CXXFLAGS@
- EXTRA_TESTS_CXXFLAGS = @EXTRA_TESTS_CXXFLAGS@
- EXTRA_GUI_CXXFLAGS = @EXTRA_GUI_CXXFLAGS@ -D CONFIG_DATA_PATH="$(DATA_PATH)"
--EXTRA_XPDF_CXXFLAGS = @EXTRA_XPDF_CXXFLAGS@ -pedantic
-+EXTRA_XPDF_CXXFLAGS = @EXTRA_XPDF_CXXFLAGS@
-
- # same like for compiler stuff we also define 2 levels
- # CONFIG_{NAME} can be used for qmake direct {NAME} can be used
- # for compilation
--CONFIG_CFLAGS = $(DEBUG) $(OPTIM) $(ARCH) $(WARN) $(C_EXTRA) @STACK_PROTECTOR_FLAGS@ -pipe -posix -ansi -std=c99 -pedantic
--CONFIG_CXXFLAGS = $(DEBUG) $(OPTIM) $(ARCH) $(WARN) $(CXX_EXTRA) $(OBSERVER_CXXFLAGS) @STACK_PROTECTOR_FLAGS@ -pipe -posix -ansi -std=c++98
-+CONFIG_CFLAGS = $(DEBUG) $(WARN) $(C_EXTRA) @STACK_PROTECTOR_FLAGS@
-+CONFIG_CXXFLAGS = $(DEBUG) $(WARN) $(CXX_EXTRA) $(OBSERVER_CXXFLAGS) @STACK_PROTECTOR_FLAGS@
-
--CFLAGS = $(CONFIG_CFLAGS)
--CXXFLAGS = $(CONFIG_CXXFLAGS)
-+CFLAGS += $(CONFIG_CFLAGS)
-+CXXFLAGS += $(CONFIG_CXXFLAGS)
-
- #######################################
- # Absolute paths for all components
diff --git a/editors/pdfedit/files/patch-doc__Makefile b/editors/pdfedit/files/patch-doc__Makefile
deleted file mode 100644
index d517e84b31a5..000000000000
--- a/editors/pdfedit/files/patch-doc__Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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)
-- $(MKDIR) $(INSTALL_ROOT)$(DOC_PATH)/;
-- $(COPY_FILE) LICENSE.GPL ../README ../Changelog AUTHORS README-* \
-- README.cygwin $(INSTALL_ROOT)$(DOC_PATH)
-
- # TODO maybe we should be less brutal here and delete only our files However we
- # have no list of installed doc files. This list is probably too much effort
diff --git a/editors/pdfedit/files/patch-src-kernel-cannotation.cc b/editors/pdfedit/files/patch-src-kernel-cannotation.cc
deleted file mode 100644
index 265fd9a303af..000000000000
--- a/editors/pdfedit/files/patch-src-kernel-cannotation.cc
+++ /dev/null
@@ -1,96 +0,0 @@
---- 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;
-- shared_ptr<IAnnotInitializator> impl=implElem->second;
-+ boost::shared_ptr<IAnnotInitializator> impl=implElem->second;
-
- // use registerd implementator
- return (*impl)(annotDict, annotType);
- }
-
--bool UniversalAnnotInitializer::registerInitializer(std::string annotType, shared_ptr<IAnnotInitializator> impl, bool forceNew)
-+bool UniversalAnnotInitializer::registerInitializer(std::string annotType, boost::shared_ptr<IAnnotInitializator> impl, bool forceNew)
- {
- AnnotList::iterator elem=implList.find(annotType);
- if(elem!=implList.end())
-@@ -229,10 +229,10 @@ bool LinkAnnotInitializer::operator()(bo
- } // namespace utils
-
- // initialization of static
--shared_ptr<utils::IAnnotInitializator>
--CAnnotation::annotInit=shared_ptr<utils::IAnnotInitializator>(new utils::UniversalAnnotInitializer());
-+boost::shared_ptr<utils::IAnnotInitializator>
-+CAnnotation::annotInit=boost::shared_ptr<utils::IAnnotInitializator>(new utils::UniversalAnnotInitializer());
-
--shared_ptr<CAnnotation> CAnnotation::createAnnotation(libs::Rectangle rect, string annotType)
-+boost::shared_ptr<CAnnotation> CAnnotation::createAnnotation(libs::Rectangle rect, string annotType)
- {
- using namespace debug;
- using namespace utils;
-@@ -240,7 +240,7 @@ using namespace utils;
- kernelPrintDbg(DBG_DBG, "");
-
- // creates new empty dictionary for annotation
-- shared_ptr<CDict> annotDictionary(CDictFactory::getInstance());
-+ boost::shared_ptr<CDict> annotDictionary(CDictFactory::getInstance());
-
- // initializes annotation dictionary maintaining information:
- // Type of annotation dictionary has to be Annot (this is not strongly
-@@ -249,7 +249,7 @@ using namespace utils;
- checkAndReplace(annotDictionary, "Type", *typeField);
-
- // Rectangle of annotation is constructed from given parameter
-- shared_ptr<IProperty> rectField(getIPropertyFromRectangle(rect));
-+ boost::shared_ptr<IProperty> rectField(getIPropertyFromRectangle(rect));
- checkAndReplace(annotDictionary, "Rect", *rectField);
-
- // last modified date field (M) is initialized to current local time
-@@ -257,7 +257,7 @@ using namespace utils;
- time(&currTime);
- struct tm currLocalTime;
- localtime_r(&currTime, &currLocalTime);
-- shared_ptr<IProperty> mField=getIPropertyFromDate(&currLocalTime);
-+ boost::shared_ptr<IProperty> mField=getIPropertyFromDate(&currLocalTime);
- checkAndReplace(annotDictionary, "M", *mField);
-
- // initializes annotation dictionary according desired type - at least Type
-@@ -270,7 +270,7 @@ using namespace utils;
- if(!initialized)
- kernelPrintDbg(DBG_WARN, "Unable to initialize annotation dictionary with type="<<annotType);
-
-- return shared_ptr<CAnnotation>(new CAnnotation(annotDictionary));
-+ return boost::shared_ptr<CAnnotation>(new CAnnotation(annotDictionary));
- }
-
- void CAnnotation::invalidate()
-@@ -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
-- shared_ptr<CAnnotation> current(this, EmptyDeallocator<CAnnotation>());
-- notifyObservers(current, shared_ptr<ChangeContext>());
-+ boost::shared_ptr<CAnnotation> current(this, EmptyDeallocator<CAnnotation>());
-+ notifyObservers(current, boost::shared_ptr<ChangeContext>());
- }
-
- CAnnotation::AnnotType CAnnotation::getType()const
-@@ -295,14 +295,14 @@ using namespace debug;
-
- try
- {
-- shared_ptr<IProperty> subTypeProp=annotDictionary->getProperty("Subtype");
-+ boost::shared_ptr<IProperty> subTypeProp=annotDictionary->getProperty("Subtype");
- if(!isName(subTypeProp))
- {
- // TODO may be problem if value is indirect (what is not very usual)
- kernelPrintDbg(DBG_WARN, "Subtype is not Name. Type="<<subTypeProp->getType());
- return Unknown;
- }
-- shared_ptr<CName> subTypeName=IProperty::getSmartCObjectPtr<CName>(subTypeProp);
-+ boost::shared_ptr<CName> subTypeName=IProperty::getSmartCObjectPtr<CName>(subTypeProp);
- string typeName;
- subTypeName->getValue(typeName);
- return utils::annotTypeMapping(typeName);
diff --git a/editors/pdfedit/files/patch-src-kernel-carray.cc b/editors/pdfedit/files/patch-src-kernel-carray.cc
deleted file mode 100644
index 8a376b6c8b8e..000000000000
--- a/editors/pdfedit/files/patch-src-kernel-carray.cc
+++ /dev/null
@@ -1,118 +0,0 @@
---- src/kernel/carray.cc.orig 2009-09-11 12:02:56 UTC
-+++ src/kernel/carray.cc
-@@ -80,7 +80,7 @@ CArray::getStringRepresentation (string&
- //
- //
- //
--shared_ptr<IProperty>
-+boost::shared_ptr<IProperty>
- CArray::getProperty (PropertyId id) const
- {
- //kernelPrintDbg (debug::DBG_DBG,"getProperty() " << id);
-@@ -88,7 +88,7 @@ CArray::getProperty (PropertyId id) cons
- if (id >= value.size())
- throw OutOfRange ();
-
-- shared_ptr<IProperty> ip = value[id];
-+ boost::shared_ptr<IProperty> ip = value[id];
- // Set mode only if pdf is valid
- _setMode (ip,id);
-
-@@ -146,7 +146,7 @@ CArray::delProperty (PropertyId id)
- // Check whether we can make the change
- this->canChange();
-
-- shared_ptr<IProperty> oldip = value[id];
-+ boost::shared_ptr<IProperty> oldip = value[id];
-
- // Delete that item
- value.erase (remove (value.begin(), value.end(), oldip));
-@@ -156,11 +156,11 @@ CArray::delProperty (PropertyId id)
- assert (hasValidRef (this));
-
- // Create contest
-- shared_ptr<ObserverContext> context (_createContext (oldip,id));
-+ boost::shared_ptr<ObserverContext> context (_createContext (oldip,id));
-
- try {
- // notify observers and dispatch the change
-- _objectChanged (shared_ptr<IProperty> (new CNull), context);
-+ _objectChanged (boost::shared_ptr<IProperty> (new CNull), context);
-
- }catch (PdfException&)
- {
-@@ -181,7 +181,7 @@ CArray::delProperty (PropertyId id)
- //
- // Correctly to add an object (without name) can be done only to Array object
- //
--shared_ptr<IProperty>
-+boost::shared_ptr<IProperty>
- CArray::addProperty (const IProperty& newIp)
- {
- //kernelPrintDbg (debug::DBG_DBG,"addProperty(...)");
-@@ -193,7 +193,7 @@ CArray::addProperty (const IProperty& ne
- //
- // REMARK: because of the compiler, we can't put PropertyId here
- //
--shared_ptr<IProperty>
-+boost::shared_ptr<IProperty>
- CArray::addProperty (PropertyId position, const IProperty& newIp)
- {
- //kernelPrintDbg (debug::DBG_DBG,"addProperty(" << position << ")");
-@@ -208,7 +208,7 @@ CArray::addProperty (PropertyId position
- this->canChange();
-
- // Clone the added property
-- shared_ptr<IProperty> newIpClone = newIp.clone ();
-+ boost::shared_ptr<IProperty> newIpClone = newIp.clone ();
- assert (newIpClone);
-
- // Inherit id, gen number and pdf
-@@ -230,7 +230,7 @@ CArray::addProperty (PropertyId position
- assert (hasValidRef (this));
-
- // Create contest
-- shared_ptr<ObserverContext> context (_createContext(shared_ptr<IProperty>(new CNull ()), position));
-+ boost::shared_ptr<ObserverContext> context (_createContext(boost::shared_ptr<IProperty>(new CNull ()), position));
-
- try {
- // notify observers and dispatch the change
-@@ -256,7 +256,7 @@ CArray::addProperty (PropertyId position
- //
- //
- //
--shared_ptr<IProperty>
-+boost::shared_ptr<IProperty>
- CArray::setProperty (PropertyId id, IProperty& newIp)
- {
- //kernelPrintDbg (debug::DBG_DBG, "setProperty(" << id << ")");
-@@ -269,9 +269,9 @@ CArray::setProperty (PropertyId id, IPro
- this->canChange();
-
- // Save the old one
-- shared_ptr<IProperty> oldip = value[id];
-+ boost::shared_ptr<IProperty> oldip = value[id];
- // Clone the added property
-- shared_ptr<IProperty> newIpClone = newIp.clone ();
-+ boost::shared_ptr<IProperty> newIpClone = newIp.clone ();
- assert (newIpClone);
-
- // Inherit id, gen number and pdf
-@@ -289,7 +289,7 @@ CArray::setProperty (PropertyId id, IPro
- assert (hasValidRef (this));
-
- // Create contest
-- shared_ptr<ObserverContext> context (_createContext (oldip,id));
-+ boost::shared_ptr<ObserverContext> context (_createContext (oldip,id));
-
- try {
- // notify observers and dispatch the change
-@@ -437,7 +437,7 @@ CArray::doClone () const
- //
- //
- IProperty::ObserverContext*
--CArray::_createContext (shared_ptr<IProperty> changedIp, PropertyId id)
-+CArray::_createContext (boost::shared_ptr<IProperty> changedIp, PropertyId id)
- {
- //kernelPrintDbg (debug::DBG_DBG, "");
-
diff --git a/editors/pdfedit/files/patch-src-kernel-ccontentstream.cc b/editors/pdfedit/files/patch-src-kernel-ccontentstream.cc
deleted file mode 100644
index 4a57caf8db3a..000000000000
--- a/editors/pdfedit/files/patch-src-kernel-ccontentstream.cc
+++ /dev/null
@@ -1,152 +0,0 @@
---- 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
-- opsSetPdfRefCs (shared_ptr<PdfOperator> first,
-+ opsSetPdfRefCs (boost::shared_ptr<PdfOperator> first,
- boost::weak_ptr<CPdf> pdf,
- IndiRef rf,
- CContentStream& cs,
-@@ -204,7 +204,7 @@ namespace {
- }else
- {// We have an OPERAND
-
-- shared_ptr<IProperty> pIp (createObjFromXpdfObj (*o));
-+ boost::shared_ptr<IProperty> pIp (createObjFromXpdfObj (*o));
- operands.push_back (pIp);
- }
-
-@@ -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.
- */
-- shared_ptr<PdfOperator>
-+ boost::shared_ptr<PdfOperator>
- createOperatorFromStream (CStreamsXpdfReader<CContentStream::CStreams>& streamreader,
- PdfOperator::Operands& operands)
- {
- // Get operands
- boost::shared_ptr< ::Object> o(XPdfObjectFactory::getInstance(), xpdf::object_deleter());
- if (!createOperandsFromStream (streamreader, operands, o))
-- return shared_ptr<PdfOperator> ();
-+ return boost::shared_ptr<PdfOperator> ();
-
- //
- // SPECIAL CASE for inline image (stream within a text stream)
-@@ -246,8 +246,8 @@ namespace {
- throw ElementBadTypeException ("Content stream operator has incorrect operand type.");
- }
-
-- shared_ptr<CInlineImage> inimg (getInlineImage (streamreader));
-- return shared_ptr<PdfOperator> (new InlineImageCompositePdfOperator (inimg, chcktp->name, chcktp->endTag));
-+ boost::shared_ptr<CInlineImage> inimg (getInlineImage (streamreader));
-+ return boost::shared_ptr<PdfOperator> (new InlineImageCompositePdfOperator (inimg, chcktp->name, chcktp->endTag));
- }
-
- // factory function for all other operators
-@@ -269,11 +269,11 @@ namespace {
- *
- * @return New pdf operator.
- */
-- shared_ptr<PdfOperator>
-+ boost::shared_ptr<PdfOperator>
- parseOp (CStreamsXpdfReader<CContentStream::CStreams>& streamreader, PdfOperator::Operands& operands)
- {
- // Create operator with its operands
-- shared_ptr<PdfOperator> result = createOperatorFromStream (streamreader, operands);
-+ boost::shared_ptr<PdfOperator> result = createOperatorFromStream (streamreader, operands);
-
- if (result && isCompositeOp (result) && !isInlineImageOp (result))
- {
-@@ -283,7 +283,7 @@ namespace {
- bool foundEndTag = false;
-
- // The same as in (re)parse
-- shared_ptr<PdfOperator> newop, previousLast = result;
-+ boost::shared_ptr<PdfOperator> newop, previousLast = result;
-
- //
- // Use recursion to get all operators
-@@ -348,7 +348,7 @@ namespace {
- if (!hasValidPdf (*it) || !hasValidRef (*it))
- throw CObjInvalidObject ();
- }
-- weak_ptr<CPdf> pdf = streams.front()->getPdf ();
-+ boost::weak_ptr<CPdf> pdf = streams.front()->getPdf ();
- assert (pdf.lock());
- IndiRef rf = streams.front()->getIndiRef ();
-
-@@ -357,8 +357,8 @@ namespace {
- streamreader.open ();
-
- PdfOperator::Operands operands;
-- shared_ptr<PdfOperator> topoperator (new UnknownCompositePdfOperator ("",""));
-- shared_ptr<PdfOperator> newop, previousLast = topoperator;
-+ boost::shared_ptr<PdfOperator> topoperator (new UnknownCompositePdfOperator ("",""));
-+ boost::shared_ptr<PdfOperator> newop, previousLast = topoperator;
-
- //
- // Parsing can throw, if so the stream is invalid
-@@ -469,10 +469,10 @@ namespace {
- typedef PdfOperator::BBox BBox;
-
- // Init resources
-- void operator() (shared_ptr<GfxResources>) const {}
-+ void operator() (boost::shared_ptr<GfxResources>) const {}
-
- // Loop through operators
-- void operator() (shared_ptr<PdfOperator> op, BBox rc, const GfxState&) const
-+ void operator() (boost::shared_ptr<PdfOperator> op, BBox rc, const GfxState&) const
- {
- // If not initialized, means an error occured (missing font etc..)
- if (!BBox::isInitialized (rc))
-@@ -736,7 +736,7 @@ CContentStream::_objectChanged ()
-
- // Notify observers
- boost::shared_ptr<CContentStream> current (this, EmptyDeallocator<CContentStream> ());
-- this->notifyObservers (current, shared_ptr<const ObserverContext> (new BasicObserverContext (current)));
-+ this->notifyObservers (current, boost::shared_ptr<const ObserverContext> (new BasicObserverContext (current)));
- }
-
-
-@@ -856,7 +856,7 @@ CContentStream::insertOperator (Operator
- // Set correct IndiRef, CPdf and cs to inserted operator
- assert (hasValidRef (cstreams.front()));
- assert (hasValidPdf (cstreams.front()));
-- weak_ptr<CPdf> pdf = cstreams.front()->getPdf();
-+ boost::weak_ptr<CPdf> pdf = cstreams.front()->getPdf();
- assert (pdf.lock());
- IndiRef rf = cstreams.front()->getIndiRef ();
- opsSetPdfRefCs (newOper, pdf, rf, *this, operandobserver);
-@@ -937,7 +937,7 @@ CContentStream::frontInsertOperator (boo
- // Check whether we can make the change
- cstreams.front()->canChange();
- IndiRef rf = cstreams.front()->getIndiRef ();
-- weak_ptr<CPdf> pdf = cstreams.front()->getPdf();
-+ boost::weak_ptr<CPdf> pdf = cstreams.front()->getPdf();
- assert (pdf.lock());
- // set accordingly
- opsSetPdfRefCs (newoper, pdf, rf, *this, operandobserver);
-@@ -949,9 +949,9 @@ CContentStream::frontInsertOperator (boo
- { // Insert into
- opsSetPdfRefCs (newoper, pdf, rf, *this, operandobserver);
-
-- shared_ptr<PdfOperator> secondoper = operators.front();
-+ boost::shared_ptr<PdfOperator> secondoper = operators.front();
- operators.push_front (newoper);
-- shared_ptr<PdfOperator> lastofnew = getLastOperator (newoper);
-+ boost::shared_ptr<PdfOperator> lastofnew = getLastOperator (newoper);
- secondoper->setPrev (lastofnew);
- lastofnew->setNext (secondoper);
- }
-@@ -992,7 +992,7 @@ CContentStream::replaceOperator (Operato
- // Set correct IndiRef, CPdf and cs to inserted operator
- assert (hasValidRef (cstreams.front()));
- assert (hasValidPdf (cstreams.front()));
-- weak_ptr<CPdf> pdf = cstreams.front()->getPdf();
-+ boost::weak_ptr<CPdf> pdf = cstreams.front()->getPdf();
- assert (pdf.lock());
- IndiRef rf = cstreams.front()->getIndiRef ();
- opsSetPdfRefCs (newOper, pdf, rf, *this, operandobserver);
diff --git a/editors/pdfedit/files/patch-src-kernel-cdict.cc b/editors/pdfedit/files/patch-src-kernel-cdict.cc
deleted file mode 100644
index 32d0493b7a7b..000000000000
--- a/editors/pdfedit/files/patch-src-kernel-cdict.cc
+++ /dev/null
@@ -1,149 +0,0 @@
---- 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
- //
- //
- //
--shared_ptr<IProperty>
-+boost::shared_ptr<IProperty>
- CDict::getProperty (PropertyId id) const
- {
- //kernelPrintDbg (debug::DBG_DBG,"getProperty() " << id);
-@@ -111,7 +111,7 @@ CDict::getProperty (PropertyId id) const
- if (it == value.end())
- throw ElementNotFoundException ("", "");
-
-- shared_ptr<IProperty> ip = cmp.getIProperty ();
-+ boost::shared_ptr<IProperty> ip = cmp.getIProperty ();
-
- // Set mode only if pdf is valid
- _setMode (ip,id);
-@@ -188,7 +188,7 @@ CDict::delProperty (PropertyId id)
- if (oldit == value.end())
- throw ElementNotFoundException ("CDict", "item not found");
-
-- shared_ptr<IProperty> oldip = cmp.getIProperty ();
-+ boost::shared_ptr<IProperty> oldip = cmp.getIProperty ();
-
- // Delete that item
- value.erase (oldit);
-@@ -198,11 +198,11 @@ CDict::delProperty (PropertyId id)
- assert (hasValidRef (this));
-
- // Indicate that this object has changed
-- shared_ptr<ObserverContext> context (_createContext (oldip,id));
-+ boost::shared_ptr<ObserverContext> context (_createContext (oldip,id));
-
- try {
- // notify observers and dispatch the change
-- _objectChanged (shared_ptr<IProperty> (new CNull), context);
-+ _objectChanged (boost::shared_ptr<IProperty> (new CNull), context);
-
- }catch (PdfException&)
- {
-@@ -224,7 +224,7 @@ CDict::delProperty (PropertyId id)
- //
- // Correctly add an object (with name) can be done only to Dict and Stream object
- //
--shared_ptr<IProperty>
-+boost::shared_ptr<IProperty>
- CDict::addProperty (const string& propertyName, const IProperty& newIp)
- {
- kernelPrintDbg (debug::DBG_DBG,"addProperty( " << propertyName << ",...)");
-@@ -239,7 +239,7 @@ CDict::addProperty (const string& proper
- throw CObjInvalidObject ();
-
- // Clone the added property
-- shared_ptr<IProperty> newIpClone = newIp.clone ();
-+ boost::shared_ptr<IProperty> newIpClone = newIp.clone ();
- if (newIpClone)
- {
- // Inherit id, gen number and pdf
-@@ -260,7 +260,7 @@ CDict::addProperty (const string& proper
- assert (hasValidRef (this));
-
- // notify observers and dispatch change
-- shared_ptr<ObserverContext> context (_createContext(shared_ptr<IProperty>(new CNull ()), propertyName));
-+ boost::shared_ptr<ObserverContext> context (_createContext(boost::shared_ptr<IProperty>(new CNull ()), propertyName));
-
- try {
- // notify observers and dispatch the change
-@@ -285,7 +285,7 @@ CDict::addProperty (const string& proper
- //
- //
- //
--shared_ptr<IProperty>
-+boost::shared_ptr<IProperty>
- CDict::setProperty (PropertyId id, IProperty& newIp)
- {
- kernelPrintDbg (debug::DBG_DBG, "setProperty(" << id << ")");
-@@ -308,9 +308,9 @@ CDict::setProperty (PropertyId id, IProp
- return addProperty (id, newIp);
-
- // Save the old one
-- shared_ptr<IProperty> oldIp = cmp.getIProperty ();
-+ boost::shared_ptr<IProperty> oldIp = cmp.getIProperty ();
- // Clone the added property
-- shared_ptr<IProperty> newIpClone = newIp.clone ();
-+ boost::shared_ptr<IProperty> newIpClone = newIp.clone ();
- assert (newIpClone);
-
- // Inherit id, gen number and pdf
-@@ -328,7 +328,7 @@ CDict::setProperty (PropertyId id, IProp
- assert (hasValidRef (this));
-
- // Notify observers and dispatch change
-- shared_ptr<ObserverContext> context (_createContext (oldIp,id));
-+ boost::shared_ptr<ObserverContext> context (_createContext (oldIp,id));
-
- try {
- // notify observers and dispatch the change
-@@ -382,7 +382,7 @@ CDict::_makeXpdfObject () const
- Value::const_iterator it = value.begin();
- for (; it != value.end(); ++it)
- {
-- shared_ptr<IProperty> prop = it->second;
-+ boost::shared_ptr<IProperty> prop = it->second;
- Object * propObj = prop->_makeXpdfObject();
- dictObj->dictAdd(copyString((it->first).c_str()), propObj);
- gfree(propObj);
-@@ -398,7 +398,7 @@ CDict::_makeXpdfObject () const
- //
- void
- CDict::_objectChanged
-- (shared_ptr<IProperty> newValue, shared_ptr<const ObserverContext> context)
-+ (boost::shared_ptr<IProperty> newValue, boost::shared_ptr<const ObserverContext> context)
- {
- // Do not notify anything if we are not in a valid pdf
- if (!hasValidPdf (this))
-@@ -424,10 +424,10 @@ CDict::_objectChanged
- // Set mode
- //
- void
--CDict::_setMode (shared_ptr<IProperty> ip, PropertyId id) const
-+CDict::_setMode (boost::shared_ptr<IProperty> ip, PropertyId id) const
- {
- configuration::ModeController* modecontroller = NULL;
-- shared_ptr<CPdf> p = this->getPdf().lock();
-+ boost::shared_ptr<CPdf> p = this->getPdf().lock();
- if ( p && (NULL != (modecontroller=p->getModeController())))
- {
- assert (modecontroller);
-@@ -451,7 +451,7 @@ CDict::_setMode (shared_ptr<IProperty> i
- }else
- { // We have found a type
- string tmp;
-- shared_ptr<IProperty> type = cmp.getIProperty ();
-+ boost::shared_ptr<IProperty> type = cmp.getIProperty ();
- if (isName (type))
- IProperty::getSmartCObjectPtr<CName>(type)->getValue(tmp);
- mode = modecontroller->getMode (tmp, id);
-@@ -498,7 +498,7 @@ CDict::doClone () const
- //
- //
- IProperty::ObserverContext*
--CDict::_createContext (shared_ptr<IProperty> changedIp, PropertyId id)
-+CDict::_createContext (boost::shared_ptr<IProperty> changedIp, PropertyId id)
- {
- // Create the context
- return new CDictComplexObserverContext (changedIp, id);
diff --git a/editors/pdfedit/files/patch-src-kernel-cdict.h b/editors/pdfedit/files/patch-src-kernel-cdict.h
deleted file mode 100644
index 7f50cc4b0de3..000000000000
--- a/editors/pdfedit/files/patch-src-kernel-cdict.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
-- CDict* dict = dynamic_cast<const CDict*> (&ip);
-+ const CDict* dict = dynamic_cast<const CDict*> (&ip);
- setSimpleValueInDict<Value, ItemType, ItemPType> (*dict, name, val);
- }
-
-@@ -812,7 +812,7 @@ setSimpleValueInDict (const IProperty& i
- throw ElementBadTypeException ("");
-
- // Cast it to dict
-- CDict* dict = dynamic_cast<const CDict*> (&ip);
-+ const CDict* dict = dynamic_cast<const CDict*> (&ip);
-
- setSimpleValueInDict<ItemType> (*dict, name, val);
- }
diff --git a/editors/pdfedit/files/patch-src-kernel-cobject.cc b/editors/pdfedit/files/patch-src-kernel-cobject.cc
deleted file mode 100644
index cbd369dd0fd9..000000000000
--- a/editors/pdfedit/files/patch-src-kernel-cobject.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 ();
-
-- shared_ptr<CPdf> pdf = ip.getPdf ().lock ();
-+ boost::shared_ptr<CPdf> pdf = ip.getPdf ().lock ();
- IndiRef ref = ip.getIndiRef();
- if ( &ip == (indiObj=pdf->getIndirectProperty(ref)).get() )
- return false;
diff --git a/editors/pdfedit/files/patch-src-kernel-cobject2string.cc b/editors/pdfedit/files/patch-src-kernel-cobject2string.cc
deleted file mode 100644
index b82aa152edec..000000000000
--- a/editors/pdfedit/files/patch-src-kernel-cobject2string.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)
- {
-- shared_ptr<Object> ptrObj (xpdfObjFromString(str), xpdf::object_deleter());
-+ boost::shared_ptr<Object> ptrObj (xpdfObjFromString(str), xpdf::object_deleter());
-
- assert (objReal == ptrObj->getType ());
- if (objReal != ptrObj->getType() && objInt != ptrObj->getType())
diff --git a/editors/pdfedit/files/patch-src-kernel-cobject2xpdf.cc b/editors/pdfedit/files/patch-src-kernel-cobject2xpdf.cc
deleted file mode 100644
index a8251c9eb095..000000000000
--- a/editors/pdfedit/files/patch-src-kernel-cobject2xpdf.cc
+++ /dev/null
@@ -1,47 +0,0 @@
---- 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());
-
-- shared_ptr<IProperty> cobj;
-+ boost::shared_ptr<IProperty> cobj;
- // Create CObject from it
- if (isPdfValid(pdf))
- {
- hasValidRef (ip);
-- cobj = shared_ptr<IProperty> (createObjFromXpdfObj (pdf, *obj, ip.getIndiRef()));
-+ cobj = boost::shared_ptr<IProperty> (createObjFromXpdfObj (pdf, *obj, ip.getIndiRef()));
-
- }else
- {
-- cobj = shared_ptr<IProperty> (createObjFromXpdfObj (*obj));
-+ cobj = boost::shared_ptr<IProperty> (createObjFromXpdfObj (*obj));
- }
-
- if (cobj)
-@@ -504,12 +504,12 @@ namespace {
- obj->free ();
- dict.dictGetValNF (i,obj.get());
-
-- shared_ptr<IProperty> cobj;
-+ boost::shared_ptr<IProperty> cobj;
- // Create CObject from it
- if (isPdfValid (pdf))
-- cobj = shared_ptr<IProperty> (createObjFromXpdfObj (pdf, *obj, ip.getIndiRef()));
-+ cobj = boost::shared_ptr<IProperty> (createObjFromXpdfObj (pdf, *obj, ip.getIndiRef()));
- else
-- cobj = shared_ptr<IProperty> (createObjFromXpdfObj (*obj));
-+ cobj = boost::shared_ptr<IProperty> (createObjFromXpdfObj (*obj));
-
- if (cobj)
- {
-@@ -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
-- shared_ptr< ::Object> streamDictObj(XPdfObjectFactory::getInstance(), xpdf::object_deleter());
-+ boost::shared_ptr< ::Object> streamDictObj(XPdfObjectFactory::getInstance(), xpdf::object_deleter());
- streamDictObj->initDict((Dict *)streamObject.streamGetDict());
- std::string dict;
- xpdfObjToString(*streamDictObj, dict);
diff --git a/editors/pdfedit/files/patch-src-kernel-cobjecthelpers.cc b/editors/pdfedit/files/patch-src-kernel-cobjecthelpers.cc
deleted file mode 100644
index 10b93ea04228..000000000000
--- a/editors/pdfedit/files/patch-src-kernel-cobjecthelpers.cc
+++ /dev/null
@@ -1,142 +0,0 @@
---- 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;
-
-- shared_ptr<IProperty> prop_ptr=dict->getProperty(name);
-+ boost::shared_ptr<IProperty> prop_ptr=dict->getProperty(name);
- if(prop_ptr->getType() != pInt)
- {
- // malformed dictionary
- throw ElementBadTypeException(name/*, prop_ptr->getType()*/);
- }
-
-- shared_ptr<CInt> int_ptr=IProperty::getSmartCObjectPtr<CInt>(prop_ptr);
-+ boost::shared_ptr<CInt> int_ptr=IProperty::getSmartCObjectPtr<CInt>(prop_ptr);
- return int_ptr->getValue();
- }
-
-@@ -57,14 +57,14 @@ IndiRef getRefFromDict(std::string name,
- {
- using namespace boost;
-
-- shared_ptr<IProperty> prop_ptr=dict->getProperty(name);
-+ boost::shared_ptr<IProperty> prop_ptr=dict->getProperty(name);
- if(prop_ptr->getType() != pRef)
- {
- // malformed dictionary
- throw ElementBadTypeException(name/*, prop_ptr->getType()*/);
- }
-
-- shared_ptr<CRef> int_ptr=IProperty::getSmartCObjectPtr<CRef>(prop_ptr);
-+ boost::shared_ptr<CRef> int_ptr=IProperty::getSmartCObjectPtr<CRef>(prop_ptr);
- return int_ptr->getValue();
- }
-
-@@ -72,14 +72,14 @@ std::string getStringFromDict(std::strin
- {
- using namespace boost;
-
-- shared_ptr<IProperty> prop_ptr=dict->getProperty(name);
-+ boost::shared_ptr<IProperty> prop_ptr=dict->getProperty(name);
- if(prop_ptr->getType() != pString)
- {
- // malformed dictionary
- throw ElementBadTypeException(name);
- }
-
-- shared_ptr<CString> str_ptr=IProperty::getSmartCObjectPtr<CString>(prop_ptr);
-+ boost::shared_ptr<CString> str_ptr=IProperty::getSmartCObjectPtr<CString>(prop_ptr);
- return str_ptr->getValue();
- }
-
-@@ -87,14 +87,14 @@ std::string getNameFromDict(std::string
- {
- using namespace boost;
-
-- shared_ptr<IProperty> prop_ptr=dict->getProperty(name);
-+ boost::shared_ptr<IProperty> prop_ptr=dict->getProperty(name);
- if(prop_ptr->getType() != pName)
- {
- // malformed dictionary
- throw ElementBadTypeException(name);
- }
-
-- shared_ptr<CName> name_ptr=IProperty::getSmartCObjectPtr<CName>(prop_ptr);
-+ boost::shared_ptr<CName> name_ptr=IProperty::getSmartCObjectPtr<CName>(prop_ptr);
- std::string value;
- name_ptr->getValue(value);
-
-@@ -125,7 +125,7 @@ boost::shared_ptr<CDict> getDictFromRef(
- // gets reference value and dereferences indirect object
- IndiRef ref;
- IProperty::getSmartCObjectPtr<CRef>(refProp)->getValue(ref);
-- shared_ptr<CPdf> pdf = refProp->getPdf().lock();
-+ boost::shared_ptr<CPdf> pdf = refProp->getPdf().lock();
- assert(pdf);
- boost::shared_ptr<IProperty> indirect_ptr=pdf->getIndirectProperty(ref);
- if(indirect_ptr->getType() != pDict)
-@@ -237,7 +237,7 @@ getReferencedObject (boost::shared_ptr<I
-
- IndiRef ref;
- IProperty::getSmartCObjectPtr<CRef>(ip)->getValue(ref);
-- shared_ptr<CPdf> pdf = ip->getPdf().lock();
-+ boost::shared_ptr<CPdf> pdf = ip->getPdf().lock();
- assert(pdf);
- return pdf->getIndirectProperty (ref);
-
-@@ -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
-- shared_ptr<CArray> array(CArrayFactory::getInstance());
-+ boost::shared_ptr<CArray> array(CArrayFactory::getInstance());
- 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 @@ using namespace boost;
- return array;
- }
*** 3205 LINES SKIPPED ***