File git-2013-02-17.diff of Package pdfedit

Overview Repositories Revisions Requests Users Attributes Meta

File git-2013-02-17.diff of Package pdfedit (Revision 46a0105b886be6202b96024177860898)

Currently displaying revision 46a0105b886be6202b96024177860898 , Show latest

5efb58265d0b Follow up compile fixes
ce35d6abcdac fix for bt#383
f499a4cba131 xpdf: fix compiler warning
3d563186f939 kernel: namespace cleanup
2ff848b64b40 xpdf: make sure that unicode paramter is always initialized
c69826d7f643 kerenel: big boost namespace cleanup
740d3f91cc6b xpdf: report 0 length stream properly
e5c0470704a8 xpdf: SplashOutputDev::getFont can use const name
5f3f327ba46b xpdf: fix unitialized variable warnings
092e6b621cb5 gui: Ignore generated version.cc
b1f7969ef236 qsa: Ignore generated files
3c27c8c795d0 tests: Ignore compiled files
a656c3eaf58d tools: Ignore compiled files
fb8df6483b3c Ignore generated files
ff9b82448c25 kernel: InlineImageCompositePdfOperator clone fix
96ccde97a665 build: add cscope target
4d86d7507f72 kernel: validate dictionary keys properly
2eb45271f101 kernel: fix makeNamePdfValid
893b2b5a69c3 Get rid of getversion -t parameter
87e2044d0099 makedist script refactoring
12613a53a286 Simplify getversion
136ffb961133 get rid of CVS remainings
057a1efb5103 Remove CVS leftovers
0b7f3b13da60 Reverting, another fix for copying temporaries problem
e40a4ab33c75 not initialized member variable fixed! rotatation was not checked when adding new lines after line fragments (despite different rotation, it was still handled like one line)
a7e452171ef1 rvalue temporaries changed to lvalues because of noncopyability (see 8.5.3)
9b4e8627f871 - removing noncopyable for cobjectsimple ( cobjectsimple is copied in cpagecontents:570 )
88434b82de11 - few improvements - nasty not initialized bug
1e7854e6f3e7 compilation fix on one 64 (size_t!=unsigned int)
5ce4d45d3895 few params added to pdf_to_text
9e87a770b4f6 personal
640f174bfef5 - files encoded as hex strings with '\' character code were escaped which resulted in additional text appereance
1b8b6e158dc5 at least look in current dir for t1 fonts in win32
cc912cdabcc7 vs2008 compilation issue - expl. specialization could not be instantiated
e8f6f485bad7 explicit instiantiation was missing (how have we run linux tests???...???)
79dc8a3f5d46 implemented BI (inline image bbox handling)
6b045f97c44a strange behaviour of deque in VS implementation of stl, it MUST have _HAS_ITERATOR_DEBUGGING defined
99f18a4615c9 release-tools configuration added
57bafd9f6bfa preparing for release configuration
a82285147c92 preparing for release configuration
e7b937419058 added libpng section
ee3e6cc09b52 Patch grabed from poppler GIT tree and it fixes a security issue tracked as CVE-2010-4653
654e3691c3d0 kernel: remove stupid CArray->Rectangle->CArray juggle in CPageAttributes::fillInherited
352621f211c5 kernel: Make CPageChanges::displayChange container parameter a reference
32772daa783d kernel: use pre-incrementation rather than post-inc
de288a750e5e fixed if spaces in path
f70e32427d7c fixed if spaces in path
2c60268c0159 doc: update docbook templates detection for slackware
14bc64e5d113 doc: OpenSUSE build service repositories
aea81995a3cd configure: make portability and c/c++ standard compilation flags configurable
71cc4b386587 typo
2b5d39de64a6 some poppler fixes received CVE numbers
41fa39d01193 seems to be incorrect lib for tools
18229bdf8780 I had to reinstall PC so a complete new guide
292c1066e405 xpdf: Gfx::Gfx properly initialize parser
368bc1d1af0c xpdf: Gfx make sure obj is a num before reading it
27b58d670537 xpdf: Gfx give a value to color.c[i]
1fb41ef6db8e xpdf: SampledFunction::transform fix crash when idx is out of range
1271bc404a1a xpdf: FofiType1::parse fix crash in proken pdf (code < 0)
be11ec69e06c xpdf: Fix crash in broken pdf (parser->getStream() is 0)
c07292fc3773 build: do not use -I. in the include path
aa4f9f095d4e use unsigned char for isCTYPE function family
4efc07f6f697 use page media box/rotation when getting text from a page instead of relying on the default values.
321106fd0acc kernel: use new C{Dict,Array}::getProperty<Type> to clean up code a bit and remove unused helpers
f9547147bcf4 kernel: makeStringPdfValid do not escape already escaped string
f3c5dfffa6b5 kernel: add CStream::getProperty<Type>(name) method
2b9f39c2b5ca kernel: add {CArray,CDict}::getproperty<Type> method
2769fe1e5a4b unicode to font char codes implementation v1 patch set
6ee3dc24a73b kernel: add createOperatorText helper
9754fcb7c741 kernel: refactor CContentStream instantiation
f558fdc1b3c2 kernel: enable CContentStream withtout streams
f3ab1bfc6f50 kernel: replace TextSimpleOperator::setRawText by setFontText
a61917e940e2 xpdf: implement font based Unicode to Char code translation
36d94ab36528 kernel: fix TextSimpleOperator::setRawText for TJ operator
783b341176e2 kernel: fix bad TextSimpleOperator::getRawText
22c611ac435e configure: check for libpng and its header if tools are configured
e56640f387c0 scripting: don't call saveChanges in go
9e30b41fc982 Fix bug #356 (typo: FLAGS / FALGS in readme and makefile)
8a76588e6776 gui: Enable opening read-only documents

Index: pdfedit-0.4.5/Makefile
===================================================================
--- pdfedit-0.4.5.orig/Makefile
+++ pdfedit-0.4.5/Makefile
@@ -94,6 +94,9 @@ source:
 pdfedit-core-dev:
 	cd $(SRCROOT) && $(MAKE) pdfedit-core-dev
 
+cscope:
+	( git ls-files '*.[h,c]' '*.cc' '*.cpp' 2>/dev/null || find . $ -name .git -type d -prune $ -o $ -name '*.[h,c]' -type f -print $ -o $ -name '*.cpp' -type f -print $ -o $ -name "*.cc" -type f -print $ ) | xargs cscope -b
+
 # cleanup
 clean:
 	cd $(DOCROOT) && $(MAKE) clean || true
Index: pdfedit-0.4.5/Makefile.flags.in
===================================================================
--- pdfedit-0.4.5.orig/Makefile.flags.in
+++ pdfedit-0.4.5/Makefile.flags.in
@@ -140,8 +140,8 @@ EXTRA_XPDF_CXXFLAGS = @EXTRA_XPDF_CXXFLA
 # 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) $(OPTIM) $(ARCH) $(WARN) $(C_EXTRA) @STACK_PROTECTOR_FLAGS@ -pipe @C_PORTABILITY_FLAGS@
+CONFIG_CXXFLAGS	= $(DEBUG) $(OPTIM) $(ARCH) $(WARN) $(CXX_EXTRA) $(OBSERVER_CXXFLAGS) @STACK_PROTECTOR_FLAGS@ -pipe @CXX_PORTABILITY_FLAGS@
 
 CFLAGS = $(CONFIG_CFLAGS)
 CXXFLAGS = $(CONFIG_CXXFLAGS)
@@ -176,6 +176,7 @@ CPPUNITFLAGS	 = @CPPUNIT_CFLAGS@
 FREETYPEFLAGS	 = @FT2_CFLAGS@
 ZLIBFLAGS	 = @ZLIB_CPPFLAGS@
 T1FLAGS		 = @t1_CFLAGS@
+PNGFLAGS	 = @png_CFLAGS@
 XPDFLAGS 	 = -I$(XPDFROOT)/ 
 # This is required for qmake which always forces -I when specifying 
 # INCLUDEPATH
@@ -185,7 +186,7 @@ QOUTPUTDEVPATH	 = $(QOUTPUTDEVROOT)
 QOUTPUTDEVFLAGS  = -I$(QOUTPUTDEVPATH)
 
 # All necessary includes for building
-MANDATORY_INCPATH = -I. -I$(SRCROOT) $(XPDFLAGS) $(BOOSTFLAGS)\
+MANDATORY_INCPATH = -I$(SRCROOT) $(XPDFLAGS) $(BOOSTFLAGS)\
 		   $(FREETYPEFLAGS) $(T1FLAGS) $(ZLIBFLAGS)
 # This is required for qmake which always forces -I when specifying 
 MANDATORY_PATHS	  = $(SRCROOT) $(XPDFLAGS) $(BOOSTFLAGS) $(FREETYPEFLAGS)
@@ -197,6 +198,7 @@ DIST_INCPATH	 = -I$(INCLUDE_PATH) -I$(IN
 FREETYPE_LIBS    = @FT2_LIBS@
 T1_LIBS		 = @t1_LIBS@
 ZLIB_LIBS	 = @ZLIB_LIBS@
+PNG_LIBS	 = @png_LIBS@
 
 BOOST_LIBS 	 = @BOOST_LDFLAGS@
 BOOSTPROGRAMOPTIONS_LIBS = @BOOST_PROGRAM_OPTIONS_LIB@
Index: pdfedit-0.4.5/README
===================================================================
--- pdfedit-0.4.5.orig/README
+++ pdfedit-0.4.5/README
@@ -75,6 +75,8 @@ All tools use boost-program-options libr
 system if you want to compile them (see later how to enable them). Some
 distributions use a separate package (e.g. Debian) but most others include
 it directly into boost package.
+add_image tool uses libpng and its headers so libpng-dev package has to be 
+installed.
 
 Gui
 ---
@@ -221,6 +223,8 @@ uses this feature):
 	 make install will install also header files, libraries and
 	 pdfedit-core-dev-config helper script (see Installation directories
 	 bellow). This option is disabled by default.
+	-poratability-flags - adds compiler flags which force c99/c++98 
+	 standard and posix/ansi portability. This option is enabled by default.
 
 Default configuration process will check for the number of CPUs/cores and 
 use this value for make jobs parallelization (each make will use different
@@ -408,6 +412,14 @@ You can use cygwin_build.bat to start th
 to set CYGWIN_ROOT in the file first). This will create the package in 
 /tmp/pdfedit-package and create pack.bat to pack the package with 7-zip
 
+Please note that we have received reports about PDFedit failing to compile
+under some Cygwin releases. The problem turned out to be related to 
+implementation of c++ standard wrt. to some functions definitions (e.g. mkstemp)
+under Cygwin.
+The only reasonable solution is turning off portability and c/c++ standards
+compiler flags. Please use --enable-portability-flags=no if you encounters
+these problems.
+
 
 FreeBSD build
 =============
@@ -478,6 +490,7 @@ RPM based distros
 =================
 * OpenSUSE provides package via the Packman repository
   (http://ftp.skynet.be/pub/packman/suse/10.3/)
+  Build service access - https://build.opensuse.org/package/show?package=pdfedit&project=KDE%3AKDE3
 * Package for Mandriva can be obtained from http://rpmlinux.org
 
 Gentoo package
@@ -513,7 +526,7 @@ If you want to use this package followin
     You should use EPREFIX/pdfedit-core-dev-config script 
 	e.g. this way in Makefile:
 	CXXFLAGS = $(shell pdfedit-core-dev-config --cflags)
-	LDFALGS = $(shell pdfedit-core-dev-config --libs)
+	LDFLAGS = $(shell pdfedit-core-dev-config --libs)
 
   - autoconf way
     pdfedit source package comes with the config/pdfedit-core-dev.m4 autoconf
Index: pdfedit-0.4.5/configure.in
===================================================================
--- pdfedit-0.4.5.orig/configure.in
+++ pdfedit-0.4.5/configure.in
@@ -128,6 +128,25 @@ AC_SUBST(EXTRA_TESTS_CXXFLAGS)
 AC_SUBST(EXTRA_GUI_CXXFLAGS)
 AC_SUBST(EXTRA_XPDF_CXXFLAGS)
 
+AC_ARG_ENABLE(portability-flags,
+	      [AS_HELP_STRING([--enable-portability-flags],
+			      [Turn on compilation flags which force the c/c++ standard constructs and proper portability (this includes -std=c99, -std=c++98, -ansi, -posix, -pedantic). Enabled by default])],
+			      ,
+			      [enable_portability_flags=yes])
+AC_MSG_CHECKING(whether c/c++ and portability flags are forced)
+if test "x$enable_portability_flags" = "xyes"
+then
+	C_PORTABILITY_FLAGS="-posix -ansi -std=c99 -pedantic -D_XOPEN_SOURCE=500"
+	CXX_PORTABILITY_FLAGS="-posix -ansi -std=c++98 -D_XOPEN_SOURCE=500"
+	AC_MSG_RESULT(yes)
+else
+	C_PORTABILITY_FLAGS=""
+	CXX_PORTABILITY_FLAGS=""
+	AC_MSG_RESULT(no)
+fi
+AC_SUBST(C_PORTABILITY_FLAGS)
+AC_SUBST(CXX_PORTABILITY_FLAGS)
+
 dnl Default (and configurable) values for libraries
 CHK_OR_DEFINE_VAR(AR, "ar cqs")
 CHK_OR_DEFINE_VAR(LIBPREFIX, "lib")
@@ -574,12 +593,12 @@ if test "x$enable_tools" = "xyes"
 then
 	AC_MSG_RESULT(yes)
 	boost_program_options_required=yes
+	png_required=yes
 	if test "x$enable_pdfedit_core_dev" != "xyes"
 	then
 		AC_MSG_ERROR(--enable pdfedit-core-dev is required for tools)
 	fi
 	TOOLS_TARGET="$TOOLS_TARGET tools"
-
 else
 	AC_MSG_RESULT(no)
 fi
@@ -591,6 +610,33 @@ then
 	AX_BOOST_PROGRAM_OPTIONS
 fi
 
+png_LIBS=""
+png_HEADERS=""
+if test "x$png_required" = "xyes"
+then
+	AC_MSG_CHECKING(for png library)
+	AC_LANG_SAVE
+	AC_LANG_C
+	AC_CHECK_LIB(png, png_check_sig, [pnglib=yes])
+	AC_CHECK_HEADERS(png.h, [pngheader=yes])
+	AC_LANG_RESTORE
+	if test "x$pnglib" = "x" 
+	then
+		AC_MSG_ERROR(libpng is not found)
+	fi
+	if test "x$pngheader" = "x"
+	then
+		AC_MSG_ERROR(png headers is missing)
+	fi
+	AC_MSG_RESULT(yes)
+
+	dnl keep the header specific settings empty and library simply
+	dnl for now but let's integrate it into the rest of the building system
+	png_LIBS="-lpng"
+fi
+AC_SUBST(png_LIBS)
+AC_SUBST(png_CFLAGS)
+
 AC_CONFIG_FILES([Makefile.flags Makefile.rules])
 
 dnl
Index: pdfedit-0.4.5/doc/tools/docbook_xslt_paths
===================================================================
--- pdfedit-0.4.5.orig/doc/tools/docbook_xslt_paths
+++ pdfedit-0.4.5/doc/tools/docbook_xslt_paths
@@ -7,3 +7,4 @@
 /usr/share/xml/docbook/stylesheet/nwalsh/html		
 /usr/share/xml/docbook/stylesheet/nwalsh*/*/html
 /usr/share/xml/docbook/stylesheet/docbook-xsl/html
+/usr/share/xml/docbook/xsl-style-sheets-1.75-1/html
Index: pdfedit-0.4.5/doc/user/install/compiling.xml
===================================================================
--- pdfedit-0.4.5.orig/doc/user/install/compiling.xml
+++ pdfedit-0.4.5/doc/user/install/compiling.xml
@@ -18,7 +18,7 @@
    First step is to run configuration script, it will do some checks of required libraries and environment.
    Also, it allow to alter default settings
    (which is that the application will be installed in /usr/local directory tree)
-   In CVS root (or root of distribution archive)
+   In GIT root (or root of distribution archive)
    type <command>./configure [parameters]</command> to run configuration
   </formalpara>
   <para>
@@ -36,13 +36,13 @@
   </formalpara>
   <formalpara>
    <title>Installing</title>
-   In CVS root (or root of distribution archive)
+   In GIT root (or root of distribution archive)
    type <command>make install</command> to install PDF Editor. It will check whether the project is compiled
    (if not, it will compile it) and install the editor.
   </formalpara>
   <formalpara>
    <title>Uninstalling</title>
-   In CVS root (or root of distribution archive)
+   In GIT root (or root of distribution archive)
    type <command>make uninstall</command> to uninstall PDF Editor.
    The editor must be already built (and installed) for this to work.
    This will remove all the files that have been installed by <command>make install</command>
Index: pdfedit-0.4.5/getversion
===================================================================
--- pdfedit-0.4.5.orig/getversion
+++ pdfedit-0.4.5/getversion
@@ -31,23 +31,19 @@
 #		 should be used when reporting bugs.
 #
 # where
-#	VERSION - stands for the last upstream release
-#	RELEASE - contains the times-stamp (in YYYYMMDDHHMMSS format) of the 
-#		  last modified file so that we are able to find out the state 
-#		  of compiled sources (newer than released, patch for testing 
-#		  correctly applied, etc.). 
-#		  This string is empty for upstream releases (when 
-#		  PACKAGE_VERSION variable changes) which is recognized 
-#		  by the times-stamp stored in the RELEASE_STAMP_FILE when we
-#		  do a release. If the current time-stamp is different from
-#		  the one stored in RELEASE_STAMP_FILE (or this file doesn't
-#		  exist - case for CVS checkout) than the release string is
-#		  used - and we know that the compiled version is not from
-#		  the same released sources (or at least we can check that 
-#		  easily).
+#	VERSION - stands for the last upstream release (last tagged tree)
+#	RELEASE - stands for the commit on top of the last released.
+#		  no release is printed if we are at the tagged release.
+#		  if the tree contains some uncommitted changes then we add
+#		  -dirty suffix.
+#       example:
+#		 0.4.5-057a1ef[-dirty] 
+#
+# Released tarbal contains .scmversion file which contains full version with
+# release number
 #
 # Usage:
-# ./getversion [[v] [-r]|[-f]|[-t]
+# ./getversion [[v] [-r]|[-f]
 # where
 #	-v prints VERSION
 #	-r prints REVISION
@@ -55,17 +51,36 @@
 #	   (all other parameters are ignored if this parameter is specified).
 #	   This can be used for dependency creation for files which directly
 #	   depend on generated revision
-#	-t prints time-stamp for revision (intended for makedist script which 
-#	   should store this time-stamp to the RELEASE_STAMP_FILE)
-#	   (all other parameters are ignored if this parameter is specified).
 #
 # Nothing is printed if no parameter is specified
 
-PACKAGE_VERSION=0.4.5
-PACKAGE_RELEASE=""
+# Get back to the script location because of .scmversion and .git checks
+cd `dirname $0`
+
+if [ -f .scmversion ]
+then
+	PACKAGE_VERSION=`cat .scmversion`
+	PACKAGE_RELEASE=""
+elif [ -d .git ]
+then
+	FULL=`git describe`
+	PACKAGE_VERSION=`echo $FULL | cut -d'-' -f1`
+	if [ $FULL != $PACKAGE_VERSION ]
+	then
+		PACKAGE_RELEASE="-`git rev-parse --verify --short HEAD`"
+	fi
+
+	# Uncommitted changes
+	if [ `git diff-index --name-only HEAD | wc -l` -gt 0 ]
+	then
+		PACKAGE_RELEASE="${PACKAGE_RELEASE}-dirty"
+	fi
+else
+	echo "Eeeek neither a released archive nor a git tree" >&2
+	exit 1
+fi
 GETVERSION_DIR=`dirname $0`
 EXLUDE_FILES="version_exclude"
-RELEASE_STAMP_FILE="release_stamp"
 
 cd $GETVERSION_DIR
 
@@ -74,6 +89,11 @@ print_version()
 	echo -n $PACKAGE_VERSION
 }
 
+print_release()
+{
+	echo -n "$PACKAGE_RELEASE"
+}
+
 CWD=`pwd`
 FIND="find src -type f $ -name '*.cc' -o -name '*.h' -o -name '*.qs' $ \
 	| grep -v -f $EXLUDE_FILES \
@@ -84,39 +104,11 @@ print_files()
 	eval $FIND	
 }
 
-print_timestamp()
-{
-	export TZ="UTC"
-	date --date=@`print_files | xargs stat -c "%Y" | \
-		grep -v -f $EXLUDE_FILES| \
-		sort -r | head -n1` -u +%Y%m%d%H%M%S
-}
-
-print_release()
-{
-	# Files which shouldn't be checked during PACKAGE_RELEASE calculation
-	PACKAGE_RELEASE_FILE="`print_timestamp`"
-
-	# Calculates current release, if we are not releasing
-
-	# set release only if timestamp doesn't exist (sources from CVS)
-	# or timestamp is doesn't match
-	if [ ! -f "$RELEASE_STAMP_FILE" ] || [ "`cat $RELEASE_STAMP_FILE`" != "$PACKAGE_RELEASE_FILE" ]
-	then  
-		echo Using new revision: $PACKAGE_RELEASE_FILE >&2
-		PACKAGE_RELEASE="-$PACKAGE_RELEASE_FILE"
-		echo -n $PACKAGE_RELEASE
-		exit 0
-	fi
-	echo We are at the clean release tree: no release >&2
-}
-
 while [ $# -gt 0 ]
 do
 	case $1 in
 		-v ) PRINT_VERSION="1" ;;
 		-r ) PRINT_RELEASE="1" ;;
-		-t ) print_timestamp; exit 0;;
 		-f ) print_files; exit 0;;
 	esac
 	shift
Index: pdfedit-0.4.5/projects/packaging/package.py
===================================================================
--- pdfedit-0.4.5.orig/projects/packaging/package.py
+++ pdfedit-0.4.5/projects/packaging/package.py
@@ -56,15 +56,15 @@ class Execute:
 pack_tools = {
   "class" : "Execute",
   "cmd"   : """
-              rd /Q /S $tmp_dir && md $tmp_dir
-              md $tmp_dir\\bin
-              md $tmp_dir\\src
-              cd $bin_dir && copy *tool*exe $tmp_dir\\bin && copy *.dll $tmp_dir\\bin
-              cd $tools_src_dir && copy *cc $tmp_dir\\src && copy *h $tmp_dir\\src
-              copy $start_dir\\..\\readme $tmp_dir
-              copy $start_dir\\..\\libs\\*.pfb $tmp_dir\\bin
-              copy $start_dir\\..\\..\\testset\\zadani.pdf $tmp_dir\\bin\\test.pdf
-              7z a -r $output -x!*CVS* $tmp_dir\\*
+              rd /Q /S "$tmp_dir" && md "$tmp_dir"
+              md "$tmp_dir\\bin"
+              md "$tmp_dir\\src"
+              cd "$bin_dir" && copy *tool*exe "$tmp_dir\\bin" && copy *.dll "$tmp_dir\\bin"
+              cd "$tools_src_dir" && copy *cc "$tmp_dir\\src" && copy *h "$tmp_dir\\src"
+              copy "$start_dir\\..\\readme" "$tmp_dir"
+              copy "$start_dir\\..\\libs\\*.pfb" "$tmp_dir\\bin"
+              copy "$start_dir\\..\\..\\testset\\zadani.pdf" "$tmp_dir\\bin\\test.pdf"
+              7z a -r "$output" -x!*CVS* "$tmp_dir\\*"
               echo Done.  
             """,
 }
@@ -72,16 +72,16 @@ pack_tools = {
 pack_gui= {
   "class" : "Execute",
   "cmd"   : """
-              rd /Q /S $tmp_dir && md $tmp_dir
-              md $tmp_dir\\bin
-              md $tmp_dir\\src
-              cd $bin_dir && copy *gui*exe $tmp_dir\\bin && copy *.dll $tmp_dir\\bin
-              copy $start_dir\\..\\libs\\*.pfb $tmp_dir\\bin
-              copy $start_dir\\gui.installer\\config $tmp_dir\\bin
-              copy $start_dir\\..\\readme $tmp_dir
-              copy $start_dir\\..\\..\\testset\\zadani.pdf $tmp_dir\\bin\\test.pdf
-              cd $gui_src_dir && copy *cpp $tmp_dir\\src && copy *h $tmp_dir\\src
-              7z a -r $output -x!*CVS* $tmp_dir\\*
+              rd /Q /S "$tmp_dir" && md "$tmp_dir"
+              md "$tmp_dir\\bin"
+              md "$tmp_dir\\src"
+              cd "$bin_dir" && copy *gui*exe "$tmp_dir\\bin" && copy *.dll "$tmp_dir\\bin"
+              copy "$start_dir\\..\\libs\\*.pfb" "$tmp_dir\\bin"
+              copy "$start_dir\\gui.installer\\config" "$tmp_dir\\bin"
+              copy "$start_dir\\..\\readme" "$tmp_dir"
+              copy "$start_dir\\..\\..\\testset\\zadani.pdf" "$tmp_dir\\bin\\test.pdf"
+              cd "$gui_src_dir" && copy *cpp "$tmp_dir\\src" && copy *h "$tmp_dir\\src"
+              7z a -r "$output" -x!*CVS* "$tmp_dir\\*"
               echo Done.  
             """,
 }
Index: pdfedit-0.4.5/projects/pdfedit.vc2008.sln
===================================================================
--- pdfedit-0.4.5.orig/projects/pdfedit.vc2008.sln
+++ pdfedit-0.4.5/projects/pdfedit.vc2008.sln
@@ -140,6 +140,8 @@ Global
 		Release|WINCESDK_600 (ARMV4I) = Release|WINCESDK_600 (ARMV4I)
 		Release-Tests|Win32 = Release-Tests|Win32
 		Release-Tests|WINCESDK_600 (ARMV4I) = Release-Tests|WINCESDK_600 (ARMV4I)
+		Release-Tools|Win32 = Release-Tools|Win32
+		Release-Tools|WINCESDK_600 (ARMV4I) = Release-Tools|WINCESDK_600 (ARMV4I)
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{4E265089-FF11-4B4E-B0DA-7BFDEE750F9F}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -160,6 +162,9 @@ Global
 		{4E265089-FF11-4B4E-B0DA-7BFDEE750F9F}.Release-Tests|Win32.ActiveCfg = Release|Win32
 		{4E265089-FF11-4B4E-B0DA-7BFDEE750F9F}.Release-Tests|Win32.Build.0 = Release|Win32
 		{4E265089-FF11-4B4E-B0DA-7BFDEE750F9F}.Release-Tests|WINCESDK_600 (ARMV4I).ActiveCfg = Release-Tests|Win32
+		{4E265089-FF11-4B4E-B0DA-7BFDEE750F9F}.Release-Tools|Win32.ActiveCfg = Release|Win32
+		{4E265089-FF11-4B4E-B0DA-7BFDEE750F9F}.Release-Tools|Win32.Build.0 = Release|Win32
+		{4E265089-FF11-4B4E-B0DA-7BFDEE750F9F}.Release-Tools|WINCESDK_600 (ARMV4I).ActiveCfg = Debug-Tools (testing)|Win32
 		{005F915C-B7B1-4448-AC1D-A99336E67078}.Debug|Win32.ActiveCfg = Debug|Win32
 		{005F915C-B7B1-4448-AC1D-A99336E67078}.Debug|Win32.Build.0 = Debug|Win32
 		{005F915C-B7B1-4448-AC1D-A99336E67078}.Debug|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
@@ -178,6 +183,9 @@ Global
 		{005F915C-B7B1-4448-AC1D-A99336E67078}.Release-Tests|Win32.ActiveCfg = Release|Win32
 		{005F915C-B7B1-4448-AC1D-A99336E67078}.Release-Tests|Win32.Build.0 = Release|Win32
 		{005F915C-B7B1-4448-AC1D-A99336E67078}.Release-Tests|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
+		{005F915C-B7B1-4448-AC1D-A99336E67078}.Release-Tools|Win32.ActiveCfg = Release|Win32
+		{005F915C-B7B1-4448-AC1D-A99336E67078}.Release-Tools|Win32.Build.0 = Release|Win32
+		{005F915C-B7B1-4448-AC1D-A99336E67078}.Release-Tools|WINCESDK_600 (ARMV4I).ActiveCfg = Debug-Win32Gui|Win32
 		{D777A696-283C-3830-891F-637C32B0BCEA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D777A696-283C-3830-891F-637C32B0BCEA}.Debug|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{D777A696-283C-3830-891F-637C32B0BCEA}.Debug-Tests|Win32.ActiveCfg = Debug|Win32
@@ -190,6 +198,8 @@ Global
 		{D777A696-283C-3830-891F-637C32B0BCEA}.Release|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
 		{D777A696-283C-3830-891F-637C32B0BCEA}.Release-Tests|Win32.ActiveCfg = Release|Win32
 		{D777A696-283C-3830-891F-637C32B0BCEA}.Release-Tests|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
+		{D777A696-283C-3830-891F-637C32B0BCEA}.Release-Tools|Win32.ActiveCfg = Debug|Win32
+		{D777A696-283C-3830-891F-637C32B0BCEA}.Release-Tools|WINCESDK_600 (ARMV4I).ActiveCfg = Debug-Tools (testing)|Win32
 		{54BD1798-9070-4080-939E-7CFCC7AECE12}.Debug|Win32.ActiveCfg = Release|Win32
 		{54BD1798-9070-4080-939E-7CFCC7AECE12}.Debug|Win32.Build.0 = Release|Win32
 		{54BD1798-9070-4080-939E-7CFCC7AECE12}.Debug|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
@@ -207,6 +217,9 @@ Global
 		{54BD1798-9070-4080-939E-7CFCC7AECE12}.Release-Tests|Win32.ActiveCfg = Release|Win32
 		{54BD1798-9070-4080-939E-7CFCC7AECE12}.Release-Tests|Win32.Build.0 = Release|Win32
 		{54BD1798-9070-4080-939E-7CFCC7AECE12}.Release-Tests|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
+		{54BD1798-9070-4080-939E-7CFCC7AECE12}.Release-Tools|Win32.ActiveCfg = Release|Win32
+		{54BD1798-9070-4080-939E-7CFCC7AECE12}.Release-Tools|Win32.Build.0 = Release|Win32
+		{54BD1798-9070-4080-939E-7CFCC7AECE12}.Release-Tools|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
 		{35DF7EFC-3789-4131-9242-58584C0F6A9B}.Debug|Win32.ActiveCfg = Release|Win32
 		{35DF7EFC-3789-4131-9242-58584C0F6A9B}.Debug|Win32.Build.0 = Release|Win32
 		{35DF7EFC-3789-4131-9242-58584C0F6A9B}.Debug|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
@@ -225,6 +238,9 @@ Global
 		{35DF7EFC-3789-4131-9242-58584C0F6A9B}.Release-Tests|Win32.ActiveCfg = Release|Win32
 		{35DF7EFC-3789-4131-9242-58584C0F6A9B}.Release-Tests|Win32.Build.0 = Release|Win32
 		{35DF7EFC-3789-4131-9242-58584C0F6A9B}.Release-Tests|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
+		{35DF7EFC-3789-4131-9242-58584C0F6A9B}.Release-Tools|Win32.ActiveCfg = Release|Win32
+		{35DF7EFC-3789-4131-9242-58584C0F6A9B}.Release-Tools|Win32.Build.0 = Release|Win32
+		{35DF7EFC-3789-4131-9242-58584C0F6A9B}.Release-Tools|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
 		{48C1C762-90EE-4DD3-9909-4D107183D90F}.Debug|Win32.ActiveCfg = Release|Win32
 		{48C1C762-90EE-4DD3-9909-4D107183D90F}.Debug|Win32.Build.0 = Release|Win32
 		{48C1C762-90EE-4DD3-9909-4D107183D90F}.Debug|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
@@ -243,6 +259,9 @@ Global
 		{48C1C762-90EE-4DD3-9909-4D107183D90F}.Release-Tests|Win32.ActiveCfg = Release|Win32
 		{48C1C762-90EE-4DD3-9909-4D107183D90F}.Release-Tests|Win32.Build.0 = Release|Win32
 		{48C1C762-90EE-4DD3-9909-4D107183D90F}.Release-Tests|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
+		{48C1C762-90EE-4DD3-9909-4D107183D90F}.Release-Tools|Win32.ActiveCfg = Release|Win32
+		{48C1C762-90EE-4DD3-9909-4D107183D90F}.Release-Tools|Win32.Build.0 = Release|Win32
+		{48C1C762-90EE-4DD3-9909-4D107183D90F}.Release-Tools|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
 		{4E265089-FF11-4B4E-B0DA-7BFDEE750F93}.Debug|Win32.ActiveCfg = Debug-Tests|Win32
 		{4E265089-FF11-4B4E-B0DA-7BFDEE750F93}.Debug|WINCESDK_600 (ARMV4I).ActiveCfg = Debug-Tests|Win32
 		{4E265089-FF11-4B4E-B0DA-7BFDEE750F93}.Debug-Tests|Win32.ActiveCfg = Debug-Tests|Win32
@@ -257,6 +276,8 @@ Global
 		{4E265089-FF11-4B4E-B0DA-7BFDEE750F93}.Release-Tests|Win32.ActiveCfg = Release-Tests|Win32
 		{4E265089-FF11-4B4E-B0DA-7BFDEE750F93}.Release-Tests|Win32.Build.0 = Release-Tests|Win32
 		{4E265089-FF11-4B4E-B0DA-7BFDEE750F93}.Release-Tests|WINCESDK_600 (ARMV4I).ActiveCfg = Release-Tests|Win32
+		{4E265089-FF11-4B4E-B0DA-7BFDEE750F93}.Release-Tools|Win32.ActiveCfg = Debug-Tests|Win32
+		{4E265089-FF11-4B4E-B0DA-7BFDEE750F93}.Release-Tools|WINCESDK_600 (ARMV4I).ActiveCfg = Debug-Tests|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE0}.Debug|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE0}.Debug-Tests|Win32.ActiveCfg = Debug|Win32
@@ -270,6 +291,9 @@ Global
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE0}.Release|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE0}.Release-Tests|Win32.ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE0}.Release-Tests|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE0}.Release-Tools|Win32.ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE0}.Release-Tools|Win32.Build.0 = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE0}.Release-Tools|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE4}.Debug|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE4}.Debug-Tests|Win32.ActiveCfg = Debug|Win32
@@ -283,6 +307,9 @@ Global
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE4}.Release|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE4}.Release-Tests|Win32.ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE4}.Release-Tests|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE4}.Release-Tools|Win32.ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE4}.Release-Tools|Win32.Build.0 = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE4}.Release-Tools|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE2}.Debug|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE2}.Debug-Tests|Win32.ActiveCfg = Debug|Win32
@@ -296,6 +323,9 @@ Global
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE2}.Release|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE2}.Release-Tests|Win32.ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE2}.Release-Tests|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE2}.Release-Tools|Win32.ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE2}.Release-Tools|Win32.Build.0 = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE2}.Release-Tools|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE7}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE7}.Debug|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE7}.Debug-Tests|Win32.ActiveCfg = Debug|Win32
@@ -309,6 +339,9 @@ Global
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE7}.Release|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE7}.Release-Tests|Win32.ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE7}.Release-Tests|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE7}.Release-Tools|Win32.ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE7}.Release-Tools|Win32.Build.0 = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE7}.Release-Tools|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE5}.Debug|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE5}.Debug-Tests|Win32.ActiveCfg = Debug|Win32
@@ -322,6 +355,9 @@ Global
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE5}.Release|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE5}.Release-Tests|Win32.ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE5}.Release-Tests|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE5}.Release-Tools|Win32.ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE5}.Release-Tools|Win32.Build.0 = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE5}.Release-Tools|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE9}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE9}.Debug|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE9}.Debug-Tests|Win32.ActiveCfg = Debug|Win32
@@ -335,6 +371,9 @@ Global
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE9}.Release|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE9}.Release-Tests|Win32.ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE9}.Release-Tests|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE9}.Release-Tools|Win32.ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE9}.Release-Tools|Win32.Build.0 = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE9}.Release-Tools|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE6}.Debug|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE6}.Debug-Tests|Win32.ActiveCfg = Debug|Win32
@@ -348,6 +387,9 @@ Global
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE6}.Release|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE6}.Release-Tests|Win32.ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE6}.Release-Tests|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE6}.Release-Tools|Win32.ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE6}.Release-Tools|Win32.Build.0 = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE6}.Release-Tools|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE1}.Debug|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE1}.Debug-Tests|Win32.ActiveCfg = Debug|Win32
@@ -361,6 +403,9 @@ Global
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE1}.Release|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE1}.Release-Tests|Win32.ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE1}.Release-Tests|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE1}.Release-Tools|Win32.ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE1}.Release-Tools|Win32.Build.0 = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE1}.Release-Tools|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE8}.Debug|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE8}.Debug-Tests|Win32.ActiveCfg = Debug|Win32
@@ -374,6 +419,9 @@ Global
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE8}.Release|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE8}.Release-Tests|Win32.ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE8}.Release-Tests|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE8}.Release-Tools|Win32.ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE8}.Release-Tools|Win32.Build.0 = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE8}.Release-Tools|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE3}.Debug|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE3}.Debug-Tests|Win32.ActiveCfg = Debug|Win32
@@ -387,6 +435,9 @@ Global
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE3}.Release|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE3}.Release-Tests|Win32.ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE3}.Release-Tests|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE3}.Release-Tools|Win32.ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE3}.Release-Tools|Win32.Build.0 = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BE3}.Release-Tools|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEA}.Debug|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEA}.Debug-Tests|Win32.ActiveCfg = Debug|Win32
@@ -400,6 +451,9 @@ Global
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEA}.Release|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEA}.Release-Tests|Win32.ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEA}.Release-Tests|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEA}.Release-Tools|Win32.ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEA}.Release-Tools|Win32.Build.0 = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEA}.Release-Tools|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEB}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEB}.Debug|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEB}.Debug-Tests|Win32.ActiveCfg = Debug|Win32
@@ -413,6 +467,9 @@ Global
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEB}.Release|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEB}.Release-Tests|Win32.ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEB}.Release-Tests|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEB}.Release-Tools|Win32.ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEB}.Release-Tools|Win32.Build.0 = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEB}.Release-Tools|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{36C203E2-1178-496C-A2FC-C120ED9336C9}.Debug|Win32.ActiveCfg = Release|Win32
 		{36C203E2-1178-496C-A2FC-C120ED9336C9}.Debug|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
 		{36C203E2-1178-496C-A2FC-C120ED9336C9}.Debug-Tests|Win32.ActiveCfg = Release|Win32
@@ -429,6 +486,9 @@ Global
 		{36C203E2-1178-496C-A2FC-C120ED9336C9}.Release-Tests|Win32.ActiveCfg = Release|Win32
 		{36C203E2-1178-496C-A2FC-C120ED9336C9}.Release-Tests|Win32.Build.0 = Release|Win32
 		{36C203E2-1178-496C-A2FC-C120ED9336C9}.Release-Tests|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
+		{36C203E2-1178-496C-A2FC-C120ED9336C9}.Release-Tools|Win32.ActiveCfg = Release|Win32
+		{36C203E2-1178-496C-A2FC-C120ED9336C9}.Release-Tools|Win32.Build.0 = Release|Win32
+		{36C203E2-1178-496C-A2FC-C120ED9336C9}.Release-Tools|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
 		{1508D425-024A-4DB1-9B35-5F6268DC1004}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1508D425-024A-4DB1-9B35-5F6268DC1004}.Debug|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{1508D425-024A-4DB1-9B35-5F6268DC1004}.Debug-Tests|Win32.ActiveCfg = Debug|Win32
@@ -443,6 +503,8 @@ Global
 		{1508D425-024A-4DB1-9B35-5F6268DC1004}.Release-Tests|Win32.ActiveCfg = Release|Win32
 		{1508D425-024A-4DB1-9B35-5F6268DC1004}.Release-Tests|Win32.Build.0 = Release|Win32
 		{1508D425-024A-4DB1-9B35-5F6268DC1004}.Release-Tests|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
+		{1508D425-024A-4DB1-9B35-5F6268DC1004}.Release-Tools|Win32.ActiveCfg = Debug|Win32
+		{1508D425-024A-4DB1-9B35-5F6268DC1004}.Release-Tools|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{088C2B96-D9DB-4160-A491-67CB1F78898C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{088C2B96-D9DB-4160-A491-67CB1F78898C}.Debug|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{088C2B96-D9DB-4160-A491-67CB1F78898C}.Debug-Tests|Win32.ActiveCfg = Debug|Win32
@@ -455,6 +517,8 @@ Global
 		{088C2B96-D9DB-4160-A491-67CB1F78898C}.Release|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
 		{088C2B96-D9DB-4160-A491-67CB1F78898C}.Release-Tests|Win32.ActiveCfg = Release|Win32
 		{088C2B96-D9DB-4160-A491-67CB1F78898C}.Release-Tests|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
+		{088C2B96-D9DB-4160-A491-67CB1F78898C}.Release-Tools|Win32.ActiveCfg = Debug|Win32
+		{088C2B96-D9DB-4160-A491-67CB1F78898C}.Release-Tools|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEC}.Debug|Win32.Build.0 = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEC}.Debug|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
@@ -471,6 +535,9 @@ Global
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEC}.Release-Tests|Win32.ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEC}.Release-Tests|Win32.Build.0 = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEC}.Release-Tests|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEC}.Release-Tools|Win32.ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEC}.Release-Tools|Win32.Build.0 = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEC}.Release-Tools|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BED}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BED}.Debug|Win32.Build.0 = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BED}.Debug|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
@@ -488,6 +555,9 @@ Global
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BED}.Release-Tests|Win32.ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BED}.Release-Tests|Win32.Build.0 = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BED}.Release-Tests|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BED}.Release-Tools|Win32.ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BED}.Release-Tools|Win32.Build.0 = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BED}.Release-Tools|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEE}.Debug|Win32.Build.0 = Debug|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEE}.Debug|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
@@ -505,6 +575,9 @@ Global
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEE}.Release-Tests|Win32.ActiveCfg = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEE}.Release-Tests|Win32.Build.0 = Release|Win32
 		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEE}.Release-Tests|WINCESDK_600 (ARMV4I).ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEE}.Release-Tools|Win32.ActiveCfg = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEE}.Release-Tools|Win32.Build.0 = Release|Win32
+		{F4B0B7E4-A405-4EB1-A74F-765181FE3BEE}.Release-Tools|WINCESDK_600 (ARMV4I).ActiveCfg = Debug|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
Index: pdfedit-0.4.5/projects/readme
===================================================================
--- pdfedit-0.4.5.orig/projects/readme
+++ pdfedit-0.4.5/projects/readme
@@ -1,6 +1,6 @@
 Win32 pdfedit* release
 ---------------------------
-The main purpose is to demonstrate the usage of the underlying pdfedit library. Currently, there are several tools which can be used from command line and proof of concept win32 GUI. 
+The main purpose is to demonstrate the usage of the underlying pdfedit library. Currently, there are several tools which can be used from command line and a proof of concept for win32 GUI. 
 
 Pdfedit Win32 release is beta. It also means that all executables are compiled in debug mode and therefore are slower and bigger; however, the functionality is the same.  
 
@@ -11,28 +11,61 @@ Problems
 Please, feel free to report any problems on pdfedit-support@lists.sourceforge.net or visit https://sourceforge.net/projects/pdfedit/ for more information.
 
 
-Step-by-step instructions on how to compile pdfedit 
+Step-by-step instructions on how to compile pdfedit on clean PC  
 ---------------------------
 
-   0) get sources from cvs on https://sourceforge.net/projects/pdfedit/
-   
-   1) get BOOST (http://www.boost-consulting.com/products/free) with additional dependencies - program_options, filesystem and iostreams
-   
-   2) get FREETYPE2 - https://sourceforge.net/projects/freetype/files/freetype2/2.3.12/ft2312.zip/download, extract it to a directory
-   
-   3) get ZLIB - http://www.zlib.net/ and extract it to a directory
-   
-   4) OPTIONAL - get libpng for add_image tool from http://www.libpng.org/pub/png/libpng.html
-   
-   5) OPTIONAL - get cppunit for tests from https://sourceforge.net/apps/mediawiki/cppunit/index.php?title=Main_Page  
-
-   6) set include directories in Visual Studio for BOOST, FREETYPE2, ZLIB in either 
-        Tools->Options->Project&Solutions->VC++ Directories->Include files/Library files
-        
-   7) build solution using one of possible configuration
+== pdfedit ==
+1. download the sources (already done when you read this)
 
+== VS 2008 ==
+2. download and install VS 2008! C++ Express Edition
+http://www.microsoft.com/express/Downloads/ 
+
+== boost ==
+3. install boost
+http://www.boostpro.com/download/
+- select 2008 compiler
+- select optional packages - programoptions  should be enough
+3.1 open VS Tools->Options->Projects and Solutions->VC++ Directories and add boost directory to 
+Include files: (e.g. c:\Program Files\boost\boost_1_44\)
+Library files: (e.g. c:\Program Files\boost\boost_1_44\lib\)
+4. try to build test_boost 
+if NOT  OK go to #3 and try again?
+if OK continue
+
+== zlib ==
+5. download e.g. zlib-1.2.5. sources and unpack it somewhere and
+http://www.zlib.net/
+5.1 open VS Tools->Options->Projects and Solutions->VC++ Directories and add boost directory to 
+Include files: (e.g. g:\private\work\projects\pdfedit\zlib\zlib-1.2.3\)
+6. build test_zlib
+if NOT  OK go to #5 and try again?
+if OK continue
+
+==freetype==
+7. download freetype and unpack it somewhere
+https://sourceforge.net/projects/freetype/files/freetype2/2.3.12/ft2312.zip/download
+7.1 open VS Tools->Options->Projects and Solutions->VC++ Directories and add boost directory to 
+Include files: (e.g. g:\private\work\projects\pdfedit\freetype\include\)
+8. build test_freetype2
+if NOT  OK go to #5 and try again?
+if OK continue
+
+==libpng==
+8. download png and create libraries libpng/libpngd
+the same process as above
+
+Select Platform/Configuration Debug-Win32 / Win32 and build it
 
 Troubleshooting
 ---------------------------
 
-  1) if you want to compile it against library versions of zlib/freetype you have to use the same Runtime libraries (MT, MTd, ...)
+  1) problems with zlib/freetype:
+  
+  sol #1) if you want to compile it against library versions of zlib/freetype you have to use the same Runtime libraries (MT, MTd, ...). If you changed it you have to change it everywhere.
+  
+  sol #2) try to build those yourselves
+  
+  2) problems with gui.installer
+  download python, 7z and add it to PATH
+    
\ No newline at end of file
Index: pdfedit-0.4.5/projects/tools/add_image.vcproj
===================================================================
--- pdfedit-0.4.5.orig/projects/tools/add_image.vcproj
+++ pdfedit-0.4.5/projects/tools/add_image.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="add_image"
 	ProjectGUID="{F4B0B7E4-A405-4EB1-A74F-765181FE3BED}"
 	TargetFrameworkVersion="0"
@@ -111,6 +111,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libpng.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
Index: pdfedit-0.4.5/projects/tools/add_text.vcproj
===================================================================
--- pdfedit-0.4.5.orig/projects/tools/add_text.vcproj
+++ pdfedit-0.4.5/projects/tools/add_text.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="add_text"
 	ProjectGUID="{F4B0B7E4-A405-4EB1-A74F-765181FE3BEA}"
 	TargetFrameworkVersion="0"
@@ -39,6 +39,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				RuntimeLibrary="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
Index: pdfedit-0.4.5/projects/tools/pdf_to_bmp.vcproj
===================================================================
--- pdfedit-0.4.5.orig/projects/tools/pdf_to_bmp.vcproj
+++ pdfedit-0.4.5/projects/tools/pdf_to_bmp.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="pdf_to_bmp"
 	ProjectGUID="{F4B0B7E4-A405-4EB1-A74F-765181FE3BEC}"
 	TargetFrameworkVersion="0"
@@ -110,7 +110,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				IgnoreDefaultLibraryNames="LIBCMT.lib"
+				IgnoreDefaultLibraryNames=""
 			/>
 			<Tool
 				Name="VCALinkTool"
Index: pdfedit-0.4.5/projects/vsprops/kernel.vsprops
===================================================================
--- pdfedit-0.4.5.orig/projects/vsprops/kernel.vsprops
+++ pdfedit-0.4.5/projects/vsprops/kernel.vsprops
@@ -15,7 +15,7 @@
 	/>
 	<Tool
 		Name="VCLibrarianTool"
-		AdditionalDependencies="zdll.lib"
+		AdditionalDependencies="zlib1.lib"
 	/>
 	<Tool
 		Name="VCLinkerTool"
Index: pdfedit-0.4.5/projects/vsprops/release.vsprops
===================================================================
--- pdfedit-0.4.5.orig/projects/vsprops/release.vsprops
+++ pdfedit-0.4.5/projects/vsprops/release.vsprops
@@ -3,9 +3,12 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="VSprops Release"
-	WholeProgramOptimization="65535"
 	>
 	<Tool
+		Name="VCBscMakeTool"
+		OutputFile="$(OutDir)/bsc/"
+	/>
+	<Tool
 		Name="VCCLCompilerTool"
 		Optimization="2"
 		FavorSizeOrSpeed="2"
@@ -25,4 +28,8 @@
 		Name="VCResourceCompilerTool"
 		PreprocessorDefinitions="NDEBUG"
 	/>
+	<Tool
+		Name="VCManifestTool"
+		VerboseOutput="true"
+	/>
 </VisualStudioPropertySheet>
Index: pdfedit-0.4.5/projects/vsprops/tests.vsprops
===================================================================
--- pdfedit-0.4.5.orig/projects/vsprops/tests.vsprops
+++ pdfedit-0.4.5/projects/vsprops/tests.vsprops
@@ -6,6 +6,6 @@
 	>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="cppunitd.lib zdll.lib"
+		AdditionalDependencies="cppunitd.lib zlib1.lib"
 	/>
 </VisualStudioPropertySheet>
Index: pdfedit-0.4.5/projects/vsprops/tools.vsprops
===================================================================
--- pdfedit-0.4.5.orig/projects/vsprops/tools.vsprops
+++ pdfedit-0.4.5/projects/vsprops/tools.vsprops
@@ -6,7 +6,7 @@
 	>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="zdll.lib xpdf-$(_Z_PLTFRM_)$(_Z_ARCH_).lib pdfedit-kernel-$(_Z_PLTFRM_)$(_Z_ARCH_).lib"
+		AdditionalDependencies="zlib1.lib xpdf-$(_Z_PLTFRM_)$(_Z_ARCH_).lib pdfedit-kernel-$(_Z_PLTFRM_)$(_Z_ARCH_).lib"
 		OutputFile="$(OutDir)\$(ProjectName)-tool.exe"
 		AdditionalLibraryDirectories="$(SolutionDir)\output\libs;$(SolutionDir)\libs"
 		GenerateDebugInformation="true"
Index: pdfedit-0.4.5/projects/xpdf/xpdf.vcproj
===================================================================
--- pdfedit-0.4.5.orig/projects/xpdf/xpdf.vcproj
+++ pdfedit-0.4.5/projects/xpdf/xpdf.vcproj
@@ -27,7 +27,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="if NOT EXIST $(SolutionDir)\..\src\xpdf\xpdf-aconf.h copy $(SolutionDir)\..\src\xpdf\aconf-win32.h $(SolutionDir)\..\src\xpdf\xpdf-aconf.h"
+				CommandLine="if NOT EXIST &quot;$(SolutionDir)\..\src\xpdf\xpdf-aconf.h&quot; copy &quot;$(SolutionDir)\..\src\xpdf\aconf-win32.h&quot; &quot;$(SolutionDir)\..\src\xpdf\xpdf-aconf.h&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -73,7 +73,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="if NOT EXIST $(SolutionDir)\output\freetype6.dll copy $(SolutionDir)\libs\freetype6.dll $(SolutionDir)\output\freetype6.dll"
+				CommandLine="if NOT EXIST &quot;$(SolutionDir)\output\freetype6.dll&quot; copy &quot;$(SolutionDir)\libs\freetype6.dll&quot; &quot;$(SolutionDir)\output\freetype6.dll&quot;"
 			/>
 		</Configuration>
 		<Configuration
@@ -83,7 +83,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="if NOT EXIST $(SolutionDir)\..\src\xpdf\xpdf-aconf.h copy $(SolutionDir)\..\src\xpdf\aconf-win32.h $(SolutionDir)\..\src\xpdf\xpdf-aconf.h"
+				CommandLine="if NOT EXIST &quot;$(SolutionDir)\..\src\xpdf\xpdf-aconf.h&quot; copy &quot;$(SolutionDir)\..\src\xpdf\aconf-win32.h&quot; &quot;$(SolutionDir)\..\src\xpdf\xpdf-aconf.h&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -128,7 +128,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="if NOT EXIST $(SolutionDir)\output\freetype6.dll copy $(SolutionDir)\libs\freetype6.dll $(SolutionDir)\output\freetype6.dll"
+				CommandLine="if NOT EXIST &quot;$(SolutionDir)\output\freetype6.dll&quot; copy &quot;$(SolutionDir)\libs\freetype6.dll&quot; &quot;$(SolutionDir)\output\freetype6.dll&quot;"
 			/>
 		</Configuration>
 		<Configuration
@@ -138,7 +138,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="if NOT EXIST $(SolutionDir)\..\src\xpdf\xpdf-aconf.h copy $(SolutionDir)\..\src\xpdf\aconf-win32.h $(SolutionDir)\..\src\xpdf\xpdf-aconf.h"
+				CommandLine="if NOT EXIST &quot;$(SolutionDir)\..\src\xpdf\xpdf-aconf.h&quot; copy &quot;$(SolutionDir)\..\src\xpdf\aconf-win32.h&quot; &quot;$(SolutionDir)\..\src\xpdf\xpdf-aconf.h&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -182,7 +182,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="if NOT EXIST $(SolutionDir)\output\freetype6.dll copy $(SolutionDir)\libs\freetype6.dll $(SolutionDir)\output\freetype6.dll"
+				CommandLine="if NOT EXIST &quot;$(SolutionDir)\output\freetype6.dll&quot; copy &quot;$(SolutionDir)\libs\freetype6.dll&quot; &quot;$(SolutionDir)\output\freetype6.dll&quot;"
 			/>
 		</Configuration>
 		<Configuration
Index: pdfedit-0.4.5/src/gui/base.cc
===================================================================
--- pdfedit-0.4.5.orig/src/gui/base.cc
+++ pdfedit-0.4.5/src/gui/base.cc
@@ -28,6 +28,7 @@
 */
 
 #include "passworddialog.h"
+#include "pdfutil.h"
 #include "base.h"
 #include "qtcompat.h"
 #include "qsannotation.h"
@@ -678,6 +679,7 @@ QSPdf* Base::loadPdf(const QString &name
 /**
  Open PDF instance.
  Specific password solicitation (GUI, console) should be implemented in subclasses - BaseGUI ands BaseConsole
+ If the PDF cannot be opened in read-write mode, another attempt to open the file at least as read-only is done.
  @param filename filename to open
  @param openMode Mode in which to open the file (advanced, readonly and readwrite - default)
  @param askPassword if true, attempt to ask user for password would be made if document is encrypted
@@ -688,7 +690,7 @@ 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)
- return CPdf::getInstance(util::convertFromUnicode(filename,util::NAME).c_str(),mode);
+ return openPdfWithFallback(filename,mode);
 }
 
 /** \copydoc loadFromFile */
Index: pdfedit-0.4.5/src/gui/menu.qs
===================================================================
--- pdfedit-0.4.5.orig/src/gui/menu.qs
+++ pdfedit-0.4.5/src/gui/menu.qs
@@ -160,11 +160,6 @@ function go(x) {
  } else {
     tpage=document.getPage(x);
  }
- csc=tpage.getContentStreamCount();
- //flush all content streams
- for(i=0;i<csc;i++) {
-  tpage.getContentStream(i).saveChange();
- }
  PageSpace.refresh(x,document);
 }
 
Index: pdfedit-0.4.5/src/gui/pdfeditwindow.cc
===================================================================
--- pdfedit-0.4.5.orig/src/gui/pdfeditwindow.cc
+++ pdfedit-0.4.5/src/gui/pdfeditwindow.cc
@@ -777,6 +777,7 @@ void PdfEditWindow::setTitle(int revisio
  QString revisionInfo="";
  if (revision) revisionInfo=QString(" - ")+tr("viewing revision")+" "+QString::number(revision);
  QStringList docFlags;
+ if (document->getMode()==CPdf::ReadOnly) docFlags+=tr("Read-only");
  if (document->isLinearized()) docFlags+=tr("Linearized PDF");
  if (pdfobjects::utils::isEncrypted(document)) docFlags+=tr("Encrypted");
  QString docInfo="";
Index: pdfedit-0.4.5/src/gui/pdfutil.cc
===================================================================
--- pdfedit-0.4.5.orig/src/gui/pdfutil.cc
+++ pdfedit-0.4.5/src/gui/pdfutil.cc
@@ -444,6 +444,31 @@ QString annotTypeName(boost::shared_ptr<
 }
 
 /**
+ Tries to open PDF with desired mode, but will fall back to read only mode if the PDF cannot be opened in read-write mode
+ If the file cannot be opened, exception is thrown
+ @param filename Name of file for CPdf::getInstance
+ @param mode Open mode for CPdf::getInstance
+ @return Opened PDF
+*/
+boost::shared_ptr<CPdf> openPdfWithFallback(const QString &filename, CPdf::OpenMode mode) {
+ boost::shared_ptr<CPdf> pdf;
+ do {
+  try {
+   pdf = CPdf::getInstance(util::convertFromUnicode(filename,util::NAME).c_str(),mode);
+  } catch(PdfOpenException &e) {
+   // try to fallback to readonly mode
+   if (mode >= CPdf::ReadWrite) {
+    mode = CPdf::ReadOnly;
+    continue;
+   }
+   throw e;
+  }
+ } while(!pdf);
+ return pdf;
+}
+
+
+/**
  Get PDF instance - call CPdf::getInstance with appropriate parameters
  @param parent parent widget of dialog that may spawn
  @param filename Name of file for CPdf::getInstance
@@ -451,7 +476,7 @@ 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) {
- boost::shared_ptr<CPdf> pdf=CPdf::getInstance(util::convertFromUnicode(filename,util::NAME).c_str(), mode);
+ boost::shared_ptr<CPdf> pdf=openPdfWithFallback(filename,mode);
  if (askPassword && pdf->needsCredentials()) {
   for(;;) {
    //Ask for password until we either get the right one or user gets bored with retrying
Index: pdfedit-0.4.5/src/gui/pdfutil.h
===================================================================
--- pdfedit-0.4.5.orig/src/gui/pdfutil.h
+++ pdfedit-0.4.5/src/gui/pdfutil.h
@@ -59,6 +59,7 @@ QString propertyPreview(boost::shared_pt
 QString annotType(CAnnotation::AnnotType at);
 QString annotType(boost::shared_ptr<CAnnotation> anot);
 QString annotTypeName(boost::shared_ptr<CAnnotation> anot);
+boost::shared_ptr<CPdf> openPdfWithFallback(const QString &filename, CPdf::OpenMode mode);
 
 //Password-related functions
 boost::shared_ptr<CPdf> getPdfInstance(QWidget *parent, const QString &filename, CPdf::OpenMode mode, bool askPassword=true);
Index: pdfedit-0.4.5/src/gui/rect2Darray.h
===================================================================
--- pdfedit-0.4.5.orig/src/gui/rect2Darray.h
+++ pdfedit-0.4.5/src/gui/rect2Darray.h
@@ -305,7 +305,7 @@ void RectArray<T>::myAppend ( const BBox
 		minY = std::min( minY, item->top() );
 		maxY = std::max( maxY, item->bottom() );
 	}
-	append( item );
+	this->append( item );
 }
 
 template <typename T>
@@ -461,7 +461,7 @@ void Rect2DArray<T>::myAppend( BBoxOfObj
 	if (toAppend) {
 		current = new RectArray<T>();
 		current->myAppend( bbox );
-		append( current );
+		this->append( current );
 	}
 }
 
Index: pdfedit-0.4.5/src/kernel/cannotation.cc
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/cannotation.cc
+++ pdfedit-0.4.5/src/kernel/cannotation.cc
@@ -99,7 +99,7 @@ UniversalAnnotInitializer::SupportedList
 {
 	// returns list with names from implList
 	SupportedList list;
-	for(AnnotList::const_iterator i=implList.begin(); i!=implList.end(); i++)
+	for(AnnotList::const_iterator i=implList.begin(); i!=implList.end(); ++i)
 	{
 		string annotType=i->first;
 		list.push_back(annotType);
@@ -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())
@@ -164,27 +164,27 @@ bool TextAnnotInitializer::operator()(bo
 
 	// Initializes common entries for annotation dictionary - Type, P, Rect fields are
 	// already set
-	scoped_ptr<IProperty> defaultSubType(CNameFactory::getInstance("Text"));
+	boost::scoped_ptr<IProperty> defaultSubType(CNameFactory::getInstance("Text"));
 	checkAndReplace(annotDict, "Subtype", *defaultSubType);
 
-	scoped_ptr<IProperty> defaultContents(CStringFactory::getInstance(CONTENTS));
+	boost::scoped_ptr<IProperty> defaultContents(CStringFactory::getInstance(CONTENTS));
 	checkAndReplace(annotDict, "Contents", *defaultContents);
 
-	scoped_ptr<IProperty> defaultFlags(CIntFactory::getInstance(FLAGS));
+	boost::scoped_ptr<IProperty> defaultFlags(CIntFactory::getInstance(FLAGS));
 	checkAndReplace(annotDict, "F", *defaultFlags);
 
 	// initializes additional entries specific for text annotations according
 	// static default values
-	scoped_ptr<IProperty> defaultOpen(CBoolFactory::getInstance(OPEN));
+	boost::scoped_ptr<IProperty> defaultOpen(CBoolFactory::getInstance(OPEN));
 	checkAndReplace(annotDict, "Open", *defaultOpen);
 
-	scoped_ptr<IProperty> defaultName(CNameFactory::getInstance(NAME));
+	boost::scoped_ptr<IProperty> defaultName(CNameFactory::getInstance(NAME));
 	checkAndReplace(annotDict, "Name", *defaultName);
 
-	scoped_ptr<IProperty> defaultState(CStringFactory::getInstance(STATE));
+	boost::scoped_ptr<IProperty> defaultState(CStringFactory::getInstance(STATE));
 	checkAndReplace(annotDict, "State", *defaultState);
 
-	scoped_ptr<IProperty> defaultStateModel(CStringFactory::getInstance(STATEMODEL));
+	boost::scoped_ptr<IProperty> defaultStateModel(CStringFactory::getInstance(STATEMODEL));
 	checkAndReplace(annotDict, "StateModel", *defaultStateModel);
 
 	return true;
@@ -211,16 +211,16 @@ bool LinkAnnotInitializer::operator()(bo
 
 	// Initializes common entries for annotation dictionary - Type, P, Rect fields are
 	// already set
-	scoped_ptr<IProperty> defaultSubType(CNameFactory::getInstance("Link"));
+	boost::scoped_ptr<IProperty> defaultSubType(CNameFactory::getInstance("Link"));
 	checkAndReplace(annotDict, "Subtype", *defaultSubType);
 
-	scoped_ptr<IProperty> defaultContents(CStringFactory::getInstance(CONTENTS));
+	boost::scoped_ptr<IProperty> defaultContents(CStringFactory::getInstance(CONTENTS));
 	checkAndReplace(annotDict, "Contents", *defaultContents);
 
-	scoped_ptr<IProperty> defaultDest(CNameFactory::getInstance(DEST));
+	boost::scoped_ptr<IProperty> defaultDest(CNameFactory::getInstance(DEST));
 	checkAndReplace(annotDict, "Dest", *defaultDest);
 
-	scoped_ptr<IProperty> defaultH(CNameFactory::getInstance(H));
+	boost::scoped_ptr<IProperty> defaultH(CNameFactory::getInstance(H));
 	checkAndReplace(annotDict, "H", *defaultH);
 
 	return true;
@@ -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,16 +240,16 @@ 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
 	// required by specification, but it is cleaner to do initialize it)
-	scoped_ptr<IProperty> typeField(CNameFactory::getInstance("Annot"));
+	boost::scoped_ptr<IProperty> typeField(CNameFactory::getInstance("Annot"));
 	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,7 @@ using namespace debug;
 
 	try
 	{
-		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=annotDictionary->getProperty<CName>("Subtype");
 		string typeName;
 		subTypeName->getValue(typeName);
 		return utils::annotTypeMapping(typeName);
@@ -311,6 +304,9 @@ using namespace debug;
 		// Subtype field not present
 		kernelPrintDbg(DBG_WARN, "Annotation dictionary doesn't contain Subtype field.");
 		return Unknown;
+	}catch(...) {
+		// bad type
+		return Unknown;
 	}
 }
 
Index: pdfedit-0.4.5/src/kernel/carray.cc
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/carray.cc
+++ pdfedit-0.4.5/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, "");
 
Index: pdfedit-0.4.5/src/kernel/carray.h
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/carray.h
+++ pdfedit-0.4.5/src/kernel/carray.h
@@ -175,6 +175,30 @@ public:
    	 */
 	boost::shared_ptr<IProperty> getProperty (PropertyId id) const;
 
+	/** 
+	 * Returns property identified by its name.
+	 * This is a convenient method which also does the casting trickery
+	 * and indirect object resolution if the given template type is not
+	 * reference itself.
+	 *
+   	 * @param 	id 	Name of the property.
+	 * @return	Output variable where the value will be stored.
+	 */
+	template<typename ItemType> boost::shared_ptr<ItemType> getProperty(PropertyId id)const {
+		boost::shared_ptr<IProperty> ip = getProperty(id);
+
+		if (ItemType::type != pRef && isRef(ip))
+			ip = utils::getReferencedObject(ip);
+
+		if(ItemType::type != ip->getType()) {
+			kernelPrintDbg (debug::DBG_DBG, "wanted type " << ItemType::type 
+					<< " got " << ip->getType () << " key[" << id << "]");
+			throw ElementBadTypeException("");
+		}
+
+		return IProperty::getSmartCObjectPtr<ItemType>(ip);
+	}
+
 	/**
 	 * Returns property type of an item identified by position.
 	 *
@@ -629,95 +653,6 @@ setDoubleInArray (const IP& ip, size_t p
 /**
  * Get iproperty casted to specific type from array.
  *
- * @param array Array.
- * @param pos   Position in the array.
- */
-template<typename ItemType, PropertyType ItemPType>
-inline boost::shared_ptr<ItemType>
-getTypeFromArray (const boost::shared_ptr<CArray>& array, size_t pos) DEPRECATED;
-
-// gcc doesn't like __attribute__ in function definition
-template<typename ItemType, PropertyType ItemPType>
-inline boost::shared_ptr<ItemType>
-getTypeFromArray (const boost::shared_ptr<CArray>& array, size_t pos)
-{
-	//utilsPrintDbg (debug::DBG_DBG, "array[" << pos << "]");
-	
-	// Get the item that is associated with specified key 
-	boost::shared_ptr<IProperty> ip = array->getProperty (pos);
-	//
-	// If it is a Ref forward it to the real object
-	// 
-	ip = getReferencedObject (ip);
-
-	// Check the type
-	if (ItemPType != ip->getType ())
-	{
-		utilsPrintDbg (debug::DBG_DBG, "wanted type " << ItemPType << " got " << ip->getType ());
-		throw ElementBadTypeException ("getTypeFromArray()");
-	}
-
-	// Cast it to the correct type and return it
-	return IProperty::getSmartCObjectPtr<ItemType> (ip);
-}
-
-/**
- * Get iproperty casted to specific type from array.
- *
- * @param array Array.
- * @param id   Position in the array.
- * @throw ElementBadTypeException if property doesn't have ItemType type.
- */
-template<typename ItemType>
-inline boost::shared_ptr<ItemType>
-getTypeFromArray (const boost::shared_ptr<CArray>& array, size_t pos)
-{
-	utilsPrintDbg (debug::DBG_DBG, "array[" << pos << "]");
-	
-	// Get the item that is associated with specified key 
-	boost::shared_ptr<IProperty> ip = array->getProperty (pos);
-	//
-	// If it is a Ref forward it to the real object
-	// 
-	ip = getReferencedObject (ip);
-
-	// Check the type
-	if (ItemType::type != ip->getType ())
-	{
-		utilsPrintDbg (debug::DBG_DBG, "wanted type " << ItemType::type << " got " << ip->getType ());
-		throw ElementBadTypeException ("getTypeFromArray()");
-	}
-
-	// Cast it to the correct type and return it
-	return IProperty::getSmartCObjectPtr<ItemType> (ip);
-}
-
-/** \copydoc getTypeFromArray */
-template<typename ItemType, PropertyType ItemPType>
-inline boost::shared_ptr<ItemType>
-getTypeFromArray (const boost::shared_ptr<IProperty>& array, size_t pos) DEPRECATED;
-
-// gcc doesn't like __attribute__ in function definition
-template<typename ItemType, PropertyType ItemPType>
-inline boost::shared_ptr<ItemType>
-getTypeFromArray (const boost::shared_ptr<IProperty>& ip, size_t pos)
-{
-	assert (isArray (ip));
-	if (!isArray (ip))
-	{
-		assert (!"Ip is not an array.");
-		throw ElementBadTypeException ("getTypeFromArray()");
-	}
-
-	// Cast it to array
-	boost::shared_ptr<CArray> array = IProperty::getSmartCObjectPtr<CArray> (ip);
-
-	return getTypeFromArray<ItemType, ItemPType> (array, pos);
-}
-
-/**
- * Get iproperty casted to specific type from array.
- *
  * Checks type of given property and if it pArray, casts it to CArray and uses
  * getTypeFromArray with CArray parameter.
  *
@@ -736,7 +671,7 @@ getTypeFromArray (const boost::shared_pt
 	// Cast it to array
 	boost::shared_ptr<CArray> array = IProperty::getSmartCObjectPtr<CArray> (ip);
 
-	return getTypeFromArray<ItemType> (array, pos);
+	return array->getProperty<ItemType>(pos);
 }
 
 //=====================================================================================
Index: pdfedit-0.4.5/src/kernel/ccontentstream.cc
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/ccontentstream.cc
+++ pdfedit-0.4.5/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))
@@ -568,13 +568,25 @@ throw ()
 //
 // Constructors
 //
+CContentStream::CContentStream (boost::shared_ptr<GfxState> state, 
+		boost::shared_ptr<GfxResources> res) : gfxstate (state), gfxres (res) {
+}
+
 CContentStream::CContentStream (CStreams& strs, 
 								boost::shared_ptr<GfxState> state, 
 								boost::shared_ptr<GfxResources> res) 
 	: gfxstate (state), gfxres (res)
 {
 	kernelPrintDbg (DBG_DBG, "");
+	setStreams(strs);
+}
+
+void CContentStream::setStreams (CStreams& strs) {
 	
+	// cleanup
+	if (cstreamobserver)
+		unregisterCStreamObservers();
+
 	// If streams are empty return
 	if (strs.empty())
 		return;
@@ -588,8 +600,8 @@ CContentStream::CContentStream (CStreams
 	}
 	
 	// Parse it into small objects
-		assert (gfxres);
-		assert (gfxstate);
+	assert (gfxres);
+	assert (gfxstate);
 	
 	// Create cstream observer and register it on all operands
 	cstreamobserver = boost::shared_ptr<CStreamObserver> (new CStreamObserver (this));
@@ -659,14 +671,14 @@ CContentStream::replaceText (const std::
 		boost::shared_ptr<TextSimpleOperator> _cur 
 				= boost::dynamic_pointer_cast<TextSimpleOperator, PdfOperator> (tit.getCurrent());
 		std::string tmp;
-		_cur->getRawText (tmp);
+		_cur->getFontText (tmp);
 		string replaced = boost::replace_all_copy (tmp, what, with);
 		if (tmp != replaced)
 		{
 			dirty = true;
 			boost::shared_ptr<TextSimpleOperator> _cur 
 					= boost::dynamic_pointer_cast<TextSimpleOperator, PdfOperator> (tit.getCurrent());
-			_cur->setRawText (replaced);
+			_cur->setFontText (replaced);
 		}
 		tit.next();
 	}
@@ -736,7 +748,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 +868,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 +949,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 +961,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 +1004,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);
Index: pdfedit-0.4.5/src/kernel/ccontentstream.h
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/ccontentstream.h
+++ pdfedit-0.4.5/src/kernel/ccontentstream.h
@@ -207,6 +207,21 @@ public:
 					boost::shared_ptr<GfxState> state, 
 					boost::shared_ptr<GfxResources> res);
 
+	/** Internal constructor without streams.
+	 * This one should be used just internally when we need the instance but
+	 * we don't have streams at hands yet. Content stream remains empty
+	 * unless setStreams is called.
+	 *
+	 * @param state Graphical state.
+	 * @param res Graphical resources.
+	 */
+	CContentStream(boost::shared_ptr<GfxState> state, 
+			boost::shared_ptr<GfxResources> res);
+
+	/** Sets streams.
+	 * Cleans up the previous state and forces new parsing.
+	 */
+	void setStreams(CStreams &strs);
 
 	//
 	// Get methods
Index: pdfedit-0.4.5/src/kernel/cdict.cc
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/cdict.cc
+++ pdfedit-0.4.5/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);
Index: pdfedit-0.4.5/src/kernel/cdict.h
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/cdict.h
+++ pdfedit-0.4.5/src/kernel/cdict.h
@@ -211,6 +211,45 @@ public:
    	 */
 	boost::shared_ptr<IProperty> getProperty (PropertyId id) const;
 
+	/** 
+	 * Returns property identified by its name.
+	 * This is a convenient method which also does the casting trickery
+	 * and indirect object resolution if the given template type is not
+	 * reference itself.
+	 *
+   	 * @param 	id 	Name of the property.
+	 * @return	Output variable where the value will be stored.
+	 */
+	template<typename ItemType> boost::shared_ptr<ItemType> getProperty(PropertyId id)const {
+		boost::shared_ptr<IProperty> ip = getProperty(id);
+
+		if (ItemType::type != pRef && isRef(ip))
+			ip = utils::getReferencedObject(ip);
+
+		if(ItemType::type != ip->getType()) {
+			kernelPrintDbg (debug::DBG_DBG, "wanted type " << ItemType::type 
+					<< " got " << ip->getType () << " key[" << id << "]");
+			throw ElementBadTypeException(id);
+		}
+
+		return IProperty::getSmartCObjectPtr<ItemType>(ip);
+	}
+
+	/** 
+	 * Returns property identified by its name.
+	 * This is a convenient method which also does the casting trickery
+	 * and indirect object resolution if the given template type is not
+	 * reference itself.
+	 *
+   	 * @param 	id 	Name of the property.
+	 * @return	Output variable where the value will be stored.
+	 */
+	template<typename ItemType> boost::shared_ptr<ItemType> getProperty(const char *name)const {
+		assert(name);
+		PropertyId n(name);
+		return getProperty<ItemType>(n);
+	}
+
 	/**
 	 * Returns property type of an item identified by name.
 	 *
@@ -844,101 +883,6 @@ setDoubleInDict (const IP& ip, const std
 //	CDict "get type" helper methods
 //=========================================================
 
-/**
- * Get iproperty casted to specific type from dictionary.
- *
- * @param dict Dictionary.
- * @param key   Position in the dictionary.
- */
-template<typename ItemType, PropertyType ItemPType>
-inline boost::shared_ptr<ItemType>
-getTypeFromDictionary (const boost::shared_ptr<CDict>& dict, const std::string& key) DONOTUSE;
-
-template<typename ItemType, PropertyType ItemPType>
-inline boost::shared_ptr<ItemType>
-getTypeFromDictionary (const boost::shared_ptr<CDict>& dict, const std::string& key)
-{
-	utilsPrintDbg (debug::DBG_DBG, "dict[" << key << "]");
-	
-	// Get the item that is associated with specified key 
-	boost::shared_ptr<IProperty> ip = dict->getProperty (key);
-	//
-	// If it is a Ref forward it to the real object
-	// 
-	ip = getReferencedObject (ip);
-
-	// Check the type
-	if (ItemPType != ip->getType ())
-	{
-		utilsPrintDbg (debug::DBG_DBG, "wanted type " << ItemPType << " got " << ip->getType () << " key[" << key << "]");
-		std::string err= "getTypeFromDictionary() [" + key + "]";
-		throw ElementBadTypeException (err);
-	}
-
-	// Cast it to the correct type and return it
-	return IProperty::getSmartCObjectPtr<ItemType> (ip);
-}
-
-/** Get property from dictionary.
- *
- * If property is reference, dereferences it (uses getReferencedObject
- * function).
- * @param dict Dictionary property.
- * @param key Property name.
- * @return Property with give type.
- * @throw ElementBadTypeException if found (dereferenced) property has 
- * different type than given.
- */
-template<typename ItemType>
-inline boost::shared_ptr<ItemType>
-getTypeFromDictionary (const boost::shared_ptr<CDict>& dict, CDict::PropertyId key)
-{
-	utilsPrintDbg (debug::DBG_DBG, "dict[" << key << "]");
-	
-	// Get the item that is associated with specified key 
-	boost::shared_ptr<IProperty> ip = dict->getProperty (key);
-
-	//
-	// If it is a Ref forward it to the real object
-	// 
-	ip = getReferencedObject (ip);
-
-	// Check the type
-	if (ItemType::type != ip->getType ())
-	{
-		utilsPrintDbg (debug::DBG_DBG, "wanted type " << ItemType::type 
-				<< " got " << ip->getType () 
-				<< " key[" << key << "]");
-		std::string err= "getTypeFromDictionary() [" + key + "]";
-		throw ElementBadTypeException (err);
-	}
-
-	// Cast it to the correct type and return it
-	return IProperty::getSmartCObjectPtr<ItemType> (ip);
-}
-
-/** \copydoc getTypeFromDictionary */
-template<typename ItemType, PropertyType ItemPType>
-inline boost::shared_ptr<ItemType>
-getTypeFromDictionary (const boost::shared_ptr<IProperty>& dict, const std::string& key) DONOTUSE;
-
-template<typename ItemType, PropertyType ItemPType>
-inline boost::shared_ptr<ItemType>
-getTypeFromDictionary (const boost::shared_ptr<IProperty>& ip, const std::string& key)
-{
-	assert (isDict (ip));
-	if (!isDict(ip))
-	{
-		assert (!"Ip is not a dictionary.");
-		throw ElementBadTypeException ("getTypeFromDictionary()");
-	}
-
-	// Cast it to dict
-	boost::shared_ptr<CDict> dict = IProperty::getSmartCObjectPtr<CDict> (ip);
-
-	return getTypeFromDictionary<ItemType, ItemPType> (dict, key);
-}
-
 /** Gets property from dictionary.
  *
  * Checks type of given ip. If it is CDict instance, casts it and calls
@@ -961,40 +905,9 @@ getTypeFromDictionary (const boost::shar
 	// Cast it to dict
 	boost::shared_ptr<CDict> dict = IProperty::getSmartCObjectPtr<CDict> (ip);
 
-	return getTypeFromDictionary<ItemType> (dict, key);
+	return dict->getProperty<ItemType>(key);
 }
 
-/** 
- * Get dictionary from dictionary. If it is an indirect object, fetch the object.
- */
-template<typename IP>
-inline boost::shared_ptr<CDict>
-getCDictFromDict (IP& ip, const std::string& key)
-{
-	return getTypeFromDictionary<CDict> (ip, key);
-}
-
-/** 
- * Get array from dictionary. If it is an indirect object, fetch the object.
- */
-template<typename IP>
-inline boost::shared_ptr<CArray>
-getCArrayFromDict (IP& ip, const std::string& key)
-{
-	return getTypeFromDictionary<CArray> (ip, key);
-}
-
-
-/** 
- * Get dictionary from dictionary. If it is an indirect object, fetch the object.
- */
-inline boost::shared_ptr<CDict>
-getCDictFromDict (boost::shared_ptr<CDict> dict, const std::string& key)
-{
-	return getTypeFromDictionary<CDict> (dict, key);
-}
-
-
 //=====================================================================================
 } /* namespace utils */
 //=====================================================================================
Index: pdfedit-0.4.5/src/kernel/cinlineimage.cc
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/cinlineimage.cc
+++ pdfedit-0.4.5/src/kernel/cinlineimage.cc
@@ -92,9 +92,8 @@ CInlineImage::CInlineImage (::Object& oD
 	// Init dictionary, we do not have access to dictionary container
 	utils::dictFromXpdfObj (this->dictionary, oDict);
 	assert (0 < this->dictionary.getPropertyCount ());
-	
-	// Set buffer, do not use setRawBuffer because CStream would be ... copied
-	std::copy (buf.begin(), buf.end(), std::back_inserter (this->buffer));
+
+	initialize( buf );
 }
 
 //
@@ -104,8 +103,7 @@ CInlineImage::CInlineImage (const CDict&
 {
 	kernelPrintDbg (debug::DBG_DBG, "");
 
-	// Set buffer, do not use setRawBuffer because CStream would be ... copied
-	std::copy (buf.begin(), buf.end(), std::back_inserter (this->buffer));
+	initialize( buf );
 }
 
 //
@@ -124,11 +122,29 @@ CInlineImage::CInlineImage (boost::weak_
 	setPdf (p);
 	setIndiRef (rf);
 	
+	initialize( buf );
+}
+
+void CInlineImage::initialize( const CStream::Buffer& buf ) 
+{
+	_width = _height = 0;
+	try {
+	  _width = utils::getDoubleFromDict( dictionary, "Width" );
+	}catch(CObjectException&){}
+	try {
+	  _width = utils::getDoubleFromDict( dictionary, "W" );
+	}catch(CObjectException&){}
+	try {
+	  _height = utils::getDoubleFromDict( dictionary, "Height" );
+	}catch(CObjectException&){}
+	try {
+	  _height = utils::getDoubleFromDict( dictionary, "H" );
+	}catch(CObjectException&){}
+	
 	// Set buffer, do not use setRawBuffer because CStream would be ... copied
 	std::copy (buf.begin(), buf.end(), std::back_inserter (this->buffer));
 }
 
-
 //
 // Get methods
 //
Index: pdfedit-0.4.5/src/kernel/cinlineimage.h
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/cinlineimage.h
+++ pdfedit-0.4.5/src/kernel/cinlineimage.h
@@ -54,6 +54,13 @@ namespace pdfobjects {
 class CInlineImage : public CStream
 {
 	//
+	// params
+	//
+private:
+	double _width;
+	double _height;
+	
+	//
 	// Constructors
 	//
 public:
@@ -97,10 +104,28 @@ protected:
 	 * @return New instance of inline image.
 	 */
 	virtual CStream* _newInstance () const
-		{ return new CInlineImage; }
+		{
+			CInlineImage * i = new CInlineImage;
+			i->_height = _height;
+			i->_width = _width;
+			return i;
+	}
 
 	
 	//
+	//
+	//
+public:
+	void initialize( const CStream::Buffer& buf );
+	
+	double width() const {
+	  return _width;
+	}
+	double height() const {
+	  return _height;
+	}
+	
+	//
 	// Get methods
 	//
 public:
Index: pdfedit-0.4.5/src/kernel/cobject.cc
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/cobject.cc
+++ pdfedit-0.4.5/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;
Index: pdfedit-0.4.5/src/kernel/cobject2string.cc
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/cobject2string.cc
+++ pdfedit-0.4.5/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())
@@ -210,9 +210,11 @@ simpleValueToString<pRef> (const IndiRef
 
 bool isBinaryString(const std::string& val)
 {
-	for(std::string::const_iterator i = val.begin(); i != val.end(); ++i)
-		if(!isprint(*i))
+	for(std::string::const_iterator i = val.begin(); i != val.end(); ++i) {
+		unsigned char ch = *i;
+		if(!isprint(ch))
 			return true;
+	}
 	return false;
 }
 
@@ -242,13 +244,12 @@ simpleValueToString (const std::string&
 	{
 		case pString:
 		{
-			std::string validateStr = makeStringPdfValid (val.begin(), val.end());
-			if (!isBinaryString(val))
-				str = Specification::CSTRING_PREFIX + validateStr + Specification::CSTRING_SUFFIX;
-			else
+			if (!isBinaryString(val)) {
+				str = Specification::CSTRING_PREFIX + makeStringPdfValid(val) + Specification::CSTRING_SUFFIX;
+			}else
 			{
 				str = Specification::CHEXSTRING_PREFIX 
-					+ makeHexString (validateStr.begin(), validateStr.end())
+					+ makeHexString (val.begin(), val.end())
 					+ Specification::CHEXSTRING_SUFFIX;
 			}
 			break;
@@ -316,7 +317,9 @@ complexValueToString<CDict> (const CDict
 	CDict::Value::const_iterator it = val.begin ();
 	for (; it != val.end(); ++it) 
 	{
-		str += Specification::CDICT_MIDDLE + (*it).first + Specification::CDICT_BETWEEN_NAMES;
+		string key = (*it).first;
+		str += Specification::CDICT_MIDDLE + makeNamePdfValid(key.begin(), key.end())
+			+ Specification::CDICT_BETWEEN_NAMES;
 		string tmp;
 		(*it).second->getStringRepresentation (tmp);
 		str += tmp;
Index: pdfedit-0.4.5/src/kernel/cobject2xpdf.cc
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/cobject2xpdf.cc
+++ pdfedit-0.4.5/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)
 				{
@@ -718,6 +718,10 @@ simpleValueFromXpdfObj (const Object& ob
 	rp (obj,val);
 }
 
+template
+void
+simpleValueFromXpdfObj<pReal, double&> (const Object&, double& val);
+
 //
 // Special case for pNull
 //
@@ -727,6 +731,13 @@ simpleValueFromXpdfObj<pNull,NullType&>
 {
 	/*assert (!"operation not permitted...");*//*THIS IS FORBIDDEN IN THE CALLER*/
 }
+template void simpleValueFromXpdfObj<pBool, bool&> (const Object&, bool& val);
+template void simpleValueFromXpdfObj<pInt, int&> (const Object&,  int& val);
+template void simpleValueFromXpdfObj<pReal, double&> (const Object&, double& val);
+template void simpleValueFromXpdfObj<pString, string&> (const Object&, string& val);
+template void simpleValueFromXpdfObj<pName, string&> (const Object&, string& val);
+template void simpleValueFromXpdfObj<pRef, IndiRef&> (const Object&, IndiRef& val);
+
 
 
 //
@@ -773,7 +784,7 @@ dictFromXpdfObj (CDict& resultDict, ::Ob
 		string key = dict.dictGetKey (i);
 		dict.dictGetValNF (i,obj.get());
 		// Make IProperty from value
-		scoped_ptr<IProperty> cobj (createObjFromXpdfObj (*obj));
+		boost::scoped_ptr<IProperty> cobj (createObjFromXpdfObj (*obj));
 		if (cobj)
 		{
 			// Store it in the dictionary
@@ -813,7 +824,7 @@ xpdfObjFromString (const std::string& st
 	memcpy(pStr, str.c_str(), len);
 	pStr[len] = '\0';
 					
-	scoped_ptr<Parser> parser(
+	boost::scoped_ptr<Parser> parser(
 			new Parser (xref, 
 				new Lexer (xref,
 					new MemStream (pStr, 0, static_cast<int>(len), &dct, gTrue)
@@ -1021,7 +1032,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);
Index: pdfedit-0.4.5/src/kernel/cobjecthelpers.cc
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/cobjecthelpers.cc
+++ pdfedit-0.4.5/src/kernel/cobjecthelpers.cc
@@ -40,61 +40,25 @@ using namespace boost;
 
 int getIntFromDict(std::string name, boost::shared_ptr<CDict> dict)
 {
-	using namespace 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=dict->getProperty<CInt>(name);
 	return int_ptr->getValue();
 }
 
 IndiRef getRefFromDict(std::string name, boost::shared_ptr<CDict> dict)
 {
-	using namespace 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=dict->getProperty<CRef>(name);
 	return int_ptr->getValue();
 }
 
 std::string getStringFromDict(std::string name, boost::shared_ptr<CDict> dict)
 {
-	using namespace 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=dict->getProperty<CString>(name);
 	return str_ptr->getValue();
 }
 	
 std::string getNameFromDict(std::string name, boost::shared_ptr<CDict> dict)
 {
-	using namespace 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=dict->getProperty<CName>(name);
 	std::string value;
 	name_ptr->getValue(value);
 
@@ -125,7 +89,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 +201,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,11 +218,11 @@ 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());
-	scoped_ptr<IProperty> llx(CRealFactory::getInstance(rect.xleft));
-	scoped_ptr<IProperty> lly(CRealFactory::getInstance(rect.yleft));
-	scoped_ptr<IProperty> urx(CRealFactory::getInstance(rect.xright));
-	scoped_ptr<IProperty> ury(CRealFactory::getInstance(rect.yright));
+	boost::shared_ptr<CArray> array(CArrayFactory::getInstance());
+	boost::scoped_ptr<IProperty> llx(CRealFactory::getInstance(rect.xleft));
+	boost::scoped_ptr<IProperty> lly(CRealFactory::getInstance(rect.yleft));
+	boost::scoped_ptr<IProperty> urx(CRealFactory::getInstance(rect.xright));
+	boost::scoped_ptr<IProperty> ury(CRealFactory::getInstance(rect.yright));
 	array->addProperty(0, *llx);
 	array->addProperty(1, *lly);
 	array->addProperty(2, *urx);
@@ -267,12 +231,12 @@ using namespace boost;
 	return array;
 }
 
-void getRectangleFromProperty(const shared_ptr<IProperty> prop, libs::Rectangle & rect)
+void getRectangleFromProperty(const boost::shared_ptr<IProperty> prop, libs::Rectangle & rect)
 {
 	if(!isArray(prop))
 		throw CObjBadValue();
 	
-	shared_ptr<CArray> array = IProperty::getSmartCObjectPtr<CArray>(prop);
+	boost::shared_ptr<CArray> array = IProperty::getSmartCObjectPtr<CArray>(prop);
 	if(array->getPropertyCount() != 4)
 		throw CObjBadValue();
 
@@ -286,7 +250,7 @@ boost::shared_ptr<IProperty> getIPropert
 {
 using namespace boost;
 
-	shared_ptr<CString> dateString(CStringFactory::getInstance());
+	boost::shared_ptr<CString> dateString(CStringFactory::getInstance());
 	char buffer[30];
 	memset(buffer, '\0', sizeof(buffer));
 
@@ -304,7 +268,7 @@ bool checkAndReplace(boost::shared_ptr<C
 {
 using namespace boost;
 
-	shared_ptr<IProperty> value;
+	boost::shared_ptr<IProperty> value;
 	try
 	{
 		value=annotDict->getProperty(fieldName);
@@ -323,9 +287,9 @@ using namespace boost;
 //
 //
 ::XRef*
-getXRef (shared_ptr<IProperty> ip)
+getXRef (boost::shared_ptr<IProperty> ip)
 {
-	shared_ptr<CPdf> pdf = ip->getPdf().lock();
+	boost::shared_ptr<CPdf> pdf = ip->getPdf().lock();
 	if(!pdf)
 		return NULL;
 	return pdf->getCXref(); 
Index: pdfedit-0.4.5/src/kernel/cobjecthelpers.h
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/cobjecthelpers.h
+++ pdfedit-0.4.5/src/kernel/cobjecthelpers.h
@@ -340,7 +340,7 @@ getAllChildrenOfPdfObject (boost::shared
 	boost::shared_ptr<CDict> dict; 
 	try {
 
-		dict = getCDictFromDict (topdict, "First");
+		dict = topdict->getProperty<CDict>("First");
 
 	}catch (ElementNotFoundException&) // No child
 		{ return; }
@@ -358,7 +358,7 @@ getAllChildrenOfPdfObject (boost::shared
 		getAllChildrenOfPdfObject (dict, cont);
 		
 		try {
-			dict = getCDictFromDict (dict, "Next");
+			dict = dict->getProperty<CDict>("Next");
 		}catch (ElementNotFoundException&)
 		{
 			return;
Index: pdfedit-0.4.5/src/kernel/cobjectsimple.h
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/cobjectsimple.h
+++ pdfedit-0.4.5/src/kernel/cobjectsimple.h
@@ -28,6 +28,7 @@
 // all basic includes
 #include "kernel/static.h"
 #include "kernel/iproperty.h"
+#include <algorithm>
 
 
 //=====================================================================================
@@ -326,14 +327,16 @@ makeNamePdfValid (Iter it, Iter end)
 	std::string tmp;
 	for (; it != end; ++it)
 	{
-		if ( '!' > (*it) || '~' < (*it))
+		unsigned ch = *it;
+
+		if (ch < sizeof(specialChars) && specialChars[*it])
 		{ // Convert it to ascii
 			char hexstr[4];
-			snprintf(hexstr, sizeof(hexstr), "#%02x", (unsigned)(*it)&0xff);
+			snprintf(hexstr, sizeof(hexstr), "#%02x", ch & 0xff);
 			assert(hexstr[sizeof(hexstr)-1] == '\0');
 			tmp += hexstr;
 		}else
-			tmp += *it;
+			tmp += ch;
 	}
 	
 	return tmp;
@@ -367,30 +370,37 @@ makeNamePdfValid (const char * str)
  * This includes also \0 (NUL) character, therefore we can't use standard
  * str* functions for strings.
  *
- * @param it Start iterator.
- * @param end End iterator.
+ * @param str String to escape.
  */
-template<typename Iter>
-std::string 
-makeStringPdfValid (Iter it, Iter end)
+inline std::string
+makeStringPdfValid (const std::string &str)
 {
-	typedef typename std::string::value_type Item;
-	std::string tmp;
-	for (; it != end; ++it)
-	{
-		if ( '\\' == (*it))
-		{ // Escape every backslash
-			tmp += '\\';
-		}
-		else if ( '(' == (*it) || ')' == (*it))
-		{ // Prepend \ before ( or )
-			tmp += '\\';
-		}
-		
-		tmp += *it;
-	}
-	
-	return tmp;
+        typedef std::string::const_reverse_iterator Iter;
+        std::string tmp;
+        bool need_escape=false;
+        for (Iter it=str.rbegin(); it != str.rend(); ++it)
+        {
+                if ( '\\' == (*it))
+                        need_escape ^= true;
+                else if(need_escape)
+                {
+                        // escape the previously processed character
+                        tmp+='\\';
+                        need_escape = false;
+                }
+                if (!need_escape && ('(' == (*it) || ')' == (*it)))
+                        need_escape = true;
+                tmp += *it;
+        }
+        if(need_escape)
+                tmp+='\\';
+
+        // we have processed the string from the end so we have to
+        // reverse it now (we could insert the character always to the
+        // front but that would require N^2 moves so the reverse is more
+        // optimal)
+        reverse(tmp.begin(), tmp.end());
+        return tmp;
 }
 
 /**
@@ -405,7 +415,7 @@ inline std::string
 makeStringPdfValid (GString * str)
 { 
 	char * string = str->getCString();
-	return makeStringPdfValid (string, string + str->getLength()); 
+	return makeStringPdfValid (string); 
 }
 
 //=========================================================
Index: pdfedit-0.4.5/src/kernel/contentschangetag.cc
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/contentschangetag.cc
+++ pdfedit-0.4.5/src/kernel/contentschangetag.cc
@@ -51,11 +51,11 @@ ContentsChangeTag::create ()
 	PdfOperator::Operands opers;
 	
 	// Name or our application
-	shared_ptr<CName> name (new CName (CHANGE_TAG_ID));
+	boost::shared_ptr<CName> name (new CName (CHANGE_TAG_ID));
 	opers.push_back (name);
 	
 	// Dict with our informatio
-	shared_ptr<CDict> dict (new CDict ());
+	boost::shared_ptr<CDict> dict (new CDict ());
 	time_t t = time (NULL);
 	ostringstream oss;
 	oss << t;
@@ -72,7 +72,7 @@ ContentsChangeTag::create ()
 //
 //
 time_t
-ContentsChangeTag::getTime (shared_ptr<PdfOperator> op)
+ContentsChangeTag::getTime (boost::shared_ptr<PdfOperator> op)
 {
 	assert (op);
 
Index: pdfedit-0.4.5/src/kernel/cpage.cc
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/cpage.cc
+++ pdfedit-0.4.5/src/kernel/cpage.cc
@@ -88,9 +88,9 @@ CPage::CPage (boost::shared_ptr<CDict>&
 	//
 	// Init modules
 	//
-	_contents = shared_ptr<CPageContents> (new CPageContents(this));
+	_contents = boost::shared_ptr<CPageContents> (new CPageContents(this));
 	_modules.push_back (_contents);
-	_display = shared_ptr<CPageDisplay> (new CPageDisplay(this));
+	_display = boost::shared_ptr<CPageDisplay> (new CPageDisplay(this));
 	_modules.push_back (_display);
 	_fonts = boost::shared_ptr<CPageFonts> (new CPageFonts(this));
 	_modules.push_back (_fonts);
@@ -252,7 +252,7 @@ size_t
 CPage::getPagePosition () const
 {
 	if (hasValidPdf (_dict))
-		return _dict->getPdf().lock()->getPagePosition (shared_ptr<CPage>(const_cast<CPage*>(this),EmptyDeallocator<CPage> ()));
+		return _dict->getPdf().lock()->getPagePosition (boost::shared_ptr<CPage>(const_cast<CPage*>(this),EmptyDeallocator<CPage> ()));
 
 	throw CObjInvalidOperation ();
 }
@@ -284,9 +284,9 @@ CPage::_objectChanged (bool invalid)
 
 	// Notify observers
 	if (invalid)
-		this->notifyObservers (current, shared_ptr<const ObserverContext> ());
+		this->notifyObservers (current, boost::shared_ptr<const ObserverContext> ());
 	else
-		this->notifyObservers (current, shared_ptr<const ObserverContext> (new BasicObserverContext (current)));
+		this->notifyObservers (current, boost::shared_ptr<const ObserverContext> (new BasicObserverContext (current)));
 }
 
 
Index: pdfedit-0.4.5/src/kernel/cpageannots.cc
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/cpageannots.cc
+++ pdfedit-0.4.5/src/kernel/cpageannots.cc
@@ -69,14 +69,7 @@ namespace {
 	boost::shared_ptr<CArray> 
 	getAnnotsArray(boost::shared_ptr<CDict> pageDict)
 	{
-		boost::shared_ptr<CArray> annotsArray;
-
-		boost::shared_ptr<IProperty> arrayProp=pageDict->getProperty("Annots");
-		if(isRef(arrayProp))
-			// this will throw if target is not an array
-			annotsArray=getCObjectFromRef<CArray>(arrayProp);
-		else 
-			annotsArray=IProperty::getSmartCObjectPtr<CArray>(arrayProp);
+		boost::shared_ptr<CArray> annotsArray = pageDict->getProperty<CArray>("Annots");
 
 		// just to be sure that return value is initialized
 		assert(annotsArray.get());
@@ -110,19 +103,9 @@ namespace {
 			// dictionaries
 			for(size_t i=0; i<annotsArray->getPropertyCount(); ++i)
 			{
-				// gets elements and ignores those which are not referencies
-				boost::shared_ptr<IProperty> elem=annotsArray->getProperty(i);
-				if(!isRef(elem))
-				{
-					kernelPrintDbg(debug::DBG_WARN, "Annots["<<i<<"] is not reference. Ignoring.");
-					continue;
-				}
-
-				// gets target property which has to be dictionary - if not skips
-				// element
 				try
 				{
-					boost::shared_ptr<CDict> annotDict=getCObjectFromRef<CDict>(elem);
+					boost::shared_ptr<CDict> annotDict=annotsArray->getProperty<CDict>(i);
 
 					// creates CAnnotation instance and inserts it to the container
 					boost::shared_ptr<CAnnotation> annot(new CAnnotation(annotDict));
@@ -180,24 +163,24 @@ namespace {
 
 	typedef struct reg_annots
 	{
-		void operator() (shared_ptr<IProperty> obj, boost::shared_ptr<IPropertyObserver> obs)
+		void operator() (boost::shared_ptr<IProperty> obj, boost::shared_ptr<IPropertyObserver> obs)
 			{ REGISTER_SHAREDPTR_OBSERVER (obj, obs); }
 	}reg_annots;
 
 	typedef struct unreg_annots
 	{
-		void operator() (shared_ptr<IProperty> obj, boost::shared_ptr<IPropertyObserver> obs)
+		void operator() (boost::shared_ptr<IProperty> obj, boost::shared_ptr<IPropertyObserver> obs)
 			{ UNREGISTER_SHAREDPTR_OBSERVER (obj, obs); }
 	}unreg_annots;
 
 	// generic {un}register function
 	template<typename T>
-	void egister_annots (shared_ptr<IProperty> annots, 
+	void egister_annots (boost::shared_ptr<IProperty> annots, 
 						 T egister, 
 						 boost::shared_ptr<IPropertyObserver> _prop_wd,
 						 boost::shared_ptr<IPropertyObserver> _array_wd)
 	{
-		shared_ptr<CArray> annotsArray;
+		boost::shared_ptr<CArray> annotsArray;
 		if(isRef(annots))
 		{
 			egister(annots, _prop_wd);
@@ -237,7 +220,7 @@ namespace {
 //
 //
 void 
-CPageAnnots::reg_observers(shared_ptr<IProperty> annots)
+CPageAnnots::reg_observers(boost::shared_ptr<IProperty> annots)
 {
 		kernelPrintDbg(DBG_DBG, "");
 
@@ -251,7 +234,7 @@ CPageAnnots::reg_observers(shared_ptr<IP
 		REGISTER_SHAREDPTR_OBSERVER(_page->getDictionary(), _prop_wd);
 		if(_page->getDictionary()->containsProperty(Specification::Page::ANNOTS))
 		{
-			shared_ptr<IProperty> annotsProp=_page->getDictionary()->getProperty(Specification::Page::ANNOTS);
+			boost::shared_ptr<IProperty> annotsProp=_page->getDictionary()->getProperty(Specification::Page::ANNOTS);
 			reg_observers(annotsProp);
 		}
 	}
@@ -275,7 +258,7 @@ CPageAnnots::unreg_observers(boost::shar
 		UNREGISTER_SHAREDPTR_OBSERVER(_page->getDictionary(), _prop_wd);
 		if(_page->getDictionary()->containsProperty(Specification::Page::ANNOTS))
 		{
-			shared_ptr<IProperty> annotsProp=_page->getDictionary()->getProperty(Specification::Page::ANNOTS);
+			boost::shared_ptr<IProperty> annotsProp=_page->getDictionary()->getProperty(Specification::Page::ANNOTS);
 			unreg_observers(annotsProp);
 		}
 	}
@@ -299,12 +282,12 @@ CPageAnnots::consolidate(boost::shared_p
 	{
 		try
 		{
-			shared_ptr<CDict> annotDict=getCObjectFromRef<CDict>(oldValue);
+			boost::shared_ptr<CDict> annotDict=getCObjectFromRef<CDict>(oldValue);
 			Annotations::iterator i;
 			bool erased = false;
 			for(i=_annotations.begin(); i!=_annotations.end(); ++i)
 			{
-				shared_ptr<CAnnotation> annot=*i;
+				boost::shared_ptr<CAnnotation> annot=*i;
 				if(annot->getDictionary()==annotDict)
 				{
 					kernelPrintDbg(debug::DBG_DBG, "Annotation maintaining oldValue found and removed. Invalidating annotation");	
@@ -334,11 +317,11 @@ CPageAnnots::consolidate(boost::shared_p
 	{
 		try
 		{
-			shared_ptr<CDict> annotDict=getCObjectFromRef<CDict>(newValue);		
+			boost::shared_ptr<CDict> annotDict=getCObjectFromRef<CDict>(newValue);		
 
 			// creates CAnnotation instance from dereferenced dictionary 
 			// and adds it to _annotations
-			shared_ptr<CAnnotation> annot(new CAnnotation(annotDict));
+			boost::shared_ptr<CAnnotation> annot(new CAnnotation(annotDict));
 			_annotations.push_back(annot);
 		}catch(ElementBadTypeException & )
 		{
@@ -362,7 +345,7 @@ CPageAnnots::add(boost::shared_ptr<CAnno
 		
 	// gets Annots array from page dictionary. If no found, creates it. If bad
 	// typed, throws an exception
-	shared_ptr<CArray> annotsArray;
+	boost::shared_ptr<CArray> annotsArray;
 	try
 	{
 		annotsArray=getAnnotsArray(_page->getDictionary());
@@ -380,11 +363,9 @@ CPageAnnots::add(boost::shared_ptr<CAnno
 		// it.
 		// annotsArray must be set from getProperty method because addProperty
 		// creates deep copy of given
-		scoped_ptr<IProperty> tmpArray(CArrayFactory::getInstance());
+		boost::scoped_ptr<IProperty> tmpArray(CArrayFactory::getInstance());
 		_page->getDictionary()->addProperty(Specification::Page::ANNOTS, *tmpArray);
-		annotsArray=IProperty::getSmartCObjectPtr<CArray>(
-				_page->getDictionary()->getProperty(Specification::Page::ANNOTS)
-				);
+		annotsArray=_page->getDictionary()->getProperty<CArray>(Specification::Page::ANNOTS);
 		REGISTER_SHAREDPTR_OBSERVER(annotsArray, _array_wd);	
 	}
 
@@ -395,7 +376,7 @@ CPageAnnots::add(boost::shared_ptr<CAnno
 	IndiRef annotRef=pdf->addIndirectProperty(annot->getDictionary());
 	
 	// gets added annotation dictionary
-	shared_ptr<CDict> annotDict=IProperty::getSmartCObjectPtr<CDict>(
+	boost::shared_ptr<CDict> annotDict=IProperty::getSmartCObjectPtr<CDict>(
 			pdf->getIndirectProperty(annotRef)
 			);
 
@@ -403,14 +384,14 @@ 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
-	shared_ptr<CRef> pageRef(CRefFactory::getInstance(_page->getDictionary()->getIndiRef()));
+	boost::shared_ptr<CRef> pageRef(CRefFactory::getInstance(_page->getDictionary()->getIndiRef()));
 	checkAndReplace(annotDict, "P", *pageRef);
 
 	kernelPrintDbg(debug::DBG_INFO, "Adding reference "<<annotRef<<" to annotation dictionary to Annots array");
 	// annotation dictionary is prepared and so its reference can be stored	
 	// to Annots array from page dictionary - this will start observer which
 	// will update _annotations
-	scoped_ptr<CRef> annotCRef(CRefFactory::getInstance(annotRef));
+	boost::scoped_ptr<CRef> annotCRef(CRefFactory::getInstance(annotRef));
 	annotsArray->addProperty(*annotCRef);
 }
 
@@ -427,7 +408,7 @@ CPageAnnots::del(boost::shared_ptr<CAnno
 	size_t pos=0;
 	for(Annotations::iterator i=_annotations.begin(); i!=_annotations.end(); ++i,++pos)
 	{
-		shared_ptr<CAnnotation> element=*i;	
+		boost::shared_ptr<CAnnotation> element=*i;	
 		if(annot!=element)
 			continue;
 		
@@ -436,7 +417,7 @@ CPageAnnots::del(boost::shared_ptr<CAnno
 		kernelPrintDbg(debug::DBG_DBG, "Annotation found. Indiref="<<annotRef);
 		try
 		{
-			shared_ptr<CArray> annotArray=getAnnotsArray(_page->getDictionary());
+			boost::shared_ptr<CArray> annotArray=getAnnotsArray(_page->getDictionary());
 			// deleting of this reference triggers annotsWatchDog observer which
 			// will synchronize _annotations with current state
 			annotArray->delProperty(pos);
@@ -476,13 +457,13 @@ using namespace observer;
 	}
 	
 	kernelPrintDbg(DBG_DBG, "context type="<<context->getType());
-	shared_ptr<IProperty> oldValue;
+	boost::shared_ptr<IProperty> oldValue;
 	switch(context->getType())
 	{
 		case BasicChangeContextType:
 			{
 				// this means that Annots element reference value has changed	
-				shared_ptr<const BasicChangeContext<IProperty> > basicContext=
+				boost::shared_ptr<const BasicChangeContext<IProperty> > basicContext=
 					dynamic_pointer_cast<const BasicChangeContext<IProperty>, const observer::IChangeContext<IProperty> >(context); 
 				oldValue=basicContext->getOriginalValue();
 				assert(isRef(newValue));
@@ -494,7 +475,7 @@ using namespace observer;
 		case ComplexChangeContextType:
 			{
 				// Annots array content has changed
-				shared_ptr<const CArray::CArrayComplexObserverContext > basicContext=
+				boost::shared_ptr<const CArray::CArrayComplexObserverContext > basicContext=
 					dynamic_pointer_cast<const CArray::CArrayComplexObserverContext, 
 					const IChangeContext<IProperty> >(context); 
 				if(!context)
@@ -540,14 +521,14 @@ CPageAnnots::PropWatchDog::notify(
 	}
 	
 	kernelPrintDbg(DBG_DBG, "context type="<<context->getType());
-	shared_ptr<IProperty> oldValue;
+	boost::shared_ptr<IProperty> oldValue;
 	switch(context->getType())
 	{
 		case BasicChangeContextType:
 			{
 				// This means that Annots property is reference and it has
 				// changed its reference value
-				shared_ptr<const observer::BasicChangeContext<IProperty> > basicContext=
+				boost::shared_ptr<const observer::BasicChangeContext<IProperty> > basicContext=
 					dynamic_pointer_cast<const observer::BasicChangeContext<IProperty>, const observer::IChangeContext<IProperty> >(context); 
 				oldValue=basicContext->getOriginalValue();
 				assert(isRef(newValue));
@@ -559,7 +540,7 @@ CPageAnnots::PropWatchDog::notify(
 				// page dictionary has changed
 				// checks identificator of changed property and if it is not
 				// Annots, immediately returns
-				shared_ptr<const CDict::CDictComplexObserverContext > basicContext=
+				boost::shared_ptr<const CDict::CDictComplexObserverContext > basicContext=
 					dynamic_pointer_cast<const CDict::CDictComplexObserverContext, 
 					const IChangeContext<IProperty> >(context); 
 				if(!basicContext)
@@ -588,7 +569,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
-	shared_ptr<IProperty> oldArray;
+	boost::shared_ptr<IProperty> oldArray;
 	if(isRef(oldValue))
 	{
 		try
@@ -618,7 +599,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
-	shared_ptr<IProperty> newArray;
+	boost::shared_ptr<IProperty> newArray;
 	if(isRef(newValue))
 	{
 		try
Index: pdfedit-0.4.5/src/kernel/cpageattributes.cc
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/cpageattributes.cc
+++ pdfedit-0.4.5/src/kernel/cpageattributes.cc
@@ -47,7 +47,7 @@ using namespace utils;
 //
 //
 void 
-CPageAttributes::fillInherited(const shared_ptr<CDict> pageDict, InheritedAttributes& attrs)
+CPageAttributes::fillInherited(const boost::shared_ptr<CDict> pageDict, InheritedAttributes& attrs)
 {
 	int initialized=0;
 
@@ -57,20 +57,11 @@ CPageAttributes::fillInherited(const sha
 	if(!attrs._resources.get())
 	{
 		// attrs.__resources field is not specified yet, so tries this dictionary
-		if(pageDict->containsProperty(Specification::Page::RESOURCES))
-		{
-			shared_ptr<IProperty> prop=pageDict->getProperty(Specification::Page::RESOURCES);
-			if(isRef(prop))
-			{
-				attrs._resources=getCObjectFromRef<CDict>(prop);
-				++initialized;
-			}
-			else
-				if(isDict(prop))
-				{
-					attrs._resources=IProperty::getSmartCObjectPtr<CDict>(prop);
-					++initialized;
-				}
+		try {
+			attrs._resources = pageDict->getProperty<CDict>(Specification::Page::RESOURCES);
+			++initialized;
+		}catch(...) {
+			// ignore
 		}
 	}else
 		++initialized;
@@ -79,19 +70,11 @@ CPageAttributes::fillInherited(const sha
 	if(!attrs._mediaBox.get())
 	{
 		// attrs._mediaBox field is not specified yet, so tries this array
-		if(pageDict->containsProperty(Specification::Page::MEDIABOX))
-		{
-			shared_ptr<IProperty> prop=pageDict->getProperty(Specification::Page::MEDIABOX);
-			if(isRef(prop))
-			{
-				attrs._mediaBox=getCObjectFromRef<CArray>(prop);
-				++initialized;
-			}else
-				if(isArray(prop))
-				{
-					attrs._mediaBox=IProperty::getSmartCObjectPtr<CArray>(prop);
-					++initialized;
-				}
+		try {
+			attrs._mediaBox=pageDict->getProperty<CArray>(Specification::Page::MEDIABOX);
+			++initialized;
+		}catch(...) {
+			// ignore
 		}
 	}else
 		++initialized;
@@ -100,19 +83,11 @@ CPageAttributes::fillInherited(const sha
 	if(!attrs._cropBox.get())
 	{
 		// attrs._cropBox field is not specified yet, so tries this array
-		if(pageDict->containsProperty(Specification::Page::CROPBOX))
-		{
-			shared_ptr<IProperty> prop=pageDict->getProperty(Specification::Page::CROPBOX);
-			if(isRef(prop))
-			{
-				attrs._cropBox=getCObjectFromRef<CArray>(prop);
-				++initialized;
-			}else
-				if(isArray(prop))
-				{
-					attrs._cropBox=IProperty::getSmartCObjectPtr<CArray>(prop);
-					++initialized;
-				}
+		try {
+			attrs._cropBox=pageDict->getProperty<CArray>(Specification::Page::CROPBOX);
+			++initialized;
+		}catch(...) {
+			// ignore
 		}
 	}else
 		++initialized;
@@ -121,19 +96,11 @@ CPageAttributes::fillInherited(const sha
 	if(!attrs._rotate.get())
 	{
 		// attrs._rotate field is not specified yet, so tries this array
-		if(pageDict->containsProperty(Specification::Page::ROTATE))
-		{
-			shared_ptr<IProperty> prop=pageDict->getProperty(Specification::Page::ROTATE);
-			if(isRef(prop))
-			{
-				attrs._rotate=getCObjectFromRef<CInt>(prop);
-				++initialized;
-			}else
-				if(isInt(prop))
-				{
-					attrs._rotate=IProperty::getSmartCObjectPtr<CInt>(prop);
-					++initialized;
-				}
+		try {
+			attrs._rotate=pageDict->getProperty<CInt>(Specification::Page::ROTATE);
+			++initialized;
+		}catch(...) {
+			// ignore
 		}
 	}else
 		++initialized;
@@ -147,19 +114,14 @@ CPageAttributes::fillInherited(const sha
 		// stops recursion and initializes values with default
 		if(pageDict->containsProperty(Specification::Page::PARENT))
 		{
-			shared_ptr<IProperty> parentRef=pageDict->getProperty(Specification::Page::PARENT);
-			if(!isRef(parentRef))
-				// this should not happen - malformed page tree structure
-				return;
-
-			shared_ptr<CDict> parentDict=getCObjectFromRef<CDict>(parentRef);
+			boost::shared_ptr<CDict> parentDict=pageDict->getProperty<CDict>(Specification::Page::PARENT);
 			CPageAttributes::fillInherited(parentDict, attrs);
 		}else
 		{
 			// Resources is required and at least empty dictionary should be
 			// specified 
 			if(!attrs._resources.get())
-				attrs._resources=shared_ptr<CDict>(CDictFactory::getInstance());
+				attrs._resources=boost::shared_ptr<CDict>(CDictFactory::getInstance());
 
 			// default A4 sized box
 			libs::Rectangle defaultRect(
@@ -177,12 +139,7 @@ CPageAttributes::fillInherited(const sha
 			// CropBox is optional and specification doesn't say anything about
 			// default value - we are using standard A4 format
 			if(!attrs._cropBox.get())
-			{
-					libs::Rectangle mediaRect;
-					getRectangleFromProperty(attrs._mediaBox, mediaRect);
-					attrs._cropBox=IProperty::getSmartCObjectPtr<CArray>(
-							getIPropertyFromRectangle(mediaRect));
-			}
+					attrs._cropBox=attrs._mediaBox;
 			
 			// Rotate is optional and specification defines default value to 0
 			if(!attrs._rotate.get())
@@ -191,7 +148,7 @@ CPageAttributes::fillInherited(const sha
 				// direct usage of static DEFAULT_ROTATE value caused linkage
 				// error
 				int defRot=DisplayParams::DEFAULT_ROTATE;
-				attrs._rotate=shared_ptr<CInt>(CIntFactory::getInstance(defRot));
+				attrs._rotate=boost::shared_ptr<CInt>(CIntFactory::getInstance(defRot));
 			}
 		}
 	}
@@ -203,7 +160,7 @@ CPageAttributes::fillInherited(const sha
 //
 //
 void 
-CPageAttributes::setInheritable(shared_ptr<CDict>& pageDict)
+CPageAttributes::setInheritable(boost::shared_ptr<CDict>& pageDict)
 {
 	InheritedAttributes attrs;
 	CPageAttributes::fillInherited(pageDict, attrs);
Index: pdfedit-0.4.5/src/kernel/cpagechanges.cc
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/cpagechanges.cc
+++ pdfedit-0.4.5/src/kernel/cpagechanges.cc
@@ -50,7 +50,7 @@ void
 CPageChanges::displayChange (::OutputDev& out, const Container& cont) const
 {
 
-	shared_ptr<CDict> fakeDict (IProperty::getSmartCObjectPtr<CDict>(_page->getDictionary()->clone()));
+	boost::shared_ptr<CDict> fakeDict (IProperty::getSmartCObjectPtr<CDict>(_page->getDictionary()->clone()));
 		assert (fakeDict);
 
 	CPageContents::setContents (fakeDict, cont);
@@ -66,14 +66,14 @@ CPageChanges::displayChange (::OutputDev
 	// Display page using our dictionary
 	_page->display()->displayPage (out, fakeDict);
 }
-template void CPageChanges::displayChange<vector<shared_ptr<CContentStream> > > (::OutputDev& out, const vector<shared_ptr<CContentStream> >& cont) const;
+template void CPageChanges::displayChange<vector<boost::shared_ptr<CContentStream> > > (::OutputDev& out, const vector<boost::shared_ptr<CContentStream> >& cont) const;
 
 
 //
 //
 //
 void 
-CPageChanges::displayChange (::OutputDev& out, const std::vector<size_t> cs) const
+CPageChanges::displayChange (::OutputDev& out, const std::vector<size_t>& cs) const
 {
 	Changes css;
 	for (std::vector<size_t>::const_iterator it = cs.begin(); it != cs.end(); ++it)
@@ -87,10 +87,10 @@ CPageChanges::displayChange (::OutputDev
 //
 //
 //
-shared_ptr<CContentStream>
+boost::shared_ptr<CContentStream>
 CPageChanges::getChange (size_t nthchange) const
 {
-	typedef vector<shared_ptr<CContentStream> > CCs;
+	typedef vector<boost::shared_ptr<CContentStream> > CCs;
 	
 	CCs ccs;
 	getChanges (ccs);
@@ -122,9 +122,9 @@ namespace {
 	 */
 	struct ccs_change_sorter 
 	{
-		bool operator() (shared_ptr<CContentStream> frst, shared_ptr<CContentStream> scnd)
+		bool operator() (boost::shared_ptr<CContentStream> frst, boost::shared_ptr<CContentStream> scnd)
 		{
-			typedef vector<shared_ptr<PdfOperator> > Ops;
+			typedef vector<boost::shared_ptr<PdfOperator> > Ops;
 			static const bool FIRST_IS_OUR_LAST = true;
 			static const bool SECOND_IS_OUR_LAST = false;
 			
@@ -163,7 +163,7 @@ CPageChanges::getChanges (Changes& cont)
 	_page->contents()->getContentStreams (ccs);
 	for (CCs::const_iterator it = ccs.begin(); it != ccs.end(); ++it)
 	{
-		vector<shared_ptr<PdfOperator> > ops;
+		vector<boost::shared_ptr<PdfOperator> > ops;
 		(*it)->getPdfOperators (ops);
 			// Empty contentstream is not our change
 			if (ops.empty())
Index: pdfedit-0.4.5/src/kernel/cpagechanges.h
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/cpagechanges.h
+++ pdfedit-0.4.5/src/kernel/cpagechanges.h
@@ -93,7 +93,7 @@ public:
 	 */
 	template<typename Container>
 	void displayChange (::OutputDev& out, const Container& cont) const;
-	void displayChange (::OutputDev& out, const std::vector<size_t> cs) const;
+	void displayChange (::OutputDev& out, const std::vector<size_t>& cs) const;
 
 
 }; // class CPageChanges
Index: pdfedit-0.4.5/src/kernel/cpagecontents.cc
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/cpagecontents.cc
+++ pdfedit-0.4.5/src/kernel/cpagecontents.cc
@@ -45,6 +45,21 @@ using namespace boost;
 using namespace observer;
 using namespace utils;
 
+boost::shared_ptr<CContentStream> CPageContents::createContentStream(const CPage &page, CContentStream::CStreams *streams) {
+
+	boost::shared_ptr<GfxResources> res;
+	boost::shared_ptr<GfxState> state;
+	page.display()->createXpdfDisplayParams(res, state);
+
+	boost::shared_ptr<CContentStream> cc(streams
+			?new CContentStream(*streams, state, res)
+			:new CContentStream(state, res));
+
+	// Init cc and save smart pointer of the content stream so pdfoperators can get it
+	cc->setSmartPointer(cc);
+	return cc;
+}
+
 
 //==========================================================
 // Contents watchdog
@@ -55,8 +70,8 @@ using namespace utils;
 //
 //
 void 
-CPageContents::ContentsWatchDog::notify (shared_ptr<IProperty> newValue, 
-						  shared_ptr<const IProperty::ObserverContext> context) const throw()
+CPageContents::ContentsWatchDog::notify (boost::shared_ptr<IProperty> newValue, 
+						  boost::shared_ptr<const IProperty::ObserverContext> context) const throw()
 {
 		kernelPrintDbg (debug::DBG_DBG, "context type=" << context->getType());
 
@@ -84,8 +99,8 @@ CPageContents::ContentsWatchDog::notify
 		case ComplexChangeContextType:
 		{
 			// Is it a dictionary Page dictionary
-			shared_ptr<const CDict::CDictComplexObserverContext> ctxtdict =
-				dynamic_pointer_cast<const CDict::CDictComplexObserverContext, 
+			boost::shared_ptr<const CDict::CDictComplexObserverContext> ctxtdict =
+				boost::dynamic_pointer_cast<const CDict::CDictComplexObserverContext, 
 									 const IChangeContext<IProperty> > (context); 
 			if (ctxtdict)
 			{
@@ -102,7 +117,7 @@ CPageContents::ContentsWatchDog::notify
 				// 1.2 Contents entry was removed
 				if (isNull(newValue))
 				{
-					shared_ptr<IProperty> oldValue = ctxtdict->getOriginalValue();
+					boost::shared_ptr<IProperty> oldValue = ctxtdict->getOriginalValue();
 					// Unregister observer
 					_cnt->unreg_observer (oldValue);
 				
@@ -116,8 +131,8 @@ CPageContents::ContentsWatchDog::notify
 			}
 
 			// Is it an array (Contents) -- do nothing just reparse
-			shared_ptr<const CArray::CArrayComplexObserverContext> ctxtarray =
-				dynamic_pointer_cast<const CArray::CArrayComplexObserverContext, 
+			boost::shared_ptr<const CArray::CArrayComplexObserverContext> ctxtarray =
+				boost::dynamic_pointer_cast<const CArray::CArrayComplexObserverContext, 
 									 const IChangeContext<IProperty> > (context); 
 			if (ctxtarray)
 			{
@@ -162,7 +177,7 @@ namespace {
 	createStreamFromObjects (const Container& cont, boost::weak_ptr<CPdf> pdf)
 	{
 		// Create stream with one default property Length
-		shared_ptr<CStream> newstr (new CStream());
+		boost::shared_ptr<CStream> newstr (new CStream());
 		
 		// Insert our change tag
 		std::string str;
@@ -234,7 +249,7 @@ CPageContents::~CPageContents ()
 }
 
 
-shared_ptr<CContentStream> 
+boost::shared_ptr<CContentStream> 
 CPageContents::getContentStream (CContentStream* cc)
 {
 	init();
@@ -247,7 +262,7 @@ CPageContents::getContentStream (CConten
 }
 
 
-shared_ptr<CContentStream> 
+boost::shared_ptr<CContentStream> 
 CPageContents::getContentStream (size_t pos)
 {
 	init();
@@ -262,10 +277,10 @@ CPageContents::getContentStream (size_t
 //
 template<typename Container>
 void 
-CPageContents::addToFront (const Container& cont)
+CPageContents::addToFront (boost::shared_ptr<CContentStream> &cc, const Container& cont)
 { 
 	// Create cstream from container of pdf operators
-	shared_ptr<CStream> stream = createStreamFromObjects (cont, _dict->getPdf());
+	boost::shared_ptr<CStream> stream = createStreamFromObjects (cont, _dict->getPdf());
 	assert (hasValidRef (stream)); assert (hasValidPdf (stream));
 	if (!hasValidPdf(stream) || !hasValidPdf(stream))
 		throw CObjInvalidObject ();
@@ -277,15 +292,10 @@ CPageContents::addToFront (const Contain
 	// Parse new stream to content stream and add it to the streams
 	CContentStream::CStreams streams;
 	streams.push_back (stream);
-	boost::shared_ptr<GfxResources> res;
-	boost::shared_ptr<GfxState> state;
-	_xpdf_display_params (res, state);
-	CCs _tmp;
-	// Init cc and save smart pointer of the content stream so pdfoperators can get it
-	boost::shared_ptr<CContentStream> cc (new CContentStream(streams,state,res));
-	cc->setSmartPointer (cc);
+	cc->setStreams(streams);
 
 	// copy it to front
+	CCs _tmp;
 	_tmp.push_back (cc);
 	init();
 	std::copy (_ccs.begin(), _ccs.end(), std::back_inserter(_tmp));
@@ -294,20 +304,26 @@ CPageContents::addToFront (const Contain
 	// Indicate change
 	change ();
 }
-template void CPageContents::addToFront<vector<shared_ptr<PdfOperator> > > (const vector<shared_ptr<PdfOperator> >& cont);
-template void CPageContents::addToFront<deque<shared_ptr<PdfOperator> > > (const deque<shared_ptr<PdfOperator> >& cont);
 
-//
-//
-//
 template<typename Container>
 void 
-CPageContents::addToBack (const Container& cont)
+CPageContents::addToFront (const Container& cont)
+{ 
+	boost::shared_ptr<CContentStream> cc = createContentStream(*_page, NULL);
+	addToFront(cc, cont);
+}
+
+template void CPageContents::addToFront<vector<boost::shared_ptr<PdfOperator> > > (const vector<boost::shared_ptr<PdfOperator> >& cont);
+template void CPageContents::addToFront<deque<boost::shared_ptr<PdfOperator> > > (const deque<boost::shared_ptr<PdfOperator> >& cont);
+
+template<typename Container>
+void 
+CPageContents::addToBack (boost::shared_ptr<CContentStream> &cc, const Container& cont)
 {
 	// Create cstream from container of pdf operators
 	if (!hasValidPdf(_dict))
 		throw CObjInvalidObject ();
-	shared_ptr<CStream> stream = createStreamFromObjects (cont, _dict->getPdf());
+	boost::shared_ptr<CStream> stream = createStreamFromObjects (cont, _dict->getPdf());
 	assert (hasValidRef (stream)); assert (hasValidPdf (stream));
 	if (!hasValidPdf(stream) || !hasValidPdf(stream))
 		throw CObjInvalidObject ();
@@ -320,20 +336,25 @@ CPageContents::addToBack (const Containe
 	// Parse new stream to content stream and add it to the streams
 	CContentStream::CStreams streams;
 	streams.push_back (stream);
-	boost::shared_ptr<GfxResources> res;
-	boost::shared_ptr<GfxState> state;
-	_xpdf_display_params (res, state);
-	// Init and save smart pointer
-	boost::shared_ptr<CContentStream> cc (new CContentStream(streams,state,res));
-	cc->setSmartPointer (cc);
+	cc->setStreams(streams);
 	init();
 	_ccs.push_back (cc);
 
 	// Indicate change
 	change ();
 }
-template void CPageContents::addToBack<vector<shared_ptr<PdfOperator> > > (const vector<shared_ptr<PdfOperator> >& cont);
-template void CPageContents::addToBack<deque<shared_ptr<PdfOperator> > > (const deque<shared_ptr<PdfOperator> >& cont);
+//
+//
+//
+template<typename Container>
+void 
+CPageContents::addToBack (const Container& cont)
+{
+	boost::shared_ptr<CContentStream> cc = createContentStream(*_page, NULL);
+	addToBack(cc, cont);
+}
+template void CPageContents::addToBack<vector<boost::shared_ptr<PdfOperator> > > (const vector<boost::shared_ptr<PdfOperator> >& cont);
+template void CPageContents::addToBack<deque<boost::shared_ptr<PdfOperator> > > (const deque<boost::shared_ptr<PdfOperator> >& cont);
 
 
 //
@@ -379,7 +400,13 @@ CPageContents::getText (std::string& tex
 
 	// Get the text
 	libs::Rectangle rec = (rc)? *rc : _page->display()->getPageRect();
-	scoped_ptr<GString> gtxt (textDev->getText(rec.xleft, rec.yleft, rec.xright, rec.yright));
+	// if we use rotation 90,270 then we must change the rectangle from which we want the text
+	// accordingly (TODO - verify for all rotations)
+	int rot = _page->getRotation ();
+	if (90 == rot || 270 == rot)
+		std::swap (rec.xright, rec.yright);
+
+	boost::scoped_ptr<GString> gtxt (textDev->getText(rec.xleft, rec.yleft, rec.xright, rec.yright));
 	text = gtxt->getCString();
 }
 
@@ -397,7 +424,7 @@ size_t CPageContents::findText (std::str
 					  const TextSearchParams&) const
 {
 	// Create text output device
-	scoped_ptr<TextOutputDev> textDev (new ::TextOutputDev (NULL, gFalse, gFalse, gFalse));
+	boost::scoped_ptr<TextOutputDev> textDev (new ::TextOutputDev (NULL, gFalse, gFalse, gFalse));
 		assert (textDev->isOk());
 		if (!textDev->isOk())
 			throw CObjInvalidOperation ();
@@ -484,11 +511,11 @@ CPageContents::addText (const std::strin
 	if (fontName.empty())
 		fontName = "PDFEDIT_F1";
     double fontSize = 15.0;
-    shared_ptr<UnknownCompositePdfOperator> q(new UnknownCompositePdfOperator("q", "Q"));
-    shared_ptr<UnknownCompositePdfOperator> BT(new UnknownCompositePdfOperator("BT", "ET"));
+    boost::shared_ptr<UnknownCompositePdfOperator> q(new UnknownCompositePdfOperator("q", "Q"));
+    boost::shared_ptr<UnknownCompositePdfOperator> BT(new UnknownCompositePdfOperator("BT", "ET"));
     PdfOperator::Operands fontOperands;
-    fontOperands.push_back(shared_ptr<IProperty>(new CName (fontName)) );
-    fontOperands.push_back(shared_ptr<IProperty>(new CReal (fontSize)));
+    fontOperands.push_back(boost::shared_ptr<IProperty>(new CName (fontName)) );
+    fontOperands.push_back(boost::shared_ptr<IProperty>(new CReal (fontSize)));
     q->push_back(BT,q);
     BT->push_back(createOperator("Tf", fontOperands), getLastOperator(BT));
     
@@ -496,17 +523,16 @@ CPageContents::addText (const std::strin
 	PdfOperator::Operands posOperands = _likely_tm;
     BT->push_back(createOperator("Tm", posOperands), getLastOperator(BT));
 
-    PdfOperator::Operands textOperands;
-    textOperands.push_back(shared_ptr<IProperty>(new CString (what)));
-    BT->push_back(createOperator("Tj", textOperands), getLastOperator(BT));
+    boost::shared_ptr<CContentStream> cc = createContentStream(*_page, NULL);
+    BT->push_back(createOperatorText(cc, fontName, "TJ", what));
     PdfOperator::Operands emptyOperands;
     BT->push_back(createOperator("ET", emptyOperands), getLastOperator(BT));
     q->push_back(createOperator("Q", emptyOperands), getLastOperator(q));
     
-	std::vector<shared_ptr<PdfOperator> > contents;
+	std::vector<boost::shared_ptr<PdfOperator> > contents;
     contents.push_back(q);
     
-	addToBack (contents);
+	addToBack (cc, contents);
 }
 
 void 
@@ -531,7 +557,7 @@ CPageContents::addInlineImage (const CSt
 	// EI
 	// Q
 	//
-    shared_ptr<UnknownCompositePdfOperator> q(new UnknownCompositePdfOperator("q", "Q"));
+    boost::shared_ptr<UnknownCompositePdfOperator> q(new UnknownCompositePdfOperator("q", "Q"));
 
 	// translate
 	q->push_back(createOperatorTranslation(where.x, where.y), getLastOperator(q));
@@ -540,19 +566,23 @@ CPageContents::addInlineImage (const CSt
 
 
 	CDict image_dict;
-	image_dict.addProperty ("W", CInt (image_size.x));
-	image_dict.addProperty ("H", CInt (image_size.y));
-	image_dict.addProperty ("CS", CName ("RGB"));
-	image_dict.addProperty ("BPC", CInt (8));
+	CInt W (image_size.x);
+	image_dict.addProperty ("W", W);
+	CInt H (image_size.y);
+	image_dict.addProperty ("H", H);
+	CName RGB ("RGB");
+	image_dict.addProperty ("CS", RGB);
+	CInt _8 (8);
+	image_dict.addProperty ("BPC", _8);
 	CInlineImage img (image_dict, what);
-	shared_ptr<CInlineImage> inline_image (new CInlineImage (image_dict, what));
-	shared_ptr<InlineImageCompositePdfOperator> BI(new InlineImageCompositePdfOperator (inline_image));
+	boost::shared_ptr<CInlineImage> inline_image (new CInlineImage (image_dict, what));
+	boost::shared_ptr<InlineImageCompositePdfOperator> BI(new InlineImageCompositePdfOperator (inline_image));
     
 	q->push_back(BI,getLastOperator(q));
 	PdfOperator::Operands o;
     q->push_back(createOperator("Q", o), getLastOperator(q));
     
-	std::vector<shared_ptr<PdfOperator> > contents;
+	std::vector<boost::shared_ptr<PdfOperator> > contents;
     contents.push_back(q);
     
 	addToBack (contents);
@@ -595,7 +625,7 @@ namespace {
 	// addSomewhere
 	template<OPERWHERE WHERE>
 	void
-	cc_add (shared_ptr<CDict> _dict, CRef& ref)
+	cc_add (boost::shared_ptr<CDict> _dict, CRef& ref)
 	{
 		// contents not present
 		if (!_dict->containsProperty (Specification::Page::CONTENTS))
@@ -607,8 +637,8 @@ namespace {
 		// contents present
 		}else
 		{
-			shared_ptr<IProperty> content = _dict->getProperty (Specification::Page::CONTENTS);
-			shared_ptr<IProperty> realcontent = getReferencedObject(content);
+			boost::shared_ptr<IProperty> content = _dict->getProperty (Specification::Page::CONTENTS);
+			boost::shared_ptr<IProperty> realcontent = getReferencedObject(content);
 				assert (content);
 			// Contents can be either stream or an array of streams
 			if (isStream (realcontent))	
@@ -620,7 +650,7 @@ namespace {
 			}else if (isArray (realcontent))
 			{
 				// We can be sure that streams are indirect objects (pdf spec)
-				shared_ptr<CArray> array = IProperty::getSmartCObjectPtr<CArray> (realcontent);
+				boost::shared_ptr<CArray> array = IProperty::getSmartCObjectPtr<CArray> (realcontent);
 				OpTrait<WHERE>::Oper::add (*array, ref);
 			
 			}else // Neither stream nor array
@@ -672,7 +702,7 @@ CPageContents::toBack (CRef& ref)
  * Indicats that the page changed.
  */
 template<typename Cont>
-void CPageContents::setContents (shared_ptr<CDict> dict, const Cont& cont)
+void CPageContents::setContents (boost::shared_ptr<CDict> dict, const Cont& cont)
 {
 
 	if (dict->containsProperty (Specification::Page::CONTENTS))
@@ -682,7 +712,7 @@ void CPageContents::setContents (shared_
 	// Loop throug all content streams and add all cstreams from each
 	// content streams to Contents entry of page dictionary
 	//
-	typedef vector<shared_ptr<CStream> > Css;
+	typedef vector<boost::shared_ptr<CStream> > Css;
 	Css css;
 	getAllCStreams (cont, css);
 	
@@ -698,14 +728,14 @@ void CPageContents::setContents (shared_
 	}
 }
 // Explicit instantiation
-template void CPageContents::setContents<vector<shared_ptr<CContentStream> > >
-	(shared_ptr<CDict> dict, const vector<shared_ptr<CContentStream> >& cont);
+template void CPageContents::setContents<vector<boost::shared_ptr<CContentStream> > >
+	(boost::shared_ptr<CDict> dict, const vector<boost::shared_ptr<CContentStream> >& cont);
 
 //
 //
 //
 void 
-CPageContents::remove (shared_ptr<const CContentStream> cs)
+CPageContents::remove (boost::shared_ptr<const CContentStream> cs)
 {
 		if (!_dict->containsProperty (Specification::Page::CONTENTS))
 			throw CObjInvalidOperation ();
@@ -717,7 +747,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
 		//
-		typedef vector<shared_ptr<CStream> > Css;
+		typedef vector<boost::shared_ptr<CStream> > Css;
 		Css css;
 		cs->getCStreams (css);
 		
@@ -743,8 +773,8 @@ CPageContents::remove (shared_ptr<const
 void 
 CPageContents::remove (const IndiRef& rf)
 {
-	shared_ptr<IProperty> content = _dict->getProperty (Specification::Page::CONTENTS);
-	shared_ptr<IProperty> realcontent = getReferencedObject (content);
+	boost::shared_ptr<IProperty> content = _dict->getProperty (Specification::Page::CONTENTS);
+	boost::shared_ptr<IProperty> realcontent = getReferencedObject (content);
 		assert (content);
 	// Contents can be either stream or an array of streams
 	if (isStream (realcontent))	
@@ -756,7 +786,7 @@ CPageContents::remove (const IndiRef& rf
 	}else if (isArray (realcontent))
 	{
 		// We can be sure that streams are indirect objects (pdf spec)
-		shared_ptr<CArray> array = IProperty::getSmartCObjectPtr<CArray> (realcontent);
+		boost::shared_ptr<CArray> array = IProperty::getSmartCObjectPtr<CArray> (realcontent);
 		for (size_t i = 0; i < array->getPropertyCount(); ++i)
 		{
 			IndiRef _rf = getRefFromArray (array,i);
@@ -821,7 +851,7 @@ CPageContents::parse ()
 	//
 		if (!_dict->containsProperty (Specification::Page::CONTENTS))
 			return true;
-	shared_ptr<IProperty> contents = getReferencedObject (_dict->getProperty (Specification::Page::CONTENTS));
+	boost::shared_ptr<IProperty> contents = getReferencedObject (_dict->getProperty (Specification::Page::CONTENTS));
 		assert (contents);
 	
 	CContentStream::CStreams streams;
@@ -831,13 +861,13 @@ CPageContents::parse ()
 	//
 	if (isStream (contents))	
 	{
-		shared_ptr<CStream> stream = IProperty::getSmartCObjectPtr<CStream> (contents); 
+		boost::shared_ptr<CStream> stream = IProperty::getSmartCObjectPtr<CStream> (contents); 
 		streams.push_back (stream);
 	
 	}else if (isArray (contents))
 	{
 		// We can be sure that streams are indirect objects (pdf spec)
-		shared_ptr<CArray> array = IProperty::getSmartCObjectPtr<CArray> (contents); 
+		boost::shared_ptr<CArray> array = IProperty::getSmartCObjectPtr<CArray> (contents); 
 		for (size_t i = 0; i < array->getPropertyCount(); ++i)
 			streams.push_back (getCStreamFromArray(array,i));
 		
@@ -854,9 +884,7 @@ CPageContents::parse ()
 	// True if Contents is not [ ]
 	while (!streams.empty())
 	{
-		shared_ptr<CContentStream> cc (new CContentStream(streams,state,res));
-		// Save smart pointer of the content stream so pdfoperators can return it
-		cc->setSmartPointer (cc);
+		boost::shared_ptr<CContentStream> cc = createContentStream(*_page, &streams);
 		_ccs.push_back (cc);
 	}
 
@@ -911,7 +939,7 @@ CPageContents::reg_observer (boost::shar
 		// If it contains Contents register observer on it too
 		if (_dict->containsProperty(Specification::Page::CONTENTS))
 		{
-			shared_ptr<IProperty> prop = _dict->getProperty(Specification::Page::CONTENTS);
+			boost::shared_ptr<IProperty> prop = _dict->getProperty(Specification::Page::CONTENTS);
 			REGISTER_SHAREDPTR_OBSERVER(prop, _wd);
 		}
 	}
@@ -933,7 +961,7 @@ CPageContents::unreg_observer (boost::sh
 		// Unregister contents observer
 		if (_dict->containsProperty(Specification::Page::CONTENTS))
 		{
-			shared_ptr<IProperty> prop = _dict->getProperty(Specification::Page::CONTENTS);
+			boost::shared_ptr<IProperty> prop = _dict->getProperty(Specification::Page::CONTENTS);
 			UNREGISTER_SHAREDPTR_OBSERVER(prop, _wd);
 		}
 	}
@@ -963,7 +991,7 @@ CPageContents::_page_pos () const
 //
 //
 void 
-CPageContents::moveAbove (shared_ptr<const CContentStream> ct)
+CPageContents::moveAbove (boost::shared_ptr<const CContentStream> ct)
 {
 	// Get the next item
 	init();
@@ -975,7 +1003,7 @@ CPageContents::moveAbove (shared_ptr<con
 			throw OutOfRange ();
 
 	// Delete next item but store it
-	shared_ptr<CContentStream> tmp = *itNext;
+	boost::shared_ptr<CContentStream> tmp = *itNext;
 	_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 +1021,7 @@ CPageContents::moveAbove (shared_ptr<con
 //
 //
 void 
-CPageContents::moveBelow (shared_ptr<const CContentStream> ct)
+CPageContents::moveBelow (boost::shared_ptr<const CContentStream> ct)
 {
 	// Get the item index
 	unsigned int pos = 0;
@@ -1007,7 +1035,7 @@ CPageContents::moveBelow (shared_ptr<con
 			throw CObjInvalidOperation ();
 	
 	// Swap
-	shared_ptr<CContentStream> tmp = _ccs[pos];
+	boost::shared_ptr<CContentStream> tmp = _ccs[pos];
 	_ccs[pos] = _ccs[pos - 1];
 	_ccs[pos - 1] = tmp;
 
Index: pdfedit-0.4.5/src/kernel/cpagecontents.h
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/cpagecontents.h
+++ pdfedit-0.4.5/src/kernel/cpagecontents.h
@@ -165,6 +165,16 @@ public:
 	template<typename Container>
 	void addToFront (const Container& cont);
 
+	/** Add new content stream to the front.
+	 * This function should be used when we have already preinitialized content stream
+	 * and we want to fill it with the supplied operators.
+	 *
+	 * @param cc Content stream to fill and add.
+	 * @param cont Container of operators to add.
+	 */
+	template<typename Container>
+	void addToFront (boost::shared_ptr<CContentStream> &cc, const Container& cont);
+
 	/**
 	 * Add new content stream to the back. This function adds new entry in the "Contents"
 	 * property of a page. The container of provided operators must form a valid
@@ -181,6 +191,16 @@ public:
 	template<typename Container> 
 	void addToBack (const Container& cont);
 
+	/** Add new content stream to the back.
+	 * This function should be used when we have already preinitialized content stream
+	 * and we want to fill it with the supplied operators.
+	 *
+	 * @param cc Content stream to fill and add.
+	 * @param cont Container of operators to add.
+	 */
+	template<typename Container> 
+	void addToBack (boost::shared_ptr<CContentStream> &cc, const Container& cont);
+
 	/**
 	 * Remove content stream. 
 	 * This function removes all objects from "Contents" entry which form specified contentstream.
@@ -445,6 +465,14 @@ private:
 			{ _cnt->reg_observer();}
 	};
 
+private:
+	/** Helper for content stream creation.
+	 * @param page Page where the created content stream will be placed.
+	 * @param streams Streams (an empty content stream will be created if NULL).
+	 */
+	static boost::shared_ptr<CContentStream> createContentStream(const CPage &page, 
+			CContentStream::CStreams *streams);
+
 }; // class CPageContents
 
 //==========================================================
Index: pdfedit-0.4.5/src/kernel/cpagedisplay.cc
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/cpagedisplay.cc
+++ pdfedit-0.4.5/src/kernel/cpagedisplay.cc
@@ -83,11 +83,11 @@ CPageDisplay::displayPage (::OutputDev&
 //
 void
 CPageDisplay::displayPage (::OutputDev& out, 
-						   shared_ptr<CDict> pagedict, 
+						   boost::shared_ptr<CDict> pagedict, 
 						   int x, int y, int w, int h)
 {
 	// Get xref
-	shared_ptr<CPdf> pdf = pagedict->getPdf().lock();
+	boost::shared_ptr<CPdf> pdf = pagedict->getPdf().lock();
 	XRef* xref = (pdf)?pdf->getCXref ():NULL;
 	assert (NULL != xref);
 	if (!(pagedict))
@@ -96,7 +96,7 @@ CPageDisplay::displayPage (::OutputDev&
 	//
 	// Create xpdf object representing CPage
 	//
-	shared_ptr<Object> xpdfPage (pagedict->_makeXpdfObject(), xpdf::object_deleter());
+	boost::shared_ptr<Object> xpdfPage (pagedict->_makeXpdfObject(), xpdf::object_deleter());
 		// Check page dictionary
 		assert (objDict == xpdfPage->getType());
 		if (objDict != xpdfPage->getType ())
@@ -121,7 +121,7 @@ CPageDisplay::displayPage (::OutputDev&
 	Page page (xref, 0, xpdfPageDict, new PageAttrs (NULL, xpdfPageDict));
 	
 	// Create catalog
-	scoped_ptr<Catalog> xpdfCatalog (new Catalog (xref));
+	boost::scoped_ptr<Catalog> xpdfCatalog (new Catalog (xref));
 	
 	//
 	// Page object display (..., useMediaBox, crop, links, catalog)
@@ -140,7 +140,7 @@ CPageDisplay::displayPage (::OutputDev&
 //
 //
 void 
-CPageDisplay::createXpdfDisplayParams (shared_ptr<GfxResources>& res, shared_ptr<GfxState>& state)
+CPageDisplay::createXpdfDisplayParams (boost::shared_ptr<GfxResources>& res, boost::shared_ptr<GfxState>& state)
 {
 	//
 	// Init Gfx resources
@@ -151,13 +151,13 @@ CPageDisplay::createXpdfDisplayParams (s
 	CPageAttributes::fillInherited (_page->getDictionary(),atr);
 	
 	// Start the resource stack
-	shared_ptr<CPdf> pdf = _page->getDictionary()->getPdf().lock();
+	boost::shared_ptr<CPdf> pdf = _page->getDictionary()->getPdf().lock();
 	XRef* xref = (pdf)?pdf->getCXref():NULL;
 	assert (xref);
 	Object* obj = atr._resources->_makeXpdfObject ();
 	assert (obj); 
 	assert (objDict == obj->getType());
-	res = shared_ptr<GfxResources> (new GfxResources(xref, obj->getDict(), NULL));
+	res = boost::shared_ptr<GfxResources> (new GfxResources(xref, obj->getDict(), NULL));
 	xpdf::freeXpdfObject (obj);
 	
 	//
@@ -165,9 +165,9 @@ CPageDisplay::createXpdfDisplayParams (s
 	//
 	
 	// Create Media (Bounding) box
-	shared_ptr<PDFRectangle> rc (new PDFRectangle (_params.pageRect.xleft,  _params.pageRect.yleft,
+	boost::shared_ptr<PDFRectangle> rc (new PDFRectangle (_params.pageRect.xleft,  _params.pageRect.yleft,
 												  _params.pageRect.xright, _params.pageRect.yright));
-	state = shared_ptr<GfxState> (new GfxState (_params.hDpi, _params.vDpi, 
+	state = boost::shared_ptr<GfxState> (new GfxState (_params.hDpi, _params.vDpi, 
 												rc.get(), _params.rotate, _params.upsideDown));
 }
 
@@ -267,13 +267,13 @@ CPageDisplay::setTransformMatrix (double
 	// Create new cm operator
 	//
 	PdfOperator::Operands operands;
-	operands.push_back (shared_ptr<IProperty> (new CReal (tm[0])));
-	operands.push_back (shared_ptr<IProperty> (new CReal (tm[1])));
-	operands.push_back (shared_ptr<IProperty> (new CReal (tm[2])));
-	operands.push_back (shared_ptr<IProperty> (new CReal (tm[3])));
-	operands.push_back (shared_ptr<IProperty> (new CReal (tm[4])));
-	operands.push_back (shared_ptr<IProperty> (new CReal (tm[5])));
-	shared_ptr<PdfOperator> cmop = createOperator("cm", operands);
+	operands.push_back (boost::shared_ptr<IProperty> (new CReal (tm[0])));
+	operands.push_back (boost::shared_ptr<IProperty> (new CReal (tm[1])));
+	operands.push_back (boost::shared_ptr<IProperty> (new CReal (tm[2])));
+	operands.push_back (boost::shared_ptr<IProperty> (new CReal (tm[3])));
+	operands.push_back (boost::shared_ptr<IProperty> (new CReal (tm[4])));
+	operands.push_back (boost::shared_ptr<IProperty> (new CReal (tm[5])));
+	boost::shared_ptr<PdfOperator> cmop = createOperator("cm", operands);
 
 	// Insert at the beginning
 	_page->contents()->getContentStream((size_t)0)->frontInsertOperator (cmop);
Index: pdfedit-0.4.5/src/kernel/cpagefonts.cc
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/cpagefonts.cc
+++ pdfedit-0.4.5/src/kernel/cpagefonts.cc
@@ -46,9 +46,6 @@ using namespace utils;
 // Static initialization
 const char* CPageFonts::PDFEDIT_FONTID = "PDFEDIT_F";
 
-// =====================================================================================
-namespace {
-// =====================================================================================
 
 	/** 
 	 * Looks for a font with the given name.
@@ -65,10 +62,6 @@ namespace {
 		return containter.end();
 	}
 
-// =====================================================================================
-} // namespace 
-// =====================================================================================
-
 
 //
 //
@@ -82,8 +75,8 @@ CPageFonts::addSystemType1Font (const st
 	//    /Subtype /Type1
 	//    /BaseFont / ...
 	// >>
-	shared_ptr<CDict> font (new CDict ());
-	shared_ptr<CName> name (new CName (Specification::Font::TYPE));
+	boost::shared_ptr<CDict> font (new CDict ());
+	boost::shared_ptr<CName> name (new CName (Specification::Font::TYPE));
 	font->addProperty (Specification::Dict::TYPE, *name);
 	name->setValue (Specification::Font::TYPE1);
 	font->addProperty (Specification::Font::SUBTYPE, *name);
@@ -106,16 +99,16 @@ CPageFonts::addSystemType1Font (const st
 	}
 	
 	// Get Resources
-	shared_ptr<CDict> res = getCDictFromDict (_page->getDictionary(), Specification::Page::RESOURCES);
+	boost::shared_ptr<CDict> res = _page->getDictionary()->getProperty<CDict>(Specification::Page::RESOURCES);
 	
 	if (!res->containsProperty (Specification::Font::TYPE))
 	{	
-		shared_ptr<CDict> fontdict (new CDict ());
+		boost::shared_ptr<CDict> fontdict (new CDict ());
 		res->addProperty (Specification::Font::TYPE, *fontdict);
 	}
 	
 	// Get "Fonts"
-	shared_ptr<CDict> fonts = getCDictFromDict (res, Specification::Font::TYPE);
+	boost::shared_ptr<CDict> fonts = res->getProperty<CDict>(Specification::Font::TYPE);
 
 	// Get all avaliable fonts
 	CPageFonts::FontList fs;
@@ -136,8 +129,8 @@ CPageFonts::addSystemType1Font (const st
 	//
 	// Create state and resources and update our contentstreams
 	//
-	shared_ptr<GfxResources> gfxres;
-	shared_ptr<GfxState> gfxstate;
+	boost::shared_ptr<GfxResources> gfxres;
+	boost::shared_ptr<GfxState> gfxstate;
 	_page->display()->createXpdfDisplayParams (gfxres, gfxstate);
 
 	typedef std::vector<boost::shared_ptr<CContentStream> > CCs;
@@ -158,11 +151,11 @@ CPageFonts::getFontIdsAndNames (FontList
 	
 	CPageAttributes::InheritedAttributes atr;
 	CPageAttributes::fillInherited (_page->getDictionary(), atr);
-	shared_ptr<CDict> res = atr._resources;
+	boost::shared_ptr<CDict> res = atr._resources;
 	
 	try 
 	{
-		shared_ptr<CDict> fonts = utils::getCDictFromDict (res, Specification::Font::TYPE);
+		boost::shared_ptr<CDict> fonts = res->getProperty<CDict>(Specification::Font::TYPE);
 		typedef std::vector<std::string> FontNames;
 		FontNames fontnames;
 		// Get all font names (e.g. R14, R15, F19...)
@@ -170,7 +163,7 @@ CPageFonts::getFontIdsAndNames (FontList
 		// Get all base names (Symbol, csr12, ...)
 		for (FontNames::iterator it = fontnames.begin(); it != fontnames.end(); ++it)
 		{
-			shared_ptr<CDict> font = utils::getCDictFromDict (fonts, *it);
+			boost::shared_ptr<CDict> font = fonts->getProperty<CDict>(*it);
 			try {
 				std::string fontbasename;
 				
Index: pdfedit-0.4.5/src/kernel/cpdf.cc
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/cpdf.cc
+++ pdfedit-0.4.5/src/kernel/cpdf.cc
@@ -81,18 +81,13 @@ ostream & operator<<(ostream & stream, P
 	return stream;
 }
 
-shared_ptr<CDict> getPageTreeRoot(const boost::shared_ptr<CPdf> &pdf)
+boost::shared_ptr<CDict> getPageTreeRoot(const boost::shared_ptr<CPdf> &pdf)
 {
-	shared_ptr<CDict> result;
+	boost::shared_ptr<CDict> result;
 	
 	try
 	{
-		shared_ptr<IProperty> pagesProp=pdf->getDictionary()->getProperty("Pages");
-		if(!isRef(pagesProp))
-			// returns null dictionary
-			return result;
-
-		return getCObjectFromRef<CDict>(pagesProp);
+		return pdf->getDictionary()->getProperty<CDict>("Pages");
 	}catch(CObjectException & )
 	{
 	}
@@ -106,7 +101,7 @@ PageTreeNodeType getNodeType(const boost
 	PageTreeNodeType nodeType=UnknownNode;
 
 	// checks nodeProp - must be dictionary or reference to dictionary
-	shared_ptr<CDict> nodeDict;
+	boost::shared_ptr<CDict> nodeDict;
 	if(isDict(nodeProp))
 		nodeDict=IProperty::getSmartCObjectPtr<CDict>(nodeProp);
 	else
@@ -126,9 +121,9 @@ PageTreeNodeType getNodeType(const boost
 			return ErrorNode;
 	
 	// checks root node at first
-	shared_ptr<CPdf> pdf=nodeProp->getPdf().lock();
+	boost::shared_ptr<CPdf> pdf=nodeProp->getPdf().lock();
 	assert(pdf);
-	shared_ptr<CDict> rootDict=getPageTreeRoot(pdf);
+	boost::shared_ptr<CDict> rootDict=getPageTreeRoot(pdf);
 	if(rootDict==nodeDict)
 		// root dictionary found and it is same as internode
 		return RootNode;
@@ -136,11 +131,9 @@ PageTreeNodeType getNodeType(const boost
 	// given node is not root of page tree, chcecks Type field
 	if(nodeDict->containsProperty("Type"))
 	{
-		shared_ptr<IProperty> nodeType=nodeDict->getProperty("Type");
 		try
 		{
-			if(isRef(nodeType))
-				nodeType=getCObjectFromRef<CName>(nodeType);
+			boost::shared_ptr<CName> nodeType=nodeDict->getProperty<CName>("Type");
 			CName::Value typeName=getValueFromSimple<CName>(nodeType);
 			if(typeName=="Page")
 				return LeafNode;
@@ -159,22 +152,14 @@ PageTreeNodeType getNodeType(const boost
 	// Internode should contain at least Kids array field
 	if(nodeDict->containsProperty("Kids"))
 	{
-		shared_ptr<IProperty> kidsProp=nodeDict->getProperty("Kids");
-		if(isArray(kidsProp))
+		try
+		{
+			boost::shared_ptr<CArray> kidsProp=nodeDict->getProperty<CArray>("Kids");
 			return InterNode;
-		if(isRef(kidsProp))
+		}catch(...)
 		{
-			// Kids property is reference, so checks whether it refer to array,
-			// if yes, returns InterNode
-			try
-			{
-				getCObjectFromRef<CArray>(kidsProp);
-				return InterNode;
-			}catch(...)
-			{
-				// target is not an array, so it's not intermediate node or it
-				// is demaged node
-			}
+			// target is not an array, so it's not intermediate node or it
+			// is demaged node
 		}
 	}
 
@@ -189,28 +174,16 @@ void getKidsFromInterNode(const boost::s
 	// tries to get Kids array
 	if(interNodeDict->containsProperty("Kids"))
 	{
-		shared_ptr<IProperty> kidsProp=interNodeDict->getProperty("Kids");
-		shared_ptr<CArray> kidsArray;
-		if(isRef(kidsProp))
+		try 
 		{
-			try
-			{
-				kidsArray=getCObjectFromRef<CArray>(kidsProp);
-			}catch(CObjectException &)
-			{
-				// target is not an array
-				return;
-			}
-		}else
+			boost::shared_ptr<CArray> kidsArray = interNodeDict->getProperty<CArray>("Kids");
+			// fills given container with all children
+			kidsArray->_getAllChildObjects(container);
+		}catch(CObjectException &)
 		{
-			if(!isArray(kidsProp))
-				// not an array
-				return;
-			kidsArray=IProperty::getSmartCObjectPtr<CArray>(kidsProp);
+			// target is not an array
+			return;
 		}
-		
-		// fills given container with all children
-		kidsArray->_getAllChildObjects(container);
 	}
 
 }
@@ -341,17 +314,17 @@ using namespace debug;
 	if(!withSubTree)
 		return;
 
-	shared_ptr<IProperty> nodeProp=pdf->getIndirectProperty(ref);	
+	boost::shared_ptr<IProperty> nodeProp=pdf->getIndirectProperty(ref);	
 	if(getNodeType(nodeProp)>=InterNode)
 	{
 		ChildrenStorage childs;
 		assert(isDict(nodeProp));
-		shared_ptr<CDict> nodeDict=IProperty::getSmartCObjectPtr<CDict>(nodeProp);
+		boost::shared_ptr<CDict> nodeDict=IProperty::getSmartCObjectPtr<CDict>(nodeProp);
 		getKidsFromInterNode(nodeDict, childs);
 		utilsPrintDbg(DBG_DBG, "discarding all nodes in "<<ref<<" subtree");
 		for(ChildrenStorage::iterator i=childs.begin(); i!=childs.end(); ++i)
 		{
-			shared_ptr<IProperty> child=*i;
+			boost::shared_ptr<IProperty> child=*i;
 			if(!isRef(child))
 				// skip array mess
 				continue;
@@ -373,7 +346,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
-	shared_ptr<CDict> interNodeDict;
+	boost::shared_ptr<CDict> interNodeDict;
 	if(isRef(interNodeProp))
 	{
 		try
@@ -409,7 +382,7 @@ size_t getKidsCount(const boost::shared_
 	getKidsFromInterNode(interNodeDict, children);
 	for(ChildrenStorage::const_iterator i=children.begin(); i!=children.end(); ++i)
 	{
-		shared_ptr<IProperty> childProp=*i;
+		boost::shared_ptr<IProperty> childProp=*i;
 		if(isRef(childProp))
 			count+=getKidsCount(childProp, cache);
 	}
@@ -441,7 +414,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
-	shared_ptr<CDict> dict_ptr;
+	boost::shared_ptr<CDict> dict_ptr;
 
 	// checks if given parameter is reference and if so, dereference it
 	// using getIndirectProperty method and casts to dict_ptr
@@ -523,7 +496,7 @@ boost::shared_ptr<CDict> findPageDict(
 		size_t min_pos=startPos, index=0;
 		for(ChildrenStorage::iterator i=children.begin(); i!=children.end(); ++i, ++index)
 		{
-			shared_ptr<IProperty> child=*i;
+			boost::shared_ptr<IProperty> child=*i;
 
 			if(!isRef(child))
 			{
@@ -542,7 +515,7 @@ boost::shared_ptr<CDict> findPageDict(
 
 			// gets child dictionary (everything is checked, so no exception can
 			// be thrown here)
-			shared_ptr<CDict> child_ptr=getCObjectFromRef<CDict>(child); 
+			boost::shared_ptr<CDict> child_ptr=getCObjectFromRef<CDict>(child); 
 			
 			utilsPrintDbg(DBG_DBG, "kid["<<index<<"] node type="<<nodeType);
 
@@ -632,9 +605,9 @@ boost::shared_ptr<CDict> findPageDict(
  * superNode.
  */
 size_t searchTreeNode(
-		shared_ptr<const CPdf> pdf, 
-		shared_ptr<CDict> superNode, 
-		shared_ptr<CDict> node, 
+		boost::shared_ptr<const CPdf> pdf, 
+		boost::shared_ptr<CDict> superNode, 
+		boost::shared_ptr<CDict> node, 
 		size_t startValue, 
 		PageTreeNodeCountCache * cache)
 {
@@ -673,7 +646,7 @@ size_t searchTreeNode(
 	getKidsFromInterNode(superNode, children);
 	for(i=children.begin(); i!=children.end(); ++i, ++index)
 	{
-		shared_ptr<IProperty> child=*i;
+		boost::shared_ptr<IProperty> child=*i;
 		
 		// each element has to be reference
 		if(!isRef(child))
@@ -693,7 +666,7 @@ size_t searchTreeNode(
 
 		// dereference target dictionary - never throws, because we have checked
 		// node type
-		shared_ptr<CDict> elementDict_ptr=getCObjectFromRef<CDict>(child);
+		boost::shared_ptr<CDict> elementDict_ptr=getCObjectFromRef<CDict>(child);
 	
 		// compares elementDict_ptr (kid) with node, if they are same, returns
 		// startValue
@@ -723,7 +696,7 @@ size_t searchTreeNode(
 		IndiRef nodeRef=node->getIndiRef();
 		for(;i!=children.end(); ++i, ++index)
 		{
-			shared_ptr<IProperty> child=*i;
+			boost::shared_ptr<IProperty> child=*i;
 			if(isRef(child) && getValueFromSimple<CRef>(child)==nodeRef)
 			{
 				utilsPrintDbg(DBG_WARN, "Internode "<<superNode->getIndiRef()<<" is ambiguous. Kids["<<index<<"] duplicates reference to node.");
@@ -735,7 +708,7 @@ size_t searchTreeNode(
 	return position;
 }
 
-size_t getNodePosition(const shared_ptr<CPdf> &pdf, const shared_ptr<IProperty> &node, PageTreeNodeCountCache * cache)
+size_t getNodePosition(const boost::shared_ptr<CPdf> &pdf, const boost::shared_ptr<IProperty> &node, PageTreeNodeCountCache * cache)
 {
 	utilsPrintDbg(DBG_DBG, "");
 	// node must be from given pdf
@@ -746,7 +719,7 @@ size_t getNodePosition(const shared_ptr<
 	}
 	
 	// gets page tree root - if not found, then PageNotFoundException is thrown
-	shared_ptr<CDict> rootDict_ptr=getPageTreeRoot(pdf);
+	boost::shared_ptr<CDict> rootDict_ptr=getPageTreeRoot(pdf);
 	if(!rootDict_ptr.get())
 		throw PageNotFoundException(0);
 	
@@ -760,7 +733,7 @@ size_t getNodePosition(const shared_ptr<
 		utilsPrintDbg(DBG_ERR, "Given node is not reference nor dictionary. type="<<nodeType);
 		throw ElementBadTypeException("node");
 	}
-	shared_ptr<CDict> nodeDict_ptr;
+	boost::shared_ptr<CDict> nodeDict_ptr;
 	if(isRef(node))
 		nodeDict_ptr=getCObjectFromRef<CDict>(node);
 	else
@@ -776,7 +749,7 @@ size_t getNodePosition(const shared_ptr<
 	throw PageNotFoundException(0);
 }
 
-bool isNodeDescendant(const boost::shared_ptr<CPdf>& pdf, const IndiRef &parent, const shared_ptr<CDict> &child)
+bool isNodeDescendant(const boost::shared_ptr<CPdf>& pdf, const IndiRef &parent, const boost::shared_ptr<CDict> &child)
 {
 using namespace utils;
 
@@ -787,7 +760,7 @@ using namespace utils;
 	}
 	
 	// gets parent property
-	shared_ptr<IProperty> parentProp=child->getProperty("Parent");
+	boost::shared_ptr<IProperty> parentProp=child->getProperty("Parent");
 	if(!isRef(parentProp))
 	{
 		// parent is incorect
@@ -804,7 +777,7 @@ using namespace utils;
 	// referencies are not same, so gets parent dictionary and checks its parent
 	try
 	{
-		shared_ptr<CDict> parentDict=getCObjectFromRef<CDict>(parentProp);
+		boost::shared_ptr<CDict> parentDict=getCObjectFromRef<CDict>(parentProp);
 		return isNodeDescendant(pdf, parent, parentDict);
 	}catch(CObjectException & )
 	{
@@ -830,7 +803,7 @@ using namespace pdfobjects::utils;
 		return;
 
 	// gets dictionary from given property
-	shared_ptr<CDict> dict_ptr;
+	boost::shared_ptr<CDict> dict_ptr;
 	if(isRef(prop))
 	{
 		try
@@ -854,8 +827,8 @@ using namespace pdfobjects::utils;
 	if(!dict_ptr->containsProperty("Kids"))
 		return;
 
-	shared_ptr<IProperty> kidsProp_ptr=dict_ptr->getProperty("Kids");
-	shared_ptr<CArray> kids_ptr;
+	boost::shared_ptr<IProperty> kidsProp_ptr=dict_ptr->getProperty("Kids");
+	boost::shared_ptr<CArray> kids_ptr;
 	if(isRef(kidsProp_ptr))
 	{
 		// Kids property is reference - this is not offten but may occure and
@@ -901,7 +874,7 @@ using namespace pdfobjects::utils;
 	kids_ptr->_getAllChildObjects(container);
 	for(ChildrenStorage::iterator i=container.begin(); i!=container.end(); ++i)
 	{
-		shared_ptr<IProperty> elemProp_ptr=*i;
+		boost::shared_ptr<IProperty> elemProp_ptr=*i;
 		if(isRef(elemProp_ptr))
 		{
 			REGISTER_SHAREDPTR_OBSERVER(elemProp_ptr, pageTreeKidsObserver);
@@ -922,7 +895,7 @@ using namespace pdfobjects::utils;
 		return;
 
 	// gets dictionary from given property
-	shared_ptr<CDict> dict_ptr;
+	boost::shared_ptr<CDict> dict_ptr;
 	if(isRef(prop))
 	{
 		try
@@ -974,8 +947,8 @@ using namespace pdfobjects::utils;
 	if(!dict_ptr->containsProperty("Kids"))
 		return;
 
-	shared_ptr<IProperty> kidsProp_ptr=dict_ptr->getProperty("Kids");
-	shared_ptr<CArray> kids_ptr;
+	boost::shared_ptr<IProperty> kidsProp_ptr=dict_ptr->getProperty("Kids");
+	boost::shared_ptr<CArray> kids_ptr;
 	if(isRef(kidsProp_ptr))
 	{
 		// Kids property is reference - this is not offten but may occure and
@@ -1021,7 +994,7 @@ using namespace pdfobjects::utils;
 	kids_ptr->_getAllChildObjects(container);
 	for(ChildrenStorage::iterator i=container.begin(); i!=container.end(); ++i)
 	{
-		shared_ptr<IProperty> elemProp_ptr=*i;
+		boost::shared_ptr<IProperty> elemProp_ptr=*i;
 		if(isRef(elemProp_ptr))
 		{
 			UNREGISTER_SHAREDPTR_OBSERVER(elemProp_ptr, pageTreeKidsObserver);
@@ -1042,7 +1015,7 @@ using namespace observer;
 using namespace utils;
 
 	assert(isActive());
-	shared_ptr<IProperty> oldValue;
+	boost::shared_ptr<IProperty> oldValue;
 	if(!context)
 	{
 		kernelPrintDbg(DBG_WARN, "No context available. Ignoring calling.");
@@ -1055,7 +1028,7 @@ using namespace utils;
 		case BasicChangeContextType:
 			{
 				// Pages reference value has changed
-				shared_ptr<const BasicChangeContext<IProperty> > basicContext=
+				boost::shared_ptr<const BasicChangeContext<IProperty> > basicContext=
 					dynamic_pointer_cast<const BasicChangeContext<IProperty>, const IChangeContext<IProperty> >(context); 
 				oldValue=basicContext->getOriginalValue();
 
@@ -1068,7 +1041,7 @@ using namespace utils;
 			{
 				// document catalog dictionary has changed. Checks valueId and
 				// proceede just if Pages property has changed
-				shared_ptr<const CDict::CDictComplexObserverContext > complexContex=
+				boost::shared_ptr<const CDict::CDictComplexObserverContext > complexContex=
 					dynamic_pointer_cast<const CDict::CDictComplexObserverContext, const IChangeContext<IProperty> >(context); 
 				if(!complexContex)
 				{
@@ -1115,7 +1088,7 @@ using namespace utils;
 	{
 		try
 		{
-			shared_ptr<IProperty> oldValueDict=getCObjectFromRef<CDict>(oldValue);
+			boost::shared_ptr<IProperty> oldValueDict=getCObjectFromRef<CDict>(oldValue);
 			kernelPrintDbg(DBG_DBG, "unregistering observers from old page tree.");
 			pdf->unregisterPageTreeObservers(oldValueDict);
 		}catch(CObjectException & e)
@@ -1136,7 +1109,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)
 	{
-		shared_ptr<CPage> page=i->second;
+		boost::shared_ptr<CPage> page=i->second;
 		page->invalidate();
 	}
 	pdf->pageList.clear();
@@ -1154,7 +1127,7 @@ using namespace utils;
 		return;
 	}
 	IndiRef newValueRef=utils::getValueFromSimple<CRef>(newValue);
-	shared_ptr<IProperty> newValueProp=pdf->getIndirectProperty(newValueRef);
+	boost::shared_ptr<IProperty> newValueProp=pdf->getIndirectProperty(newValueRef);
 	if(!isDict(newValueProp))
 	{
 		kernelPrintDbg(DBG_WARN, "Pages property doesn't refer to dictionary. type="<<newValueProp->getType());
@@ -1183,7 +1156,7 @@ using namespace observer;
 		kernelPrintDbg(DBG_WARN, "No context available. Ignoring calling.");
 		return;
 	}
-	shared_ptr<IProperty> oldValue;
+	boost::shared_ptr<IProperty> oldValue;
 	ChildrenStorage oldValues, newValues;
 	kernelPrintDbg(DBG_DBG, "context type="<<context->getType());
 	switch(context->getType())
@@ -1193,7 +1166,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
-				shared_ptr<const BasicChangeContext<IProperty> > basicContext=
+				boost::shared_ptr<const BasicChangeContext<IProperty> > basicContext=
 					dynamic_pointer_cast<const BasicChangeContext<IProperty>, const IChangeContext<IProperty> >(context); 
 				oldValue=basicContext->getOriginalValue();
 				assert(isRef(oldValue));
@@ -1204,7 +1177,7 @@ using namespace observer;
 			{
 				// this means that inter node dictionary has changed
 				// if changed property is not Kids, immediatelly returns
-				shared_ptr<const CDict::CDictComplexObserverContext > complexContex=
+				boost::shared_ptr<const CDict::CDictComplexObserverContext > complexContex=
 					dynamic_pointer_cast<const CDict::CDictComplexObserverContext, const IChangeContext<IProperty> >(context); 
 				if(!complexContex)
 				{
@@ -1245,7 +1218,7 @@ using namespace observer;
 	try
 	{
 		// collects all children from array
-		shared_ptr<CArray> kidsArray;
+		boost::shared_ptr<CArray> kidsArray;
 		if(isRef(oldValue))
 			kidsArray=utils::getCObjectFromRef<CArray>(oldValue);
 		else
@@ -1273,7 +1246,7 @@ using namespace observer;
 	try
 	{
 		// collects all children from array
-		shared_ptr<CArray> kidsArray;
+		boost::shared_ptr<CArray> kidsArray;
 		if(isRef(newValue))
 			kidsArray=utils::getCObjectFromRef<CArray>(newValue);
 		else
@@ -1299,10 +1272,10 @@ using namespace observer;
 	IndiRef interNodeRef=(!isNull(oldValue))?oldValue->getIndiRef():newValue->getIndiRef();
 	try
 	{
-		shared_ptr<IProperty> interNodeProp=pdf->getIndirectProperty(interNodeRef);
+		boost::shared_ptr<IProperty> interNodeProp=pdf->getIndirectProperty(interNodeRef);
 		if(isDict(interNodeProp))
 		{
-			shared_ptr<CDict> interNode=IProperty::getSmartCObjectPtr<CDict>(interNodeProp);
+			boost::shared_ptr<CDict> interNode=IProperty::getSmartCObjectPtr<CDict>(interNodeProp);
 			// if consolidatePageTree hasn't kept page count numbers, total number
 			// of pages must be invalidated
 			if(!pdf->consolidatePageTree(interNode, true))
@@ -1317,12 +1290,12 @@ using namespace observer;
 	}
 
 	// removes all pages from removed array
-	shared_ptr<IProperty> null(CNullFactory::getInstance());
+	boost::shared_ptr<IProperty> null(CNullFactory::getInstance());
 	kernelPrintDbg(DBG_DBG, "Consolidating page list by removing oldValues.");
 	size_t index=0;
 	for(ChildrenStorage::iterator i=oldValues.begin(); i!=oldValues.end(); ++i, ++index)
 	{
-		shared_ptr<IProperty> child=*i;
+		boost::shared_ptr<IProperty> child=*i;
 		// consider just referencies, other elements are just mess in array
 		// unregisters observers and consolidates pageList like this node has
 		// been removed 
@@ -1341,7 +1314,7 @@ using namespace observer;
 	kernelPrintDbg(DBG_DBG, "Consolidating page list by adding newValues.");
 	for(ChildrenStorage::iterator i=newValues.begin(); i!=newValues.end(); ++i)
 	{
-		shared_ptr<IProperty> child=*i;
+		boost::shared_ptr<IProperty> child=*i;
 		// consider just referencies, other elements are just mess in array
 		// registers observers and consolidates pageList like this node has
 		// been added 
@@ -1372,7 +1345,7 @@ using namespace utils;
 	kernelPrintDbg(DBG_DBG, "contextType="<<contextType);
 	// gets original value from given context. It has to at least
 	// BasicChangeContext
-	shared_ptr<IProperty> oldValue;
+	boost::shared_ptr<IProperty> oldValue;
 	switch(contextType)
 	{
 		// This context means that just simple value has been changed and so
@@ -1381,7 +1354,7 @@ using namespace utils;
 		case BasicChangeContextType:
 			{
 				// this means that reference property has changed its value
-				shared_ptr<const BasicChangeContext<IProperty> > basicContext=
+				boost::shared_ptr<const BasicChangeContext<IProperty> > basicContext=
 					dynamic_pointer_cast<const BasicChangeContext<IProperty>, const IChangeContext<IProperty> >(context); 
 				oldValue=basicContext->getOriginalValue();
 
@@ -1393,7 +1366,7 @@ using namespace utils;
 		case ComplexChangeContextType:
 			{
 				// this means that array content has changed
-				shared_ptr<const CArray::CArrayComplexObserverContext > complexContex=
+				boost::shared_ptr<const CArray::CArrayComplexObserverContext > complexContex=
 					dynamic_pointer_cast<const CArray::CArrayComplexObserverContext, const IChangeContext<IProperty> >(context); 
 				if(!complexContex)
 				{
@@ -1455,7 +1428,7 @@ using namespace utils;
 	{
 		try
 		{
-			shared_ptr<IProperty> oldValueDict=getCObjectFromRef<CDict>(oldValue);
+			boost::shared_ptr<IProperty> oldValueDict=getCObjectFromRef<CDict>(oldValue);
 			pdf->unregisterPageTreeObservers(oldValueDict);
 		}catch(CObjectException & e)
 		{
@@ -1482,7 +1455,7 @@ using namespace utils;
 	IndiRef parentRef=ref;
 	if(getCachedValue(ref, parentRef, pdf->pageTreeKidsParentCache))
 		kernelPrintDbg(DBG_DBG, "Uses pageTreeKidsParentCache with mapping from"<<ref<<" to "<<parentRef);
-	shared_ptr<IProperty> parentProp_ptr=pdf->getIndirectProperty(parentRef);
+	boost::shared_ptr<IProperty> parentProp_ptr=pdf->getIndirectProperty(parentRef);
 	if(parentProp_ptr->getType()!=pDict)
 	{
 		// target of the parent reference is not dictionary,
@@ -1492,7 +1465,7 @@ using namespace utils;
 	}
 
 	// starts consolidation from parent intermediate node
-	shared_ptr<CDict> parentDict_ptr=IProperty::getSmartCObjectPtr<CDict>(parentProp_ptr);
+	boost::shared_ptr<CDict> parentDict_ptr=IProperty::getSmartCObjectPtr<CDict>(parentProp_ptr);
 	try
 	{
 		// if consolidatePageTree hasn't kept page count numbers, total number
@@ -1530,7 +1503,7 @@ using namespace utils;
 	{
 		try
 		{
-			shared_ptr<IProperty> newValueDict=getCObjectFromRef<CDict>(newValue);
+			boost::shared_ptr<IProperty> newValueDict=getCObjectFromRef<CDict>(newValue);
 			pdf->registerPageTreeObservers(newValueDict);
 		}catch(CObjectException & e)
 		{
@@ -1559,11 +1532,11 @@ using namespace observer;
 	}
 	if(docCatalog->containsProperty("Pages"))
 	{
-		shared_ptr<IProperty> pagesProp=docCatalog->getProperty("Pages");
+		boost::shared_ptr<IProperty> pagesProp=docCatalog->getProperty("Pages");
 		if(isRef(pagesProp))
 		{
 			UNREGISTER_SHAREDPTR_OBSERVER(pagesProp, pageTreeRootObserver);
-			shared_ptr<IProperty> pageTreeRoot=getPageTreeRoot(_this.lock());
+			boost::shared_ptr<IProperty> pageTreeRoot=getPageTreeRoot(_this.lock());
 			if(pageTreeRoot.get())
 			{
 				try
@@ -1623,7 +1596,7 @@ void CPdf::initRevisionSpecific()
 		for(IndirectMapping::iterator i=indMap.begin(); i!=indMap.end(); ++i)
 		{
 			IndiRef ref=i->first;
-			shared_ptr<IProperty> value=i->second;
+			boost::shared_ptr<IProperty> value=i->second;
 			if(!value.unique())
 				kernelPrintDbg(debug::DBG_WARN, "Somebody still holds property with with "<<ref);
 		}
@@ -1654,7 +1627,7 @@ void CPdf::initRevisionSpecific()
 	// is thrown
 	kernelPrintDbg(debug::DBG_DBG, "Getting Root field - document catalog");
 	IndiRef rootRef(xref->getRootNum(), xref->getRootGen());
-	shared_ptr<IProperty> prop_ptr=getIndirectProperty(rootRef);
+	boost::shared_ptr<IProperty> prop_ptr=getIndirectProperty(rootRef);
 	if(prop_ptr->getType()!=pDict)
 	{
 		kernelPrintDbg(debug::DBG_ERR, "Trailer dictionary doesn't point to correct document catalog "
@@ -1670,7 +1643,7 @@ void CPdf::initRevisionSpecific()
 	REGISTER_SHAREDPTR_OBSERVER(docCatalog, pageTreeRootObserver);
 	if(docCatalog->containsProperty("Pages"))
 	{
-		shared_ptr<IProperty> pagesProp=docCatalog->getProperty("Pages");
+		boost::shared_ptr<IProperty> pagesProp=docCatalog->getProperty("Pages");
 		if(isRef(pagesProp))
 			REGISTER_SHAREDPTR_OBSERVER(pagesProp, pageTreeRootObserver);
 		else
@@ -1680,7 +1653,7 @@ void CPdf::initRevisionSpecific()
 	
 	// registers pageTreeNodeObserver and pageTreeKidsObserver to page tree root
 	// dictionary which registers these observers to whole page tree structure
-	shared_ptr<IProperty> pageTreeRoot=utils::getPageTreeRoot(_this.lock());
+	boost::shared_ptr<IProperty> pageTreeRoot=utils::getPageTreeRoot(_this.lock());
 	if(pageTreeRoot.get())
 		registerPageTreeObservers(pageTreeRoot);
 }
@@ -1809,8 +1782,8 @@ void CPdf::invalidate()
 
 	// idealy we should unregister page tree observers but as the _this
 	// is no longer valid in this context (last reference to 
-	// shared_ptr<CPdf> was dropped) we can't call unregisterPageObservers 
-	// which relies on it (like everything which uses weak_ptr to this 
+	// boost::shared_ptr<CPdf> was dropped) we can't call unregisterPageObservers 
+	// which relies on it (like everything which uses boost::weak_ptr to this 
 	// instance) - we will rather mark all types of observers are invalid
 	// so they do nothing if they are triggered - which should not happen
 	// anyway
@@ -1870,7 +1843,7 @@ boost::shared_ptr<IProperty> CPdf::getIn
 
 	// mapping doesn't exist yet, so tries to create one
 	// fetches object according reference
-	shared_ptr< ::Object> obj(XPdfObjectFactory::getInstance(), xpdf::object_deleter());
+	boost::shared_ptr< ::Object> obj(XPdfObjectFactory::getInstance(), xpdf::object_deleter());
 	assert(xref);
 	xref->fetch(ref.num, ref.gen, obj.get());
 	
@@ -1883,13 +1856,13 @@ boost::shared_ptr<IProperty> CPdf::getIn
 	if(obj->getType()!=objNull)
 	{
 		IProperty * prop=utils::createObjFromXpdfObj(_this.lock(), *obj, ref);
-		prop_ptr=shared_ptr<IProperty>(prop);
+		prop_ptr=boost::shared_ptr<IProperty>(prop);
 		indMap.insert(IndirectMapping::value_type(ref, prop_ptr));
 		kernelPrintDbg(DBG_DBG, "Mapping created for "<<ref);
 	}else
 	{
 		kernelPrintDbg(DBG_DBG, ref<<" not available or points to objNull");
-		prop_ptr=shared_ptr<CNull>(CNullFactory::getInstance());
+		prop_ptr=boost::shared_ptr<CNull>(CNullFactory::getInstance());
 	}
 
 	return prop_ptr;
@@ -1913,7 +1886,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
-	shared_ptr<CPdf> original=ip->getPdf().lock();
+	boost::shared_ptr<CPdf> original=ip->getPdf().lock();
 	ip->setPdf(_this);
 	::Object * obj=ip->_makeXpdfObject();
 	ip->setPdf(original);
@@ -1940,7 +1913,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
-	shared_ptr<IProperty> toSubstitute=ip->clone();
+	boost::shared_ptr<IProperty> toSubstitute=ip->clone();
 	if(hasValidPdf(ip))
 	{
 		// locks cloned object to prevent making changes (kind of workaround)
@@ -2060,8 +2033,8 @@ using namespace utils;
 						<<refEntry->first);	
 				// ip is from read pdf and so dereferences target value 					
 				// FIXME check for valid pdf
-				shared_ptr<CPdf> pdf = ip->getPdf().lock();
-				shared_ptr<IProperty> followedIp=pdf->getIndirectProperty(ipRef);
+				boost::shared_ptr<CPdf> pdf = ip->getPdf().lock();
+				boost::shared_ptr<IProperty> followedIp=pdf->getIndirectProperty(ipRef);
 
 				// adds dereferenced value using addProperty with collected
 				// container. Current mapping is set to resolving state to 
@@ -2097,7 +2070,7 @@ using namespace utils;
 	ChildrenStorage::iterator i;
 	for(i=childrenStorage.begin(); i!=childrenStorage.end(); ++i)
 	{
-		shared_ptr<IProperty> child=*i;
+		boost::shared_ptr<IProperty> child=*i;
 		if(!isRef(*child) && !isDict(*child) && !isArray(*child) && !isStream(*child))
 		{
 			// child is none of interesting type which may hold reference
@@ -2146,7 +2119,7 @@ using namespace boost;
 	}
 	
 	// checks whether given ip is from same pdf
-	shared_ptr<CPdf> ipPdf = ip->getPdf().lock();
+	boost::shared_ptr<CPdf> ipPdf = ip->getPdf().lock();
 	if(ipPdf.get()==this)
 	{
 		// ip is from same pdf and so all possible referencies are already in 
@@ -2245,7 +2218,7 @@ void CPdf::changeIndirectProperty(const
 		throw ReadOnlyDocumentException("Document is in read-only mode.");
 	}
 
-	shared_ptr<CPdf> _thisP = _this.lock();
+	boost::shared_ptr<CPdf> _thisP = _this.lock();
 	if(utils::isEncrypted(_thisP))
 	{
 		kernelPrintDbg(DBG_WARN, "Changing properties for encrypted documents si not implemented");
@@ -2272,7 +2245,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
-	shared_ptr<Object> propObject(prop->_makeXpdfObject(), xpdf::object_deleter());
+	boost::shared_ptr<Object> propObject(prop->_makeXpdfObject(), xpdf::object_deleter());
 	kernelPrintDbg(DBG_DBG, "Registering change to the XRefWriter");
 	xref->changeObject(indiRef.num, indiRef.gen, propObject.get());
 
@@ -2359,10 +2332,10 @@ using namespace std;
 	kernelPrintDbg(debug::DBG_DBG,"File stream created");
 
 	// stream is ready, creates CPdf instance
-	shared_ptr<CPdf> instance;
+	boost::shared_ptr<CPdf> instance;
 	try
 	{
-		instance = shared_ptr<CPdf>(new CPdf(stream, mode), PdfFileDeleter(file));
+		instance = boost::shared_ptr<CPdf>(new CPdf(stream, mode), PdfFileDeleter(file));
 		instance->_this = instance;
 
 		// initializes revision specific data for the newest revision
@@ -2423,14 +2396,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.
-	shared_ptr<CDict> rootPages_ptr=getPageTreeRoot(_this.lock());
+	boost::shared_ptr<CDict> rootPages_ptr=getPageTreeRoot(_this.lock());
 	if(!rootPages_ptr.get())
 		throw PageNotFoundException(pos);
-	shared_ptr<CDict> pageDict_ptr=findPageDict(_this.lock(), rootPages_ptr, 1, pos, &nodeCountCache);
+	boost::shared_ptr<CDict> pageDict_ptr=findPageDict(_this.lock(), rootPages_ptr, 1, pos, &nodeCountCache);
 
 	// creates CPage instance from page dictionary and stores it to the pageList
 	CPage * page=CPageFactory::getInstance(pageDict_ptr);
-	shared_ptr<CPage> page_ptr(page);
+	boost::shared_ptr<CPage> page_ptr(page);
 	pageList.insert(PageList::value_type(pos, page_ptr));
 	kernelPrintDbg(DBG_DBG, "New page added to the pageList size="<<pageList.size());
 
@@ -2452,7 +2425,7 @@ using namespace utils;
 		return pageCount;
 	}
 	
-	shared_ptr<CDict> rootDict=getPageTreeRoot(_this.lock());
+	boost::shared_ptr<CDict> rootDict=getPageTreeRoot(_this.lock());
 	if(!rootDict.get())
 		return 0;
 	pageCount=getKidsCount(rootDict, &nodeCountCache);
@@ -2531,7 +2504,7 @@ size_t CPdf::getPagePosition(const boost
 }
 
 
-void CPdf::consolidatePageList(const shared_ptr<IProperty> & oldValue, const shared_ptr<IProperty> & newValue)
+void CPdf::consolidatePageList(const boost::shared_ptr<IProperty> & oldValue, const boost::shared_ptr<IProperty> & newValue)
 {
 using namespace utils;
 
@@ -2562,12 +2535,12 @@ using namespace utils;
 			{
 				kernelPrintDbg(DBG_DBG, "oldValue was simple page dictionary");
 				difference = -1;
-				shared_ptr<CDict> oldDict_ptr=getCObjectFromRef<CDict>(oldValue);
+				boost::shared_ptr<CDict> oldDict_ptr=getCObjectFromRef<CDict>(oldValue);
 
 				for(PageList::iterator i=pageList.begin(); i!=pageList.end(); ++i)
 				{
 					// checks page's dictionary with old one
-					shared_ptr<CPage> page=i->second;
+					boost::shared_ptr<CPage> page=i->second;
 					if(page->getDictionary() == oldDict_ptr)
 					{
 						i->second->invalidate();
@@ -2598,7 +2571,7 @@ using namespace utils;
 				bool found=false;
 				for(PageList::iterator i=pageList.begin(); i!=pageList.end();)
 				{
-					shared_ptr<CPage> page=i->second;
+					boost::shared_ptr<CPage> page=i->second;
 					// 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 +2671,7 @@ using namespace utils;
 	for(i=pageList.begin(); i!=pageList.end();)
 	{
 		size_t pos=i->first;
-		shared_ptr<CPage> page=i->second;
+		boost::shared_ptr<CPage> page=i->second;
 
 		if(pos>=minPos)
 		{
@@ -2782,20 +2755,12 @@ using namespace utils;
 	bool countChanged=false;
 	if(interNode->containsProperty("Count"))
 	{
-		shared_ptr<IProperty> countProp=interNode->getProperty("Count");
-		shared_ptr<CInt> countInt;
-		if(isRef(countProp))
-		{
-			try
-			{
-				countInt=getCObjectFromRef<CInt>(countProp);
-			}catch(CObjectException & e)
-			{
-				// not int, keeps countInt unintialized
-			}
-		}else
-			if(isInt(countProp))
-				countInt=IProperty::getSmartCObjectPtr<CInt>(countProp);
+		boost::shared_ptr<CInt> countInt;
+		try {
+			countInt = interNode->getProperty<CInt>("Count");
+		}catch(...) {
+			// keep countInt unitialized
+		}
 		// if countInt is unitialized, Count property has bad type
 		if(!countInt.get())
 		{
@@ -2803,7 +2768,7 @@ using namespace utils;
 			interNode->delProperty("Count");
 
 			// adds new Count property with correct value
-			countInt=shared_ptr<CInt>(CIntFactory::getInstance((int)count));
+			countInt=boost::shared_ptr<CInt>(CIntFactory::getInstance((int)count));
 			kernelPrintDbg(DBG_DBG, "replacing old Count property with new property value="<<count);
 			interNode->addProperty("Count", *countInt);
 			countChanged=true;
@@ -2821,7 +2786,7 @@ using namespace utils;
 	}else
 	{
 		// adds new Count property with correct value
-		scoped_ptr<IProperty> countInt(CIntFactory::getInstance((int)count));
+		boost::scoped_ptr<IProperty> countInt(CIntFactory::getInstance((int)count));
 		kernelPrintDbg(DBG_DBG, "adding new Count property value="<<count);
 		interNode->addProperty("Count", *countInt);
 		countChanged=true;
@@ -2842,7 +2807,7 @@ using namespace utils;
 	size_t index=0;
 	for(i=kids.begin(); i!=kids.end(); ++i, ++index)
 	{
-		shared_ptr<IProperty> child=*i;
+		boost::shared_ptr<IProperty> child=*i;
 		if(!isRef(child))
 		{
 			// element is not reference, so we print warning and skip it
@@ -2861,18 +2826,16 @@ using namespace utils;
 		
 		// gets target dictionary to check and consolidate - this doesn't throw
 		// because it is leaf or intermediate node
-		shared_ptr<CDict> childDict=getCObjectFromRef<CDict>(child);
+		boost::shared_ptr<CDict> childDict=getCObjectFromRef<CDict>(child);
 		
 		// each leaf and inter node has to have Parent property with refernce to
 		// this node (which is indirect object and so we can use its
 		// NOTE that change in Parent property doesn't require also interNode
 		// parent consolidation
-		shared_ptr<CRef> parentRef;
+		boost::shared_ptr<CRef> parentRef;
 		if(childDict->containsProperty("Parent"))
 		{
-			shared_ptr<IProperty> parentProp=childDict->getProperty("Parent");
-			if(isRef(parentProp))
-				parentRef=IProperty::getSmartCObjectPtr<CRef>(parentProp);
+			parentRef=childDict->getProperty<CRef>("Parent");
 
 			// if parentRef is unitialized, Parent has bad type
 			if(!parentRef.get())
@@ -2881,7 +2844,7 @@ using namespace utils;
 				childDict->delProperty("Parent");
 
 				// adds new Parent property with correct value
-				parentRef=shared_ptr<CRef>(CRefFactory::getInstance(interNodeRef));
+				parentRef=boost::shared_ptr<CRef>(CRefFactory::getInstance(interNodeRef));
 				kernelPrintDbg(DBG_DBG, "replacing old Parent property with new");
 				childDict->addProperty("Parent", *parentRef);
 			}else
@@ -2897,7 +2860,7 @@ using namespace utils;
 		}else
 		{
 			// adds new Count property with correct value
-			scoped_ptr<IProperty> countInt(CRefFactory::getInstance(interNodeRef));
+			boost::scoped_ptr<IProperty> countInt(CRefFactory::getInstance(interNodeRef));
 			kernelPrintDbg(DBG_DBG, "adding new Parent property");
 			childDict->addProperty("Parent", *countInt);
 		}
@@ -2920,19 +2883,14 @@ using namespace utils;
 		// just prints warning messages and stops recursion
 		if(interNode->containsProperty("Parent"))
 		{
-			shared_ptr<IProperty> parentProp=interNode->getProperty("Parent");
-			if(isRef(parentProp))
+			try
 			{
-				try
-				{
-					shared_ptr<CDict> parentDict=getCObjectFromRef<CDict>(parentProp);
-					return consolidatePageTree(parentDict, true);
-				}catch(CObjectException & e)
-				{
-					kernelPrintDbg(DBG_WARN, "InterNode "<<interNodeRef<<" has bad Parent ref. Target is not a dictionary.");
-				}
-			}else 
-				kernelPrintDbg(DBG_WARN, "InterNode "<<interNodeRef<<" has bad typed Parent field. type="<<parentProp->getType());
+				boost::shared_ptr<CDict> parentDict=interNode->getProperty<CDict>("Parent");
+				return consolidatePageTree(parentDict, true);
+			}catch(CObjectException & e)
+			{
+				kernelPrintDbg(DBG_WARN, "InterNode "<<interNodeRef<<" has bad Parent. Target is not a dictionary.");
+			}
 		}else
 			kernelPrintDbg(DBG_WARN, "InterNode "<<interNodeRef<<" has no Parent field (and it is not root).");
 	}
@@ -2977,8 +2935,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
-	shared_ptr<CDict> interNode_ptr;
-	shared_ptr<CRef> currRef;
+	boost::shared_ptr<CDict> interNode_ptr;
+	boost::shared_ptr<CRef> currRef;
 	// by default it is root of page tree
 	interNode_ptr=getPageTreeRoot(_this.lock());
 	if(!interNode_ptr.get())
@@ -2993,23 +2951,22 @@ 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
-		shared_ptr<CDict> currentPage_ptr=findPageDict(_this.lock(), interNode_ptr, 1, storePostion, &nodeCountCache);
-		currRef=shared_ptr<CRef>(CRefFactory::getInstance(currentPage_ptr->getIndiRef()));
+		boost::shared_ptr<CDict> currentPage_ptr=findPageDict(_this.lock(), interNode_ptr, 1, storePostion, &nodeCountCache);
+		currRef=boost::shared_ptr<CRef>(CRefFactory::getInstance(currentPage_ptr->getIndiRef()));
 		
 		// gets parent of found dictionary which maintains 
-		shared_ptr<IProperty> parentRef_ptr=currentPage_ptr->getProperty("Parent");
-		interNode_ptr=getCObjectFromRef<CDict>(parentRef_ptr);
+		interNode_ptr=currentPage_ptr->getProperty<CDict>("Parent");
 	}
 
 	// gets Kids array where to insert new page dictionary
-	shared_ptr<IProperty> kidsProp_ptr=interNode_ptr->getProperty("Kids");
-	if(kidsProp_ptr->getType()!=pArray)
-	{
-		kernelPrintDbg(DBG_ERR, "Pages Kids field is not an array type="<<kidsProp_ptr->getType());
+	boost::shared_ptr<CArray> kids_ptr;
+	try {
+		kids_ptr=interNode_ptr->getProperty<CArray>("Kids");
+	}catch(...) {
+		kernelPrintDbg(DBG_ERR, "Pages Kids field is not an array type");
 		// Kids is not array - malformed intermediate node
 		throw MalformedFormatExeption("Intermediate node Kids field is not an array.");
 	}
-	shared_ptr<CArray> kids_ptr=IProperty::getSmartCObjectPtr<CArray>(kidsProp_ptr);
 	
 	// gets index in Kids array where to store.
 	// by default insert at 1st position (index is 0)
@@ -3032,8 +2989,8 @@ using namespace utils;
 
 	// Now it is safe to add indirect object, because there is nothing that can
 	// fail
-	shared_ptr<CDict> pageDict=page->getDictionary();
-	shared_ptr<CPdf> pageDictPdf = pageDict->getPdf().lock();
+	boost::shared_ptr<CDict> pageDict=page->getDictionary();
+	boost::shared_ptr<CPdf> pageDictPdf = pageDict->getPdf().lock();
 	if(pageDictPdf && pageDictPdf !=_this.lock())
 	{
 		// page comes from different valid pdf - we have to create clone and
@@ -3085,8 +3042,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
-	shared_ptr<CDict> newPageDict_ptr=IProperty::getSmartCObjectPtr<CDict>(getIndirectProperty(pageRef));
-	shared_ptr<CPage> newPage_ptr(CPageFactory::getInstance(newPageDict_ptr));
+	boost::shared_ptr<CDict> newPageDict_ptr=IProperty::getSmartCObjectPtr<CDict>(getIndirectProperty(pageRef));
+	boost::shared_ptr<CPage> newPage_ptr(CPageFactory::getInstance(newPageDict_ptr));
 	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 +3070,20 @@ 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
-	shared_ptr<CDict> rootDict=getPageTreeRoot(_this.lock());
-	shared_ptr<CDict> currentPage_ptr=findPageDict(_this.lock(), rootDict, 1, pos, &nodeCountCache);
-	shared_ptr<CRef> currRef(CRefFactory::getInstance(currentPage_ptr->getIndiRef()));
+	boost::shared_ptr<CDict> rootDict=getPageTreeRoot(_this.lock());
+	boost::shared_ptr<CDict> currentPage_ptr=findPageDict(_this.lock(), rootDict, 1, pos, &nodeCountCache);
+	boost::shared_ptr<CRef> currRef(CRefFactory::getInstance(currentPage_ptr->getIndiRef()));
 	
 	// Gets parent field from found page dictionary and gets its Kids array
-	shared_ptr<IProperty> parentRef_ptr=currentPage_ptr->getProperty("Parent");
-	shared_ptr<CDict> interNode_ptr=getCObjectFromRef<CDict>(parentRef_ptr);
-	shared_ptr<IProperty> kidsProp_ptr=interNode_ptr->getProperty("Kids");
-	if(kidsProp_ptr->getType()!=pArray)
-	{
-		kernelPrintDbg(DBG_ERR, "Pages Kids field is not an array type="<<kidsProp_ptr->getType());
+	boost::shared_ptr<CDict> interNode_ptr=currentPage_ptr->getProperty<CDict>("Parent");
+	boost::shared_ptr<CArray> kids_ptr;
+	try {
+		kids_ptr=interNode_ptr->getProperty<CArray>("Kids");
+	}catch(...) {
+		kernelPrintDbg(DBG_ERR, "Pages Kids field is not an array type");
 		// Kids is not array - malformed intermediate node
 		throw MalformedFormatExeption("Intermediate node Kids field is not an array.");
 	}
-	shared_ptr<CArray> kids_ptr=IProperty::getSmartCObjectPtr<CArray>(kidsProp_ptr);
 
 	// gets index of searched node in Kids array and removes element from found
 	// position - if position can't be determined unambiguously (getPropertyId
Index: pdfedit-0.4.5/src/kernel/cpdf.h
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/cpdf.h
+++ pdfedit-0.4.5/src/kernel/cpdf.h
@@ -1576,7 +1576,7 @@ public:
 		boost::shared_ptr<CDict> toplevel;
 		try {
 			
-			toplevel = utils::getCDictFromDict (docCatalog, "Outlines");
+			toplevel = docCatalog->getProperty<CDict>("Outlines");
 			
 		}catch (ElementNotFoundException&)
 		{
Index: pdfedit-0.4.5/src/kernel/cstream.cc
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/cstream.cc
+++ pdfedit-0.4.5/src/kernel/cstream.cc
@@ -123,7 +123,7 @@ void
 CStream::createReqEntries ()
 {
 	// Add one required entry in the stream dictionary (according to pdf specification)
-	shared_ptr<CInt> len (new CInt (0));
+	boost::shared_ptr<CInt> len (new CInt (0));
 	assert (len);
 	dictionary.addProperty ("Length", *len);
 }
@@ -152,7 +152,7 @@ CStream::doClone () const
 	CDict::Value::const_iterator it = dictionary.value.begin ();
 	for (; it != dictionary.value.end (); ++it)
 	{
-		shared_ptr<IProperty> newIp = ((*it).second)->clone ();
+		boost::shared_ptr<IProperty> newIp = ((*it).second)->clone ();
 		assert (newIp);
 		CDict::Value::value_type item =  make_pair ((*it).first, newIp);
 		clone_->dictionary.value.push_back (item);
@@ -204,7 +204,7 @@ CStream::setRawBuffer (const Buffer& buf
 	this->canChange();
 
 	// Create context
-	shared_ptr<ObserverContext> context (this->_createContext());
+	boost::shared_ptr<ObserverContext> context (this->_createContext());
 
 	// Copy buf to buffer
 	buffer.clear ();
@@ -324,15 +324,12 @@ CStream::getDecodedStringRepresentation
 size_t
 CStream::getLength () const 
 {
-	shared_ptr<IProperty> len = utils::getReferencedObject (dictionary.getProperty("Length"));
-	if (isInt (len))
-	{
+	try {
 		int length;
-		IProperty::getSmartCObjectPtr<CInt>(len)->getValue (length);
+		dictionary.getProperty<CInt>("Length")->getValue (length);
 		assert (0 <= length);
 		return length;
-	
-	}else
+	}catch(...)
 	{
 		assert (!"Bad Length type in stream.");
 		throw CObjInvalidObject ();
@@ -345,7 +342,7 @@ CStream::getLength () const
 IProperty::ObserverContext* 
 CStream::_createContext () const
 {
-	return new BasicObserverContext (shared_ptr<IProperty> (new CNull ()));
+	return new BasicObserverContext (boost::shared_ptr<IProperty> (new CNull ()));
 }
 
 
@@ -353,7 +350,7 @@ CStream::_createContext () const
 //
 //
 void 
-CStream::_objectChanged (shared_ptr<const ObserverContext> context)
+CStream::_objectChanged (boost::shared_ptr<const ObserverContext> context)
 {
 	// Do not notify anything if we are not in a valid pdf
 	if (!hasValidPdf (this))
@@ -375,12 +372,12 @@ CStream::_objectChanged (shared_ptr<cons
 		// Clone new value
 		// TODO why to clone? This may be preformance problem. Streams are
 		// rather big
-		//shared_ptr<IProperty> newValue (this->clone());
+		//boost::shared_ptr<IProperty> newValue (this->clone());
 		
 		// doesn't clone but rather wrap this with shared pointer
 		// and empty deallocator to prevent from this instance
 		// deallocation
-		shared_ptr<IProperty> newValue(this, EmptyDeallocator<IProperty>());
+		boost::shared_ptr<IProperty> newValue(this, EmptyDeallocator<IProperty>());
 		// Fill it with correct values
 		newValue->setPdf (this->getPdf());
 		newValue->setIndiRef (this->getIndiRef());
Index: pdfedit-0.4.5/src/kernel/cstream.h
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/cstream.h
+++ pdfedit-0.4.5/src/kernel/cstream.h
@@ -174,6 +174,11 @@ public:
 	/** Delagate this operation to underlying dictionary. \see CDict */
 	boost::shared_ptr<IProperty> getProperty (PropertyId id) const
 		{return dictionary.getProperty (id);}
+
+	/** Delagate this operation to underlying dictionary. \see CDict */
+	template<typename ItemType>
+	boost::shared_ptr<ItemType> getProperty (PropertyId id) const
+		{return dictionary.getProperty<ItemType> (id);}
 	
 	/** Delagate this operation to underlying dictionary. \see CDict */
 	bool containsProperty (PropertyId id) const
Index: pdfedit-0.4.5/src/kernel/pdfoperators.cc
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/pdfoperators.cc
+++ pdfedit-0.4.5/src/kernel/pdfoperators.cc
@@ -32,6 +32,7 @@
 
 #include "kernel/ccontentstream.h"
 #include "kernel/stateupdater.h"
+#include "kernel/factories.h"
 
 //==========================================================
 namespace pdfobjects {
@@ -129,7 +130,7 @@ SimpleGenericOperator::getStringRepresen
 //
 //
 //
-shared_ptr<PdfOperator> 
+boost::shared_ptr<PdfOperator> 
 SimpleGenericOperator::clone ()
 {
 	// Clone operands
@@ -144,7 +145,7 @@ SimpleGenericOperator::clone ()
 
 
 void 
-SimpleGenericOperator::init_operands (shared_ptr<observer::IObserver<IProperty> > observer, 
+SimpleGenericOperator::init_operands (boost::shared_ptr<observer::IObserver<IProperty> > observer, 
 									  boost::weak_ptr<CPdf> pdf, 
 									  IndiRef* rf)
 { 
@@ -171,6 +172,22 @@ SimpleGenericOperator::init_operands (sh
 	} // for
 }
 
+namespace utils {
+static std::string transformToCodeString(const std::string& what, const GfxFont *font)
+{
+	std::string out;
+	for (unsigned i=0; i < what.length(); ++i) {
+		int ch = what[i];
+		CharCode code = ch;
+		if (font)
+			code = font->getCodeFromUnicode((const Unicode *)&ch, 1);
+		out += (char)code;
+	}
+	return out;
+
+}
+
+}
 
 void TextSimpleOperator::getRawText(std::string& str)const
 {
@@ -204,20 +221,20 @@ using namespace utils;
 	}
 	else if (name == "TJ")
 	{
-		shared_ptr<IProperty> op = ops[0];
+		boost::shared_ptr<IProperty> op = ops[0];
 		if (!isArray(op) || ops.size() != 1)
 		{
 			utilsPrintDbg(debug::DBG_WARN, "Bad operands for TJ operator: ops[type="
 					<< op->getType() <<" size="<<ops.size()<<"]");
 			return;
 		}
-		shared_ptr<CArray> opArray = IProperty::getSmartCObjectPtr<CArray>(op);
-		std::vector<shared_ptr<IProperty> > props;
+		boost::shared_ptr<CArray> opArray = IProperty::getSmartCObjectPtr<CArray>(op);
+		std::vector<boost::shared_ptr<IProperty> > props;
 		opArray->_getAllChildObjects(props);
-		std::vector<shared_ptr<IProperty> >::iterator i;
+		std::vector<boost::shared_ptr<IProperty> >::iterator i;
 		for(i=props.begin(); i!=props.end(); ++i)
 		{
-			shared_ptr<IProperty> p = *i;
+			boost::shared_ptr<IProperty> p = *i;
 
 			// TODO consider spacing coming from values
 			if(!(isString(p)))
@@ -235,13 +252,15 @@ using namespace utils;
 }
 
 void 
-TextSimpleOperator::setRawText (std::string& str)
+TextSimpleOperator::setFontText (const std::string& str)
 {
 		utilsPrintDbg(debug::DBG_DBG, "");
 	
 	std::string name;
 	getOperatorName(name);
 
+	std::string codeStr = utils::transformToCodeString(str, getCurrentFont());
+
 	Operands ops;
 	getParameters(ops);
 	if(name == "'" || name == "Tj")
@@ -251,7 +270,7 @@ TextSimpleOperator::setRawText (std::str
 				utilsPrintDbg(debug::DBG_WARN, "Bad operands for operator " <<name<<" count="<<ops.size()<<" ops[0] type="<< ops[0]->getType());
 				return;
 			}
-		setValueToSimple<CString, pString>(ops[0], str);
+		setValueToSimple<CString, pString>(ops[0], codeStr);
 	}
 	else if (name == "\"")
 	{
@@ -260,18 +279,29 @@ TextSimpleOperator::setRawText (std::str
 				utilsPrintDbg(debug::DBG_WARN, "Bad operands for operator "<<name<<" count="<<ops.size()<<" ops[2] type="<< ops[2]->getType());
 				return;
 			}
-		setValueToSimple<CString, pString>(ops[2], str);
+		setValueToSimple<CString, pString>(ops[2], codeStr);
 	}
 	else if (name == "TJ")
 	{
 		shared_ptr<IProperty> op = ops[0];
-			if (!isArray(op) || ops.size() != 1)
-			{
-				utilsPrintDbg(debug::DBG_WARN, "Bad operands for TJ operator: ops[type="<< op->getType() <<" size="<<ops.size()<<"]");
-				return;
-			}
-		// am to lazy to do it
-		utilsPrintDbg(debug::DBG_WARN, "todo!");
+		if (!isArray(op) || ops.size() != 1)
+		{
+			utilsPrintDbg(debug::DBG_WARN, "Bad operands for TJ operator: ops[type="<< op->getType() <<" size="<<ops.size()<<"]");
+			return;
+		}
+		// We want to set a new text for this operator so let's 
+		// forget about the original parameters along with the
+		// formatting and add the given string as an only one
+		// parameter in the array.
+		if (isArray(op)) {
+			shared_ptr<CArray> array = IProperty::getSmartCObjectPtr<CArray>(op);
+			while (array->getPropertyCount() > 1)
+				array->delProperty(array->getPropertyCount()-1);
+			shared_ptr<IProperty> p = array->getProperty(0);
+			setValueToSimple<CString, pString>(p, codeStr);
+		}else
+			setValueToSimple<CString, pString>(ops[0], codeStr);
+		return;
 
 	}else
 	{
@@ -311,7 +341,7 @@ GfxFont* TextSimpleOperator::getCurrentF
 {
 	assert(fontData);
 	const char* tag = fontData->getFontTag();
-	shared_ptr<GfxResources> res = getContentStream()->getResources(); 
+	boost::shared_ptr<GfxResources> res = getContentStream()->getResources(); 
 	GfxFont* font = res->lookupFont(tag);
 	if(!font)
 		utilsPrintDbg(debug::DBG_ERR, "Unable to get font(name="
@@ -407,10 +437,10 @@ UnknownCompositePdfOperator::getStringRe
 //
 //
 //
-shared_ptr<PdfOperator> 
+boost::shared_ptr<PdfOperator> 
 UnknownCompositePdfOperator::clone ()
 {
-	shared_ptr<UnknownCompositePdfOperator> clone (new UnknownCompositePdfOperator(_opBegin,_opEnd));
+	boost::shared_ptr<UnknownCompositePdfOperator> clone (new UnknownCompositePdfOperator(_opBegin,_opEnd));
 
 	for (PdfOperators::iterator it = _children.begin(); it != _children.end(); ++it)
 		clone->push_back ((*it)->clone(),getLastOperator(clone));
@@ -423,6 +453,18 @@ UnknownCompositePdfOperator::clone ()
 // InlineImageCompositePdfOperator
 //
 
+size_t 
+InlineImageCompositePdfOperator::getWidth() const 
+{
+  return _inlineimage->width();
+}
+size_t 
+InlineImageCompositePdfOperator::getHeight() const
+{
+  return _inlineimage->height();
+}
+
+
 //
 //
 //
@@ -482,13 +524,14 @@ InlineImageCompositePdfOperator::getPara
 //
 //
 //
-shared_ptr<PdfOperator> 
+boost::shared_ptr<PdfOperator> 
 InlineImageCompositePdfOperator::clone ()
 {
 	// Clone operands
-	shared_ptr<CInlineImage> imgclone = IProperty::getSmartCObjectPtr<CInlineImage> (_inlineimage->clone());
+	boost::shared_ptr<CInlineImage> imgclone = IProperty::getSmartCObjectPtr<CInlineImage> (_inlineimage->clone());
+	assert(imgclone->width() == _inlineimage->width());
 	// Create clone
-	return shared_ptr<PdfOperator> (new InlineImageCompositePdfOperator (imgclone, _opBegin, _opEnd));
+	return boost::shared_ptr<PdfOperator> (new InlineImageCompositePdfOperator (imgclone, _opBegin, _opEnd));
 }
 
 
@@ -505,7 +548,7 @@ boost::shared_ptr<PdfOperator> createOpe
 	const StateUpdater::CheckTypes* chcktp = StateUpdater::findOp (name.c_str());
 	// Operator not found, create unknown operator
 	if (NULL == chcktp)
-		return shared_ptr<PdfOperator> (new SimpleGenericOperator (name ,operands));
+		return boost::shared_ptr<PdfOperator> (new SimpleGenericOperator (name ,operands));
 	
 	assert (chcktp);
 	utilsPrintDbg (DBG_DBG, "Operator found. " << chcktp->name);
@@ -524,13 +567,13 @@ boost::shared_ptr<PdfOperator> createOpe
 	// If endTag is "" it is a simple operator, composite otherwise
 	// 
 	if (isTextOp(*chcktp))
-		return shared_ptr<PdfOperator> (new TextSimpleOperator(chcktp->name, argNum, operands));
+		return boost::shared_ptr<PdfOperator> (new TextSimpleOperator(chcktp->name, argNum, operands));
 
 	if (isSimpleOp(*chcktp))
-		return shared_ptr<PdfOperator> (new SimpleGenericOperator (chcktp->name, argNum, operands));
+		return boost::shared_ptr<PdfOperator> (new SimpleGenericOperator (chcktp->name, argNum, operands));
 		
 	// Composite operator
-	return shared_ptr<PdfOperator> (new UnknownCompositePdfOperator (chcktp->name, chcktp->endTag));
+	return boost::shared_ptr<PdfOperator> (new UnknownCompositePdfOperator (chcktp->name, chcktp->endTag));
 
 }
 
@@ -565,6 +608,42 @@ boost::shared_ptr<PdfOperator> createOpe
 	return createOperator("cm", ops);
 }
 
+boost::shared_ptr<PdfOperator> createOperatorText (boost::shared_ptr<CContentStream> &cc,
+		const std::string &fontName, const std::string &op, const std::string &text)
+{
+	utilsPrintDbg(debug::DBG_DBG, "");
+
+	boost::shared_ptr<GfxResources> res = cc->getResources();
+	GfxFont *font = res->lookupFont(fontName.c_str());
+	std::string encText;
+	if (font) {
+		encText = transformToCodeString(text, font);
+	}
+	else {
+		encText = text;
+		utilsPrintDbg(debug::DBG_WARN, "No font found for "+fontName);
+	}
+
+	PdfOperator::Operands ops;
+
+	if (op == "'" || op == "Tj") {
+		ops.push_back(boost::shared_ptr<IProperty>(CStringFactory::getInstance(encText)));
+	} else if (op == "TJ") {
+		boost::shared_ptr<CArray> array(CArrayFactory::getInstance());
+		boost::shared_ptr<IProperty> str(CStringFactory::getInstance(encText));
+		array->addProperty(*str);
+		ops.push_back(array);
+	} else if (op == "\"") {
+		utilsPrintDbg(debug::DBG_WARN, op+" text operator is not supported");
+		throw NotImplementedException(op +" text operator is not supported");
+
+	}else {
+		utilsPrintDbg(debug::DBG_ERR, "Unknown text operator "+op);
+		throw ElementBadTypeException("Unknown text operator "+op);
+	}
+	return createOperator(op, ops);
+}
+
 //
 //\todo improve performance
 //
Index: pdfedit-0.4.5/src/kernel/pdfoperators.h
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/pdfoperators.h
+++ pdfedit-0.4.5/src/kernel/pdfoperators.h
@@ -154,9 +154,12 @@ public:
 	virtual void getRawText(std::string& str)const;
 
 	/** 
-	 * Sets raw string.
+	 * Sets string which should be displayed according to the used font.
+	 *
+	 * Method will do the lowlevel transformation to the proper characters
+	 * codes according to font and its encoding.
 	 */
-	void setRawText (std::string& str);
+	void setFontText (const std::string& str);
 
 	/** Returns string represented by this text operator converted 
 	 * according the font encoding.
@@ -277,6 +280,12 @@ public:
 	virtual void getOperatorName (std::string& first) const {first = _opBegin;}
 
 	//
+	//
+	//
+	size_t getWidth() const;
+	size_t getHeight() const;
+
+	//
 	// Clone interface
 	//
 protected:
@@ -322,6 +331,17 @@ boost::shared_ptr<PdfOperator> createOpe
  */
 boost::shared_ptr<PdfOperator> createOperatorScale (double width, double height);
 
+/** Create a text operator with the font encoding translation.
+ * @param cc Content stream wehere the operator will be added (this is not done by this 
+ *           function - we just reuse resources from it).
+ * @param fontName Font for the text.
+ * @param op Text operator to use (tj, ' or TJ).
+ * @param text Text to be used for the operator (unicode encoded).
+ * @throw ElementBadTypeException if an unknown text operator is provided.
+ * @throw NotImplementedException for " text operator.
+ */
+boost::shared_ptr<PdfOperator> createOperatorText (boost::shared_ptr<CContentStream>& cc,
+                const std::string &fontName, const std::string &op, const std::string &text);
 
 /** Is an operator a composite. */
 inline bool 
Index: pdfedit-0.4.5/src/kernel/pdfoperatorsbase.cc
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/pdfoperatorsbase.cc
+++ pdfedit-0.4.5/src/kernel/pdfoperatorsbase.cc
@@ -48,7 +48,7 @@ using namespace debug;
 //
 //
 //
-shared_ptr<CContentStream>
+boost::shared_ptr<CContentStream>
 PdfOperator::getContentStream () const
 {
 		assert (_contentstream);
@@ -57,7 +57,7 @@ PdfOperator::getContentStream () const
 }
 	
 void 
-PdfOperator::putBehind (shared_ptr<PdfOperator> behindWhich, shared_ptr<PdfOperator> which)
+PdfOperator::putBehind (boost::shared_ptr<PdfOperator> behindWhich, boost::shared_ptr<PdfOperator> which)
 {
 	if (behindWhich && which)
 	{
@@ -92,7 +92,7 @@ PdfOperator::putBehind (shared_ptr<PdfOp
 //
 //
 void 
-CompositePdfOperator::push_back (const shared_ptr<PdfOperator> oper, shared_ptr<PdfOperator> prev)
+CompositePdfOperator::push_back (const boost::shared_ptr<PdfOperator> oper, boost::shared_ptr<PdfOperator> prev)
 {
 		assert (oper);
 		kernelPrintDbg (debug::DBG_DBG, "");
@@ -136,7 +136,7 @@ CompositePdfOperator::push_back (const s
 //
 //
 void
-CompositePdfOperator::remove (shared_ptr<PdfOperator> op)
+CompositePdfOperator::remove (boost::shared_ptr<PdfOperator> op)
 { 
 	PdfOperators::iterator it =  find (_children.begin(), _children.end(), op);
 		assert (it != _children.end());
@@ -160,8 +160,8 @@ CompositePdfOperator::getChildren (PdfOp
 //
 //
 void 
-CompositePdfOperator::insert_after (const shared_ptr<PdfOperator> oper, 
-									shared_ptr<PdfOperator> newOper)
+CompositePdfOperator::insert_after (const boost::shared_ptr<PdfOperator> oper, 
+									boost::shared_ptr<PdfOperator> newOper)
 {
 	PdfOperators::iterator it = std::find (_children.begin(), _children.end(), oper);
 	_children.insert (++it, newOper);
@@ -189,7 +189,7 @@ CompositePdfOperator::getStringRepresent
 }
 
 void 
-CompositePdfOperator::init_operands (shared_ptr<observer::IObserver<IProperty> > observer, boost::weak_ptr<CPdf> pdf, IndiRef* rf)
+CompositePdfOperator::init_operands (boost::shared_ptr<observer::IObserver<IProperty> > observer, boost::weak_ptr<CPdf> pdf, IndiRef* rf)
 { 
 	for (PdfOperators::iterator it = _children.begin (); it != _children.end(); ++it)
 		(*it)->init_operands (observer, pdf, rf);
@@ -204,8 +204,8 @@ CompositePdfOperator::init_operands (sha
 //
 //
 //
-shared_ptr<PdfOperator> 
-getLastOperator (shared_ptr<PdfOperator> oper)
+boost::shared_ptr<PdfOperator> 
+getLastOperator (boost::shared_ptr<PdfOperator> oper)
 {
 		if (!isCompositeOp (oper) || 0 == oper->getChildrenCount())
 			return oper;
@@ -213,7 +213,7 @@ getLastOperator (shared_ptr<PdfOperator>
 	PdfOperator::PdfOperators opers;
 	oper->getChildren (opers);
 	assert (!opers.empty());
-	shared_ptr<PdfOperator> tmpop = opers.back();
+	boost::shared_ptr<PdfOperator> tmpop = opers.back();
 	while (isCompositeOp (tmpop))
 	{
 		opers.back()->getChildren (opers);
Index: pdfedit-0.4.5/src/kernel/pdfoperatorsiter.cc
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/pdfoperatorsiter.cc
+++ pdfedit-0.4.5/src/kernel/pdfoperatorsiter.cc
@@ -74,7 +74,7 @@ template<>
 const std::string GraphicalOperatorIterator::accepted_opers[GraphicalOperatorIterator::namecount] = 
 {
 	"f", "F", "f*", "B", "S", "s", "b", "B", "B*", "n", "m", "l", "c", "v", "y", "h", "re", "w", "J", "j",
-	"M", "d", "ri", "gs"
+	"M", "d", "ri", "gs", "BI"
 };
 
 
Index: pdfedit-0.4.5/src/kernel/pdfoperatorsiter.h
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/pdfoperatorsiter.h
+++ pdfedit-0.4.5/src/kernel/pdfoperatorsiter.h
@@ -235,7 +235,7 @@ typedef struct AcceptingPdfOperatorItera
  * This iterator iterates over all graphical operators on a page this includes
  * lines, rectangles, paths.
  */
-typedef struct AcceptingPdfOperatorIterator<24, itGraphicalIterator> GraphicalOperatorIterator;
+typedef struct AcceptingPdfOperatorIterator<25, itGraphicalIterator> GraphicalOperatorIterator;
 
 
 
Index: pdfedit-0.4.5/src/kernel/pdfwriter.cc
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/pdfwriter.cc
+++ pdfedit-0.4.5/src/kernel/pdfwriter.cc
@@ -110,7 +110,7 @@ using namespace observer;
 		printf("Unsupported context.\n");
 		return;
 	}
-	shared_ptr<const IPdfWriter::ChangeContext> progressContext=
+	boost::shared_ptr<const IPdfWriter::ChangeContext> progressContext=
 		dynamic_pointer_cast<const IPdfWriter::ChangeContext>(context);
 	size_t total=progressContext->getScope()->total;
 	if(!started)
@@ -509,7 +509,7 @@ using namespace boost;
 	shared_ptr<OperationStep> newValue(new OperationStep());
 
 	// prepares offTable and writes objects
-	for(i=objectList.begin(); i!=objectList.end(); i++, index++)
+	for(i=objectList.begin(); i!=objectList.end(); ++i, index++)
 	{
 		::Ref ref=i->first;
 		Object * obj=i->second;
@@ -615,7 +615,7 @@ size_t OldStylePdfWriter::writeTrailer(c
 	utilsPrintDbg(DBG_DBG, "Creating subsection offTable");
 	
 	// goes through rest entries of offset offTable
-	for(OffsetTab::iterator i=offTable.begin(); i!=offTable.end(); i++)
+	for(OffsetTab::iterator i=offTable.begin(); i!=offTable.end(); ++i)
 	{
 		int num=(i->first).num;
 		int gen=(i->first).gen;
@@ -659,14 +659,14 @@ size_t OldStylePdfWriter::writeTrailer(c
 	utilsPrintDbg(DBG_DBG, "Writing "<<subSectionTable.size()<<" subsections");
 	
 	// creates context for observers
-	shared_ptr<OperationScope> scope(new OperationScope());
+	boost::shared_ptr<OperationScope> scope(new OperationScope());
 	scope->total=subSectionTable.size();
 	scope->task=TRAILER;
-	shared_ptr<ChangeContext> context(new ChangeContext(scope));
+	boost::shared_ptr<ChangeContext> context(new ChangeContext(scope));
 
 	// writes all subsection
 	size_t index=1;
-	for(SubSectionTab::iterator i=subSectionTable.begin(); i!=subSectionTable.end(); i++, index++)
+	for(SubSectionTab::iterator i=subSectionTable.begin(); i!=subSectionTable.end(); ++i, index++)
 	{
 		// at first writes head object number and number of elements in the
 		// subsection
@@ -690,7 +690,7 @@ size_t OldStylePdfWriter::writeTrailer(c
 		// 		     end of line character, it is preceeded by one space.
 		// Each entry is exactly 20 bytes long including the end-of-line marker.
 		// We don't provide information about free objects
-		for(EntriesType::iterator entry=entries.begin(); entry!=entries.end(); entry++)
+		for(EntriesType::iterator entry=entries.begin(); entry!=entries.end(); ++entry)
 		{
 			int ret = snprintf(xrefRow, sizeof(xrefRow)-1, 
 					"%010u %05i n ", 
@@ -704,7 +704,7 @@ size_t OldStylePdfWriter::writeTrailer(c
 		}
 		
 		// notifies observers
-		shared_ptr<OperationStep> newValue(new OperationStep());
+		boost::shared_ptr<OperationStep> newValue(new OperationStep());
 		newValue->currStep=index;
 		notifyObservers(newValue, context);
 	}
@@ -922,7 +922,7 @@ using namespace debug;
 		utilsPrintDbg(DBG_DBG, "Cleaning up all writen objects("
 				<<objectList.size()<<").");
 		IPdfWriter::ObjectList::iterator i;
-		for(i=objectList.begin(); i!=objectList.end(); i++)
+		for(i=objectList.begin(); i!=objectList.end(); ++i)
 		{
 			xpdf::freeXpdfObject(i->second);
 			i->second=NULL;
Index: pdfedit-0.4.5/src/kernel/stateupdater.cc
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/stateupdater.cc
+++ pdfedit-0.4.5/src/kernel/stateupdater.cc
@@ -689,8 +689,17 @@ namespace {
 		utilsPrintDbg (DBG_DBG, "NOT IMPLEMENTED");
 		utilsPrintDbg (DBG_DBG, " " << op->getParametersCount() << " , " << op->getChildrenCount());
 
-		// Set edge of rectangle from actual position on output devices
-		state->transform(state->getCurX (), state->getCurY(), & rc->xright, & rc->yright);
+		
+		const InlineImageCompositePdfOperator* image_op = dynamic_cast<InlineImageCompositePdfOperator*>(op.get());
+		
+		
+		// we know the width/height so add it to x,y left top corner
+		// 4.8.3 pdf spec 
+		// The coordinate origin (0, 0) is at the upper-left corner of the image,
+		// with coordinates ranging from 0 to w horizontally and 0 to h vertically.
+		//
+		rc->xright = rc->xleft + image_op->getWidth();
+		rc->yright = rc->yleft - image_op->getHeight();
 		
 		// return changed state
 		return state;
Index: pdfedit-0.4.5/src/kernel/textoutputengines.cc
===================================================================
--- pdfedit-0.4.5.orig/src/kernel/textoutputengines.cc
+++ pdfedit-0.4.5/src/kernel/textoutputengines.cc
@@ -232,13 +232,13 @@ namespace {
 			PdfOperator::Operands ops;
 			op->getParameters (ops);
 			assert (1 == ops.size());
-			shared_ptr<CArray> array = IProperty::getSmartCObjectPtr<CArray> (ops.front());
+			boost::shared_ptr<CArray> array = IProperty::getSmartCObjectPtr<CArray> (ops.front());
 			//
 			// Loop through TJ operands either strings or nums
 			//
 			for (size_t i = 0; i < array->getPropertyCount(); ++i)
 			{
-				shared_ptr<IProperty> ip = array->getProperty (i);
+				boost::shared_ptr<IProperty> ip = array->getProperty (i);
 				if (isNumber (ip))
 				{
 					int wMode = s->getFont()->getWMode();
@@ -253,8 +253,8 @@ namespace {
 					// Create Tj with text and add it to output
 					string txt = getStringFromIProperty (ip);
 					PdfOperator::Operands opers;
-					opers.push_back (shared_ptr<CString> (new CString (txt)));
-					shared_ptr<PdfOperator> newop = createOperator ("Tj", opers);
+					opers.push_back (boost::shared_ptr<CString> (new CString (txt)));
+					boost::shared_ptr<PdfOperator> newop = createOperator ("Tj", opers);
 					// Set bbox 
 					BBox bbox;
 					StateUpdater::printTextUpdate (s.get(), txt, &bbox);
Index: pdfedit-0.4.5/src/os/win.h
===================================================================
--- pdfedit-0.4.5.orig/src/os/win.h
+++ pdfedit-0.4.5/src/os/win.h
@@ -35,7 +35,11 @@
 #undef _HAS_ITERATOR_DEBUGGING
 #endif
 // boost won't work otherwise!
+#ifdef DEBUG
 #define _HAS_ITERATOR_DEBUGGING 1
+#else
+#define _HAS_ITERATOR_DEBUGGING 0
+#endif
 
 
 #include <time.h>
Index: pdfedit-0.4.5/src/qsa/.gitignore
===================================================================
--- /dev/null
+++ pdfedit-0.4.5/src/qsa/.gitignore
@@ -0,0 +1,3 @@
+*.moc
+Makefile.qsa
+*.qmake.cache
Index: pdfedit-0.4.5/src/qsa/src/editor/.gitignore
===================================================================
--- /dev/null
+++ pdfedit-0.4.5/src/qsa/src/editor/.gitignore
@@ -0,0 +1,4 @@
+moc_qsabrowser.cpp
+moc_qsacompletion.cpp
+moc_qsaeditor.cpp
+moc_qsaeditorinterface.cpp
Index: pdfedit-0.4.5/src/qsa/src/engine/.gitignore
===================================================================
--- /dev/null
+++ pdfedit-0.4.5/src/qsa/src/engine/.gitignore
@@ -0,0 +1,2 @@
+moc_qsengine.cpp
+moc_qstimeouttrigger.cpp
Index: pdfedit-0.4.5/src/qsa/src/kernel/.gitignore
===================================================================
--- /dev/null
+++ pdfedit-0.4.5/src/qsa/src/kernel/.gitignore
@@ -0,0 +1,4 @@
+moc_quickdebugger.cpp
+moc_quickdispatchobject.cpp
+moc_quickinterpreter.cpp
+moc_quickobjects.cpp
Index: pdfedit-0.4.5/src/qsa/src/qsa/.gitignore
===================================================================
--- /dev/null
+++ pdfedit-0.4.5/src/qsa/src/qsa/.gitignore
@@ -0,0 +1,6 @@
+Makefile
+qsconfig.h
+moc_qseditor.cpp
+moc_qsinterpreter.cpp
+moc_qsproject.cpp
+moc_qsscript.cpp
Index: pdfedit-0.4.5/src/qsa/tools/designer/editor/.gitignore
===================================================================
--- /dev/null
+++ pdfedit-0.4.5/src/qsa/tools/designer/editor/.gitignore
@@ -0,0 +1,9 @@
+preferences.cpp
+preferences.h
+moc_arghintwidget.cpp
+moc_browser.cpp
+moc_completion.cpp
+moc_editor.cpp
+moc_markerwidget.cpp
+moc_preferences.cpp
+moc_viewmanager.cpp
Index: pdfedit-0.4.5/src/tests/kernel/.gitignore
===================================================================
--- /dev/null
+++ pdfedit-0.4.5/src/tests/kernel/.gitignore
@@ -0,0 +1,2 @@
+kernel_tests
+deps
Index: pdfedit-0.4.5/src/tests/kernel/testccontentstream.cc
===================================================================
--- pdfedit-0.4.5.orig/src/tests/kernel/testccontentstream.cc
+++ pdfedit-0.4.5/src/tests/kernel/testccontentstream.cc
@@ -61,12 +61,10 @@ setCS (UNUSED_PARAM	ostream& oss, const
 		string tmp1, tmp2;
 		cs->getStringRepresentation (tmp1);
 		//oss << tmp << std::endl;
-		#if TEMP_FILES_CREATE
 			ofstream of1;
 			of1.open ("1.txt");
 			of1 << tmp1 << flush;
 			of1.close();
-		#endif
 	
 		// parse the content stream after change
 		CStream::Buffer buf;
@@ -77,9 +75,7 @@ setCS (UNUSED_PARAM	ostream& oss, const
 		//
 		boost::shared_ptr<CDict> dict = page->getDictionary();
 		assert (dict);
-		boost::shared_ptr<IProperty> cstream = utils::getReferencedObject (dict->getProperty("Contents"));
-		if (isStream(cstream))
-			IProperty::getSmartCObjectPtr<CStream> (cstream)->setBuffer (buf);
+		dict->getProperty<CStream>("Contents")->setBuffer(buf);
 		cs->getStringRepresentation (tmp2);
 		
 		//
Index: pdfedit-0.4.5/src/tests/kernel/testcpage.cc
===================================================================
--- pdfedit-0.4.5.orig/src/tests/kernel/testcpage.cc
+++ pdfedit-0.4.5/src/tests/kernel/testcpage.cc
@@ -695,33 +695,21 @@ public:
 				if(annotsListSize)
 				{
 					// annotations are presented
-					shared_ptr<IProperty> annotsProp=pageDict->getProperty("Annots");
-					shared_ptr<CArray> annotsArray;
-					if(isRef(annotsProp))
-						annotsArray=getCObjectFromRef<CArray>(annotsProp);
-					else
-						if(isArray(annotsProp))
-							annotsArray=IProperty::getSmartCObjectPtr<CArray>(annotsProp);
+					shared_ptr<CArray> annotsArray = pageDict->getProperty<CArray>("Annots");
 					if(annotsArray.get())
 					{
 						// collects all annotation referencies from array
 						CPage::Annotations storage;
 						for(size_t i=0; i<annotsArray->getPropertyCount(); i++)
 						{
-							shared_ptr<IProperty> child=annotsArray->getProperty(i);
-							if(isRef(child))
+							try
 							{
-								try
-								{
-									shared_ptr<CDict> annotDict=getCObjectFromRef<CDict>(child);
-									storage.push_back(shared_ptr<CAnnotation>(
-												shared_ptr<CAnnotation>(new CAnnotation(annotDict)))
-											);	
-								}catch(std::exception & e)
-								{
-									// target is not a dictionary or CAnnotation
-									// has failed
-								}
+								shared_ptr<CDict> annotDict=annotsArray->getProperty<CDict>(i);
+								storage.push_back(shared_ptr<CAnnotation>(new CAnnotation(annotDict)));	
+							}catch(std::exception & e)
+							{
+								// target is not a dictionary or CAnnotation
+								// has failed
 							}
 						}
 						CPPUNIT_ASSERT(storage.size()==annotsListSize);
@@ -754,7 +742,7 @@ public:
 				CPPUNIT_ASSERT(annotsList.size()==0);
 
 				// adds text annotation to the array
-				annotsArray=getCObjectFromRef<CArray>(pageDict->getProperty("Annots"));
+				annotsArray=pageDict->getProperty<CArray>("Annots");
 				libs::Rectangle rect(0,0,100,100);
 				shared_ptr<CAnnotation> annot=CAnnotation::createAnnotation(rect, "Text");
 				IndiRef annotRef=pdf->addIndirectProperty(annot->getDictionary());
@@ -765,7 +753,7 @@ public:
 				
 				// changes reference value of first reference (mess one) to text
 				// annotation
-				annotCRef=IProperty::getSmartCObjectPtr<CRef>(annotsArray->getProperty(0));
+				annotCRef=annotsArray->getProperty<CRef>(0);
 				annotCRef->setValue(annotRef);
 				page->getAllAnnotations(annotsList);
 				CPPUNIT_ASSERT(annotsList.size()==2);
@@ -776,7 +764,7 @@ public:
 				CPPUNIT_ASSERT(annotsList.size()==1);
 				
 				// changes Annots property reference value to messRef
-				annotsArrayCRef=IProperty::getSmartCObjectPtr<CRef>(pageDict->getProperty("Annots"));
+				annotsArrayCRef=pageDict->getProperty<CRef>("Annots");
 				annotsArrayCRef->setValue(messRef);
 				page->getAllAnnotations(annotsList);
 				CPPUNIT_ASSERT(annotsList.size()==0);
Index: pdfedit-0.4.5/src/tests/kernel/testcstream.cc
===================================================================
--- pdfedit-0.4.5.orig/src/tests/kernel/testcstream.cc
+++ pdfedit-0.4.5/src/tests/kernel/testcstream.cc
@@ -73,10 +73,7 @@ bool setbuffer (UNUSED_PARAM	std::ostrea
 	buf.push_back ('l');
 	buf.push_back ('o');
 	
-	shared_ptr<IProperty> ilen = utils::getReferencedObject (stream->getProperty ("Length"));
-	assert (isInt(ilen));
-	shared_ptr<CInt> clen = IProperty::getSmartCObjectPtr<CInt> (ilen);
-	assert (isInt(ilen));
+	shared_ptr<CInt> clen = stream->getProperty<CInt> ("Length");
 	int len = 0;
 	clen->getValue (len);
 	//oss << "Length: " << len << " " << flush;
Index: pdfedit-0.4.5/src/tools/.gitignore
===================================================================
--- /dev/null
+++ pdfedit-0.4.5/src/tools/.gitignore
@@ -0,0 +1,16 @@
+add_image
+add_text
+delinearizator
+deps
+displaycs
+flattener
+pagemetrics
+parse_object
+pdf_images
+pdf_object_comparer
+pdf_object_printer
+pdf_page_from_ref
+pdf_page_to_ref
+pdf_to_bmp
+pdf_to_text
+replace_text
Index: pdfedit-0.4.5/src/tools/Makefile
===================================================================
--- pdfedit-0.4.5.orig/src/tools/Makefile
+++ pdfedit-0.4.5/src/tools/Makefile
@@ -10,6 +10,7 @@ UTILS_OBJS = $(UTILS_SRCS:.cc=.o)
 
 TOOLS_LIBS = $(MANDATORY_LIBS) $(BOOSTPROGRAMOPTIONS_LIBS)
 
+CXXFLAGS += $(PNGFLAGS)
 # sources for benchmark modules
 TARGET_SRCS = displaycs.cc pagemetrics.cc parse_object.cc pdf_object_printer.cc \
 	      pdf_page_from_ref.cc pdf_page_to_ref.cc flattener.cc delinearizator.cc \
@@ -29,16 +30,16 @@ displaycs: displaycs.o
 	$(LINK) $(LDFLAGS) -o displaycs displaycs.o $(TOOLS_LIBS)
 
 pagemetrics: pagemetrics.o 
-	$(LINK) $(LDFALGS) -o pagemetrics pagemetrics.o $(TOOLS_LIBS)
+	$(LINK) $(LDFLAGS) -o pagemetrics pagemetrics.o $(TOOLS_LIBS)
 
 pdf_object_printer: pdf_object_printer.o $(UTILS_OBJS)
-	$(LINK) $(LDFALGS) -o pdf_object_printer pdf_object_printer.o $(UTILS_OBJS) $(TOOLS_LIBS)
+	$(LINK) $(LDFLAGS) -o pdf_object_printer pdf_object_printer.o $(UTILS_OBJS) $(TOOLS_LIBS)
 
 pdf_page_from_ref: pdf_page_from_ref.o $(UTILS_OBJS)
-	$(LINK) $(LDFALGS) -o pdf_page_from_ref pdf_page_from_ref.o $(UTILS_OBJS) $(TOOLS_LIBS)
+	$(LINK) $(LDFLAGS) -o pdf_page_from_ref pdf_page_from_ref.o $(UTILS_OBJS) $(TOOLS_LIBS)
 
 pdf_page_to_ref: pdf_page_to_ref.o $(UTILS_OBJS)
-	$(LINK) $(LDFALGS) -o pdf_page_to_ref pdf_page_to_ref.o $(UTILS_OBJS) $(TOOLS_LIBS)
+	$(LINK) $(LDFLAGS) -o pdf_page_to_ref pdf_page_to_ref.o $(UTILS_OBJS) $(TOOLS_LIBS)
 
 delinearizator: delinearizator.o
 	$(LINK) $(LDFLAGS) -o delinearizator delinearizator.o $(TOOLS_LIBS)
@@ -59,7 +60,7 @@ add_text: add_text.o
 	$(LINK) $(LDFLAGS) -o add_text add_text.o $(TOOLS_LIBS)
 
 add_image: add_image.o
-	$(LINK) $(LDFLAGS) -o add_image add_image.o $(TOOLS_LIBS) -lpng
+	$(LINK) $(LDFLAGS) -o add_image add_image.o $(TOOLS_LIBS) $(PNG_LIBS)
 
 pdf_to_bmp: pdf_to_bmp.o
 	$(LINK) $(LDFLAGS) -o pdf_to_bmp pdf_to_bmp.o $(TOOLS_LIBS)
Index: pdfedit-0.4.5/src/tools/pdf_to_text.cc
===================================================================
--- pdfedit-0.4.5.orig/src/tools/pdf_to_text.cc
+++ pdfedit-0.4.5/src/tools/pdf_to_text.cc
@@ -35,21 +35,37 @@ namespace po = program_options;
 
 namespace {
 
+	// default values
+	const string DEFAULT_ENCODING( "UTF-8" );
+	const bool DEFAULT_OUTPUT_PAGES = false;
+	const string DEFAULT_FONT_DIR( "." );
+
 	// pages
 	typedef vector<size_t> Pages;
 	// library wrapper
 	struct _pdf_lib {
 		bool _ok;
-		_pdf_lib (int argc, char ** argv) {_ok = (0 == pdfedit_core_dev_init(&argc, &argv));}
+		_pdf_lib (int argc, char ** argv, const string& font_dir) {
+			struct pdfedit_core_dev_init init = {0};
+			init.fontDir = font_dir.c_str();
+			_ok = (0 == pdfedit_core_dev_init(&argc, &argv, &init));
+		}
 		~_pdf_lib () {pdfedit_core_dev_destroy();}
 	};
 	// what to do with a page
 	struct _textify {
-		string operator () (shared_ptr<CPage> page)
+		string operator () (shared_ptr<CPage> page, const string& encoding)
 		{
+			// Update display params to use media box not default page rect (DEFAULT_PAGE_RX, DEFAULT_PAGE_RY)
+			// TODO upsidedown? get/set
+			DisplayParams dp;
+			dp.useMediaBox = gTrue;
+			dp.crop = gFalse;
+			dp.rotate = page->getRotation ();
+			page->setDisplayParams (dp);
+
 			string text;
-			static const std::string encoding="UTF-8";
-			page->getText (text, &encoding);
+			page->getText( text, &encoding );
 			return text;
 		}
 	};
@@ -66,6 +82,9 @@ main(int argc, char ** argv)
 		("help", "produce help message")
 		("file", po::value<string>(), "input file")
 		("what", po::value<Pages>(), "pages to convert")
+		("output-pages", po::value<bool>()->default_value(DEFAULT_OUTPUT_PAGES), "output page number before each page")
+		("encoding", po::value<string>()->default_value(DEFAULT_ENCODING), "encoding to use")
+		("font-dir", po::value<string>()->default_value(DEFAULT_FONT_DIR), "(xpdf) font directory with font definitions(e.g. N019003L.PFB)")
 	;
 
 	po::variables_map vm;
@@ -84,6 +103,9 @@ main(int argc, char ** argv)
 			return 1;
 		}
 	string file = vm["file"].as<string>(); 
+	bool output_pages = vm["output-pages"].as<bool>(); 
+	string encoding = vm["encoding"].as<string>(); 
+	string font_dir = vm["font-dir"].as<string>(); 
 	
 	Pages pages;
 	if (vm.count("what"))
@@ -92,7 +114,7 @@ main(int argc, char ** argv)
 	try
 	{
 		// pdf lib init & work
-		_pdf_lib _lib(argc, argv);
+		_pdf_lib _lib(argc, argv, font_dir);
 			if (!_lib._ok)
 				return 1;
 
@@ -104,7 +126,9 @@ main(int argc, char ** argv)
 			for (size_t i = 1; i <= pdf->getPageCount(); ++i)
 			{
 				shared_ptr<CPage> page = pdf->getPage(i);
-				std::cout << "\nPage " << i << ":\n" << _textify()(page);
+				if (output_pages)
+					std::cout << "\nPage " << i << ":\n";
+				std::cout << _textify()(page, encoding);
 			}
 		}
 		
@@ -118,12 +142,15 @@ main(int argc, char ** argv)
 				}
 
 			shared_ptr<CPage> page = pdf->getPage(*it);
-			std::cout << "\nPage " << *it << ":\n" << _textify()(page);
+			if (output_pages)
+				std::cout << "\nPage " << *it << ":\n";
+			std::cout << _textify()(page, encoding);
 		}
 
 	}catch (std::exception& e)
 	{
 		std::cout << "exception - " << e.what();
+		return -1;
 	}
 
 	return 0;
Index: pdfedit-0.4.5/src/tools/replace_text.cc
===================================================================
--- pdfedit-0.4.5.orig/src/tools/replace_text.cc
+++ pdfedit-0.4.5/src/tools/replace_text.cc
@@ -137,7 +137,7 @@ main(int argc, char ** argv)
 
 
 		// sane values
-		to = std::min(to, pdf->getPageCount()+1);
+		to = std::min(static_cast<unsigned int>(to), pdf->getPageCount()+1);
 
 		// 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)
Index: pdfedit-0.4.5/src/xpdf/fofi/FoFiType1.cc
===================================================================
--- pdfedit-0.4.5.orig/src/xpdf/fofi/FoFiType1.cc
+++ pdfedit-0.4.5/src/xpdf/fofi/FoFiType1.cc
@@ -224,7 +224,7 @@ void FoFiType1::parse() {
 		code = code * 8 + (*p2 - '0');
 	      }
 	    }
-	    if (code < 256) {
+	    if (code < 256 && code >= 0) {
 	      for (p = p2; *p == ' ' || *p == '\t'; ++p) ;
 	      if (*p == '/') {
 		++p;
Index: pdfedit-0.4.5/src/xpdf/goo/GString.cc
===================================================================
--- pdfedit-0.4.5.orig/src/xpdf/goo/GString.cc
+++ pdfedit-0.4.5/src/xpdf/goo/GString.cc
@@ -229,9 +229,9 @@ GString *GString::appendfv(char *fmt, va
   int idx, width, prec;
   GBool reverseAlign, zeroFill;
   GStringFormatType ft;
-  char buf[65];
-  int len, i;
-  char *p0, *p1, *str;
+  char buf[65] = {};
+  int len=0, i=0;
+  char *p0, *p1, *str = NULL;
 
   argsLen = 0;
   argsSize = 8;
@@ -623,7 +623,7 @@ GString *GString::upperCase() {
   int i;
 
   for (i = 0; i < length; ++i) {
-    if (islower(s[i]))
+    if (islower((unsigned char)s[i]))
       s[i] = toupper(s[i]);
   }
   return this;
@@ -633,7 +633,7 @@ GString *GString::lowerCase() {
   int i;
 
   for (i = 0; i < length; ++i) {
-    if (isupper(s[i]))
+    if (isupper((unsigned char)s[i]))
       s[i] = tolower(s[i]);
   }
   return this;
Index: pdfedit-0.4.5/src/xpdf/xpdf/CharCodeToUnicode.cc
===================================================================
--- pdfedit-0.4.5.orig/src/xpdf/xpdf/CharCodeToUnicode.cc
+++ pdfedit-0.4.5/src/xpdf/xpdf/CharCodeToUnicode.cc
@@ -320,10 +320,15 @@ void CharCodeToUnicode::addMapping(CharC
   if (code >= mapLen) {
     oldLen = mapLen;
     mapLen = (code + 256) & ~255;
-    map = (Unicode *)greallocn(map, mapLen, sizeof(Unicode));
-    for (i = oldLen; i < mapLen; ++i) {
-      map[i] = 0;
-    }
+    if (code >= mapLen) {
+      error(-1, "Illegal code value in CharCodeToUnicode::addMapping");
+      return;
+    } else {
+      map = (Unicode *)greallocn(map, mapLen, sizeof(Unicode));
+      for (i = oldLen; i < mapLen; ++i) {
+        map[i] = 0;
+      }
+	}
   }
   if (n <= 4) {
     if (sscanf(uStr, "%x", &u) != 1) {
@@ -481,6 +486,31 @@ int CharCodeToUnicode::mapToUnicode(Char
   return 0;
 }
 
+static bool isUnicodeSame(const Unicode *u1, int size1, const Unicode *u2, int size2) {
+	if (size1 != size2)
+		return false;
+	for (int i = 0; i < size1; ++i)
+		if (u1[i] != u2[i])
+			return false;
+	return true;
+}
+
+CharCode CharCodeToUnicode::mapFromUnicode(const Unicode *u, int size)const {
+	int i;
+	if (size == 1) {
+		for (CharCode j = 0; j < mapLen; ++j)
+			if (map[j] == *u)
+				return j;
+	}
+	for (i = 0; i < sMapLen; ++i) {
+		if (isUnicodeSame(u, size, sMap[i].u, sMap[i].len))
+			return sMap[i].c;
+	}
+
+	// Nothing found
+	return -1;
+}
+
 //------------------------------------------------------------------------
 
 CharCodeToUnicodeCache::CharCodeToUnicodeCache(int sizeA) {
Index: pdfedit-0.4.5/src/xpdf/xpdf/CharCodeToUnicode.h
===================================================================
--- pdfedit-0.4.5.orig/src/xpdf/xpdf/CharCodeToUnicode.h
+++ pdfedit-0.4.5/src/xpdf/xpdf/CharCodeToUnicode.h
@@ -67,6 +67,10 @@ public:
   // Map a CharCode to Unicode.
   int mapToUnicode(CharCode c, Unicode *u, int size)const;
 
+  // maps given unicode with the given size (in bytes) to the char
+  // code
+  CharCode mapFromUnicode(const Unicode *u, int size)const;
+
   // Return the mapping's length, i.e., one more than the max char
   // code supported by the mapping.
   CharCode getLength()const { return mapLen; }
Index: pdfedit-0.4.5/src/xpdf/xpdf/Function.cc
===================================================================
--- pdfedit-0.4.5.orig/src/xpdf/xpdf/Function.cc
+++ pdfedit-0.4.5/src/xpdf/xpdf/Function.cc
@@ -401,7 +401,11 @@ void SampledFunction::transform(const do
       for (k = 0, t = j; k < m; ++k, t >>= 1) {
 	idx += idxMul[k] * (e[k][t & 1]);
       }
-      sBuf[j] = samples[idx];
+      if (idx >= 0 && idx < nSamples) {
+        sBuf[j] = samples[idx];
+      } else {
+        sBuf[j] = 0;
+      }
     }
 
     // do m sets of interpolations
@@ -1089,7 +1093,7 @@ GBool PostScriptFunction::parseCode(Stre
   char *p;
   GBool isReal;
   int opPtr, elsePtr;
-  int a, b, mid, cmp;
+  int a, b, mid, cmp = 0;
 
   while (1) {
     if (!(tok = getToken(str))) {
@@ -1097,7 +1101,7 @@ GBool PostScriptFunction::parseCode(Stre
       return gFalse;
     }
     p = tok->getCString();
-    if (isdigit(*p) || *p == '.' || *p == '-') {
+    if (isdigit((unsigned char)*p) || *p == '.' || *p == '-') {
       isReal = gFalse;
       for (++p; *p; ++p) {
 	if (*p == '.') {
@@ -1222,17 +1226,17 @@ GString *PostScriptFunction::getToken(St
       }
     } else if (c == '%') {
       comment = gTrue;
-    } else if (!isspace(c)) {
+    } else if (!isspace((unsigned char)c)) {
       break;
     }
   }
   if (c == '{' || c == '}') {
     s->append((char)c);
-  } else if (isdigit(c) || c == '.' || c == '-') {
+  } else if (isdigit((unsigned char)c) || c == '.' || c == '-') {
     while (1) {
       s->append((char)c);
       c = str->lookChar();
-      if (c == EOF || !(isdigit(c) || c == '.' || c == '-')) {
+      if (c == EOF || !(isdigit((unsigned char)c) || c == '.' || c == '-')) {
 	break;
       }
       str->getChar();
@@ -1242,7 +1246,7 @@ GString *PostScriptFunction::getToken(St
     while (1) {
       s->append((char)c);
       c = str->lookChar();
-      if (c == EOF || !isalnum(c)) {
+      if (c == EOF || !isalnum((unsigned char)c)) {
 	break;
       }
       str->getChar();
Index: pdfedit-0.4.5/src/xpdf/xpdf/Gfx.cc
===================================================================
--- pdfedit-0.4.5.orig/src/xpdf/xpdf/Gfx.cc
+++ pdfedit-0.4.5/src/xpdf/xpdf/Gfx.cc
@@ -475,6 +475,8 @@ Gfx::Gfx(XRef *xrefA, OutputDev *outA, i
     out->clip(state);
     state->clearPath();
   }
+
+  parser = NULL;
 }
 
 Gfx::Gfx(XRef *xrefA, OutputDev *outA, const Dict *resDict,
@@ -514,6 +516,8 @@ Gfx::Gfx(XRef *xrefA, OutputDev *outA, c
     out->clip(state);
     state->clearPath();
   }
+
+  parser = NULL;
 }
 
 Gfx::~Gfx() {
@@ -1245,6 +1249,8 @@ void Gfx::opSetFillColorN(Object args[],
       for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) {
 	if (args[i].isNum()) {
 	  color.c[i] = dblToCol(args[i].getNum());
+	} else {
+	  color.c[i] = 0; // TODO Investigate if this is what Adobe does
 	}
       }
       state->setFillColor(&color);
@@ -1264,6 +1270,8 @@ void Gfx::opSetFillColorN(Object args[],
     for (i = 0; i < numArgs && i < gfxColorMaxComps; ++i) {
       if (args[i].isNum()) {
 	color.c[i] = dblToCol(args[i].getNum());
+      } else {
+        color.c[i] = 0; // TODO Investigate if this is what Adobe does
       }
     }
     state->setFillColor(&color);
@@ -1288,6 +1296,8 @@ void Gfx::opSetStrokeColorN(Object args[
       for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) {
 	if (args[i].isNum()) {
 	  color.c[i] = dblToCol(args[i].getNum());
+	} else {
+	  color.c[i] = 0; // TODO Investigate if this is what Adobe does
 	}
       }
       state->setStrokeColor(&color);
@@ -1307,6 +1317,8 @@ void Gfx::opSetStrokeColorN(Object args[
     for (i = 0; i < numArgs && i < gfxColorMaxComps; ++i) {
       if (args[i].isNum()) {
 	color.c[i] = dblToCol(args[i].getNum());
+      } else {
+        color.c[i] = 0; // TODO Investigate if this is what Adobe does
       }
     }
     state->setStrokeColor(&color);
@@ -3138,7 +3150,7 @@ void Gfx::doShowText(const GString *s) {
   int wMode;
   double riseX, riseY;
   CharCode code;
-  Unicode u[8];
+  Unicode u[8] = {0};
   double x, y, dx, dy, dx2, dy2, curX, curY, tdx, tdy, lineX, lineY;
   double originX, originY, tOriginX, tOriginY;
   double oldCTM[6], newCTM[6];
@@ -3719,8 +3731,14 @@ void Gfx::doForm(const Object *str) {
   }
   for (i = 0; i < 4; ++i) {
     bboxObj.arrayGet(i, &obj1);
-    bbox[i] = obj1.getNum();
-    obj1.free();
+    if (obj1.isNum()) {
+      bbox[i] = obj1.getNum();
+      obj1.free();
+    } else {
+      obj1.free();
+      error(getPos(), "Bad form bounding box value");
+      return;
+    }
   }
   bboxObj.free();
 
@@ -3936,9 +3954,13 @@ Stream *Gfx::buildImageStream() {
   obj.free();
 
   // make stream
-  str = new EmbedStream(parser->getStream(), &dict, gFalse, 0);
-  if (str)
+  if (parser->getStream()) {
+    str = new EmbedStream(parser->getStream(), &dict, gFalse, 0);
     str = str->addFilters(&dict);
+  } else {
+    str = NULL;
+    dict.free();
+  }
 
   return str;
 
@@ -4072,8 +4094,14 @@ void Gfx::drawAnnot(Object *str, AnnotBo
     }
     for (i = 0; i < 4; ++i) {
       bboxObj.arrayGet(i, &obj1);
-      bbox[i] = obj1.getNum();
-      obj1.free();
+      if (obj1.isNum()) {
+        bbox[i] = obj1.getNum();
+        obj1.free();
+      } else {
+        obj1.free();
+        error(getPos(), "Bad form bounding box value");
+        return;
+      }
     }
     bboxObj.free();
 
Index: pdfedit-0.4.5/src/xpdf/xpdf/GfxFont.cc
===================================================================
--- pdfedit-0.4.5.orig/src/xpdf/xpdf/GfxFont.cc
+++ pdfedit-0.4.5/src/xpdf/xpdf/GfxFont.cc
@@ -400,6 +400,11 @@ char *GfxFont::readEmbFontFile(XRef *xre
   return buf;
 }
 
+CharCode GfxFont::getCodeFromUnicode(const Unicode *u, int uSize)const {
+	CharCode c = getCtu()->mapFromUnicode(u, uSize);
+	return (c & 0xff);
+}
+
 //------------------------------------------------------------------------
 // Gfx8BitFont
 //------------------------------------------------------------------------
@@ -712,7 +717,7 @@ Gfx8BitFont::Gfx8BitFont(XRef *xref, con
 	// name that looks like 'Axx' or 'xx', where 'A' is any letter
 	// and 'xx' is two hex digits
 	if ((strlen(charName) == 3 &&
-	     isalpha(charName[0]) &&
+	     isalpha((unsigned char)charName[0]) &&
 	     isxdigit((unsigned char)charName[1]) && isxdigit((unsigned char)charName[2]) &&
 	     ((charName[1] >= 'a' && charName[1] <= 'f') ||
 	      (charName[1] >= 'A' && charName[1] <= 'F') ||
@@ -743,7 +748,7 @@ Gfx8BitFont::Gfx8BitFont(XRef *xref, con
 	  strcmp(charName, ".notdef")) {
 	n = strlen(charName);
 	code2 = -1;
-	if (hex && n == 3 && isalpha(charName[0]) &&
+	if (hex && n == 3 && isalpha((unsigned char)charName[0]) &&
 	    isxdigit((unsigned char)charName[1]) && isxdigit((unsigned char)charName[2])) {
 	  sscanf(charName+1, "%x", &code2);
 	} else if (hex && n == 2 &&
@@ -1429,7 +1434,8 @@ int GfxCIDFont::getNextChar(const char *
   if (ctu) {
     *uLen = ctu->mapToUnicode(cid, u, uSize);
   } else {
-    *uLen = 0;
+    u[0] = *code;
+    *uLen = 1;
   }
 
   // horizontal
Index: pdfedit-0.4.5/src/xpdf/xpdf/GfxFont.h
===================================================================
--- pdfedit-0.4.5.orig/src/xpdf/xpdf/GfxFont.h
+++ pdfedit-0.4.5/src/xpdf/xpdf/GfxFont.h
@@ -165,12 +165,16 @@ public:
 			  Unicode *u, int uSize, int *uLen,
 			  double *dx, double *dy, double *ox, double *oy)const = 0;
 
+  // Transfroms given unicode to the code which can be stored to the
+  // text operator - this is kind of inversion function to getNextChar
+  virtual CharCode getCodeFromUnicode(const Unicode *u, int uSize)const;
 protected:
 
   void readFontDescriptor(XRef *xref, const Dict *fontDict);
   CharCodeToUnicode *readToUnicodeCMap(const Dict *fontDict, int nBits,
 				       CharCodeToUnicode *ctu)const;
   void findExtFontFile();
+  virtual const CharCodeToUnicode * getCtu()const =0;
 
   GString *tag;			// PDF font tag
   Ref id;			// reference (used as unique ID)
@@ -236,6 +240,9 @@ public:
   // Return the Type 3 Resources dictionary, or NULL if none.
   const Dict *getResources()const;
 
+protected:
+  const CharCodeToUnicode *getCtu()const { return ctu; }
+
 private:
 
   char *enc[256];		// char code --> char name
@@ -280,7 +287,8 @@ public:
   // if type is fontCIDType2.
   const Gushort *getCIDToGID()const { return cidToGID; }
   int getCIDToGIDLen()const { return cidToGIDLen; }
-
+protected:
+  const CharCodeToUnicode *getCtu()const { return ctu; }
 private:
 
   CMap *cMap;			// char code --> CID
Index: pdfedit-0.4.5/src/xpdf/xpdf/GlobalParams.cc
===================================================================
--- pdfedit-0.4.5.orig/src/xpdf/xpdf/GlobalParams.cc
+++ pdfedit-0.4.5/src/xpdf/xpdf/GlobalParams.cc
@@ -962,7 +962,7 @@ void GlobalParams::parseLine(const char
   tokens = new GList();
   p1 = buf;
   while (*p1) {
-    for (; *p1 && isspace(*p1); ++p1) ;
+    for (; *p1 && isspace((unsigned char)*p1); ++p1) ;
     if (!*p1) {
       break;
     }
@@ -970,7 +970,7 @@ void GlobalParams::parseLine(const char
       for (p2 = p1 + 1; *p2 && *p2 != *p1; ++p2) ;
       ++p1;
     } else {
-      for (p2 = p1 + 1; *p2 && !isspace(*p2); ++p2) ;
+      for (p2 = p1 + 1; *p2 && !isspace((unsigned char)*p2); ++p2) ;
     }
     tokens->append(new GString(p1, p2 - p1));
     p1 = *p2 ? p2 + 1 : p2;
Index: pdfedit-0.4.5/src/xpdf/xpdf/JPXStream.cc
===================================================================
--- pdfedit-0.4.5.orig/src/xpdf/xpdf/JPXStream.cc
+++ pdfedit-0.4.5/src/xpdf/xpdf/JPXStream.cc
@@ -876,10 +876,10 @@ GBool JPXStream::readColorSpecBox(Guint
 GBool JPXStream::readCodestream(Guint len) {
   JPXTile *tile;
   JPXTileComp *tileComp;
-  int segType;
+  int segType=0;
   GBool haveSIZ, haveCOD, haveQCD, haveSOT;
-  Guint precinctSize, style;
-  Guint segLen, capabilities, comp, i, j, r;
+  Guint precinctSize=0, style=0;
+  Guint segLen=0, capabilities=0, comp=0, i=0, j=0, r=0;
 
   //----- main header
   haveSIZ = haveCOD = haveQCD = haveSOT = gFalse;
@@ -1405,10 +1405,10 @@ GBool JPXStream::readTilePart() {
   GBool haveSOD;
   Guint tileIdx, tilePartLen, tilePartIdx, nTileParts;
   GBool tilePartToEOC;
-  Guint precinctSize, style;
-  Guint n, nSBs, nx, ny, sbx0, sby0, comp, segLen;
-  Guint i, j, k, cbX, cbY, r, pre, sb, cbi;
-  int segType, level;
+  Guint precinctSize=0, style=0;
+  Guint n=0, nSBs=0, nx=0, ny=0, sbx0=0, sby0=0, comp=0, segLen=0;
+  Guint i=0, j=0, k=0, cbX=0, cbY=0, r=0, pre=0, sb=0, cbi=0;
+  int segType=0, level=0;
 
   // process the SOT marker segment
   if (!readUWord(&tileIdx) ||
Index: pdfedit-0.4.5/src/xpdf/xpdf/Lexer.cc
===================================================================
--- pdfedit-0.4.5.orig/src/xpdf/xpdf/Lexer.cc
+++ pdfedit-0.4.5/src/xpdf/xpdf/Lexer.cc
@@ -23,7 +23,7 @@
 
 // A '1' in this array means the character is white space.  A '1' or
 // '2' means the character ends a name or command.
-static char specialChars[256] = {
+char specialChars[256] = {
   1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0,   // 0x
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 1x
   1, 0, 0, 0, 0, 2, 0, 0, 2, 2, 0, 0, 0, 0, 0, 2,   // 2x
Index: pdfedit-0.4.5/src/xpdf/xpdf/Lexer.h
===================================================================
--- pdfedit-0.4.5.orig/src/xpdf/xpdf/Lexer.h
+++ pdfedit-0.4.5/src/xpdf/xpdf/Lexer.h
@@ -20,6 +20,7 @@
 
 class XRef;
 
+extern char specialChars[256];
 #define tokBufSize 128		// size of token buffer
 
 //------------------------------------------------------------------------
Index: pdfedit-0.4.5/src/xpdf/xpdf/SplashOutputDev.cc
===================================================================
--- pdfedit-0.4.5.orig/src/xpdf/xpdf/SplashOutputDev.cc
+++ pdfedit-0.4.5/src/xpdf/xpdf/SplashOutputDev.cc
@@ -2599,7 +2599,7 @@ void SplashOutputDev::setSoftMask(GfxSta
 #if SPLASH_CMYK
   GfxCMYK cmyk;
 #endif
-  double lum, lum2;
+  double lum=0.0, lum2=0.0;
   int tx, ty, x, y;
 
   tx = transpGroupStack->tx;
@@ -2759,7 +2759,7 @@ void SplashOutputDev::setFillColor(int r
 #endif
 }
 
-SplashFont *SplashOutputDev::getFont(GString *name, double *textMatA) {
+SplashFont *SplashOutputDev::getFont(const GString *name, double *textMatA) {
   DisplayFontParam *dfp;
   Ref ref;
   SplashOutFontFileID *id;
Index: pdfedit-0.4.5/src/xpdf/xpdf/SplashOutputDev.h
===================================================================
--- pdfedit-0.4.5.orig/src/xpdf/xpdf/SplashOutputDev.h
+++ pdfedit-0.4.5/src/xpdf/xpdf/SplashOutputDev.h
@@ -187,7 +187,7 @@ public:
   void setFillColor(int r, int g, int b);
 
   // Get a font object for a Base-14 font, using the Latin-1 encoding.
-  SplashFont *getFont(GString *name, double *textMatA);
+  SplashFont *getFont(const GString *name, double *textMatA);
 
   SplashFont *getCurrentFont() { return font; }
 
Index: pdfedit-0.4.5/src/xpdf/xpdf/Stream.cc
===================================================================
--- pdfedit-0.4.5.orig/src/xpdf/xpdf/Stream.cc
+++ pdfedit-0.4.5/src/xpdf/xpdf/Stream.cc
@@ -631,7 +631,7 @@ Stream * FileStream::clone()
    long startPos=ftell(f);
 
    if(limited && !l) 
-           printf("%s: limited stream with 0 lenght\n", __FUNCTION__);
+           error( currPos, "%s: limited stream with 0 lenght\n", __FUNCTION__);
 
    // if length is 0, calculates it until end of file
    if(!limited && !l)
Index: pdfedit-0.4.5/src/xpdf/xpdf/TextOutputDev.cc
===================================================================
--- pdfedit-0.4.5.orig/src/xpdf/xpdf/TextOutputDev.cc
+++ pdfedit-0.4.5/src/xpdf/xpdf/TextOutputDev.cc
@@ -826,6 +826,7 @@ void TextLineFrag::init(TextLine *lineA,
   start = startA;
   len = lenA;
   col = line->col[start];
+  base = 0;
 }
 
 void TextLineFrag::computeCoords(GBool oneRot) {
@@ -1264,6 +1265,8 @@ void TextBlock::coalesce(UnicodeMap *uMa
     lastWord = word0;
 
     // compute the search range
+    int rot = word0->rot;
+
     fontSize = word0->fontSize;
     minBase = word0->base - maxIntraLineDelta * fontSize;
     maxBase = word0->base + maxIntraLineDelta * fontSize;
@@ -1281,7 +1284,14 @@ void TextBlock::coalesce(UnicodeMap *uMa
 	for (word0 = NULL, word1 = pool->getPool(baseIdx);
 	     word1;
 	     word0 = word1, word1 = word1->next) {
-	  if (word1->base >= minBase &&
+
+	 // this mayhem checks for y axis
+	 // - if it is in the desired range than check whether
+	 // the last character is somewhere near (to the right) to the first character of
+	 // the next word( WHICH IS INCORRECT with accented characters splitted into 2)
+	 //  - fixed in addChar rather than in this ...
+	  if (word1->rot == rot && 
+	      word1->base >= minBase &&
 	      word1->base <= maxBase &&
 	      (delta = lastWord->primaryDelta(word1)) >=
 	        minCharSpacing * fontSize) {
@@ -3326,8 +3336,11 @@ GString *TextPage::getText(double xMin,
       // insert a return
       if (frag->col < col ||
 	  (i > 0 && fabs(frag->base - frags[i-1].base) >
-	              maxIntraLineDelta * frags[i-1].line->words->fontSize)) {
-	s->append(eol, eolLen);
+	              maxIntraLineDelta * frags[i-1].line->words->fontSize) 
+		|| (i > 0 && frag->line->rot != frags[i-1].line->rot)) {
+	
+  
+  s->append(eol, eolLen);
 	col = 0;
 	multiLine = gTrue;
       }
Index: pdfedit-0.4.5/src/xpdf/xpdf/XRef.cc
===================================================================
--- pdfedit-0.4.5.orig/src/xpdf/xpdf/XRef.cc
+++ pdfedit-0.4.5/src/xpdf/xpdf/XRef.cc
@@ -365,7 +365,7 @@ Guint XRef::getStartXref() {
   }
 
   // get value for startxref
-  for (i += strlen("startxref"); isspace(buf[i]); ++i) ;
+  for (i += strlen("startxref"); isspace((unsigned char)buf[i]); ++i) ;
   lastXRefPos = strToUnsigned(&buf[i]);
 
   // We are immediatelly after startxref value now. We will try to 
@@ -844,16 +844,16 @@ GBool XRef::constructXRef() {
 	if (isspace((unsigned char)*p)) {
 	  do {
 	    ++p;
-	  } while (*p && isspace(*p));
+	  } while (*p && isspace((unsigned char)*p));
 	  if (isdigit((unsigned char)*p)) {
 	    gen = (int)strtoul(p, NULL, 10);
 	    do {
 	      ++p;
 	    } while (*p && isdigit((unsigned char)*p));
-	    if (isspace(*p)) {
+	    if (isspace((unsigned char)*p)) {
 	      do {
 		++p;
-	      } while (*p && isspace(*p));
+	      } while (*p && isspace((unsigned char)*p));
 	      if (!strncmp(p, "obj", 3)) {
 		if (num >= size) {
 		  newSize = (num + 1 + 255) & ~255;
Index: pdfedit-0.4.5/tools/commit_patch/COPYING
===================================================================
--- pdfedit-0.4.5.orig/tools/commit_patch/COPYING
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
Index: pdfedit-0.4.5/tools/commit_patch/Makefile
===================================================================
--- pdfedit-0.4.5.orig/tools/commit_patch/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-VERSION=2.0
-
-all: executable commit-patch.1
-
-# Darcs loses the x bit. :-(
-executable:
-	chmod +x commit-patch
-
-commit-patch.1: commit-patch
-	pod2man -c "User Commands" $< > $@
-
-commit-patch.html: commit-patch
-	pod2html $< > $@
-
-release: commit-patch-$(VERSION)
-
-commit-patch-$(VERSION): commit-patch commit-patch-buffer.el commit-patch.1 Makefile README COPYING
-	mkdir commit-patch-$(VERSION)
-	cp -p $^ commit-patch-$(VERSION)
-	tar czf commit-patch-$(VERSION).tar.gz commit-patch-$(VERSION)
-	rm -rf commit-patch-$(VERSION)
Index: pdfedit-0.4.5/tools/commit_patch/README
===================================================================
--- pdfedit-0.4.5.orig/tools/commit_patch/README
+++ /dev/null
@@ -1,48 +0,0 @@
-commit-patch - commit patches to CVS, Darcs or Mercurial repositories
-------------------------------------------------------------------------------
-
-PREREQUISITES
-       commit-patch relies on several programs to get the job done:
-
-          perl      - <http://www.perl.org>
-          patch     - <http://www.gnu.org/software/patch/>
-          interdiff - <http://cyberelk.net/tim/data/patchutils/>
-          cp        - Ideally installed on your system already. :-)
-       and, of course, one of:
-          darcs     - <http://abridgegame.org/darcs/>
-          mercurial - <http://www.selenic.com/mercurial/>
-          cvs       - <http://www.nongnu.org/cvs/>
-
-       commit-patch is known to run on Linux and Mac OS X. It is perl,
-       so ideally it will run anywhere, but we have never tested in
-       other environments, most notably Windows. Use at your own risk.
-
-INSTRUCTIONS
-       commit-patch: See the man page or perldoc:
-         man ./commit-patch.1
-         perldoc commit-patch
-
-       commit-patch-buffer.el is an emacs interface to
-       commit-patch. It allows you to just hit C-c C-c in any patch
-       buffer to apply and commit only the changes indicated by the
-       patch, regardless of the changes in your working directory.
-
-       One method of working with commit-patch-buffer is to just M-x
-       vc-diff a file then kill, split or edit the resulting hunks and
-       to then hit C-c C-c to commit the patch. The other is to use
-       PCL cvs mode to tag many files and then to diff them into a
-       buffer which can again be edited and committed.
-
-HOMEPAGE
-       <http://www.porkrind.org/commit-patch/>
-
-AUTHORS
-       o   David Caldwell <david@porkrind.org>
-       o   Jim Radford <radford@blackbean.org>
-
-COPYRIGHT AND LICENSE
-       Copyright 2003-2006 by David Caldwell and Jim Radford.
-
-       commit-patch is distributed under the GNU General Public
-       License. See the COPYING file in the distribution for more
-       details.
Index: pdfedit-0.4.5/tools/commit_patch/commit-patch
===================================================================
--- pdfedit-0.4.5.orig/tools/commit_patch/commit-patch
+++ /dev/null
@@ -1,213 +0,0 @@
-#!/usr/bin/perl -w
-# Copyright (c) 2003-2006 David Caldwell <david@porkrind.org>
-#                     and Jim Radford <radford@bleackbean.org>, All Rights Reserved.
-# This code can be distributed under the terms of the GNU Public License
-# Version: 2.0
-
-use strict;
-use Cwd qw(abs_path);
-use IPC::Run qw(run);
-use File::Temp qw(tempfile);
-use Getopt::Long;
-
-my $message;
-GetOptions("message|m=s" => \$message) and scalar @ARGV == 1 or die "Usage: $0 [--message|-m <message>] <patch-file>\n";
-my $patch = shift;
-
-die "bad patch file: $!" if -z $patch;
-die "Invalid message" if defined $message && $message eq "";
-
-my ($lsdiff_out, $err);
-run ["lsdiff", "--strip", "1", $patch], '|', ["sort"], '|', ["uniq"], \$lsdiff_out, \$err or die "lsdiff|sort|unique : $! ($err)";
-my @files = split(/\n/, $lsdiff_out);
-die "No files in patch" unless scalar @files;
-
-my %clean;
-my $repo=".";
-my %vc;
-while (!$vc{name}) {
-    if (-d "$repo/CVS" && $repo eq '.') {
-        $vc{name}         = 'cvs';
-        $vc{diff}         = 'cvs diff -u';
-        $vc{commit}       = 'cvs commit';
-        $vc{message_opt}  = '-m';
-        $vc{add}          = 'cvs add';
-        $vc{remove}       = 'cvs rm';
-        $vc{patcharg}     = '-p0';
-    } elsif (-d "$repo/_darcs") {
-        $vc{name}         = 'darcs';
-        $vc{diff}         = 'darcs diff -u';
-        $vc{add}          = 'darcs add';
-        $vc{remove}       = 'true';
-        $vc{commit}       = 'darcs record --all';
-        $vc{patcharg}     = '-p1';
-        if ($message) {
-            # Darcs doesn't like multiline -m comments so we have to put the log message into a file and use --logfile. Yuck.
-            #$vc{message_opt} = '-m';
-            $message .= "\n" unless $message =~ /\n$/s; # Darcs does screwey stuff when logfile has no trailing \n.
-            my ($message_file, $message_filename) = tempfile("commit-patch-message-XXXXXXXX", UNLINK=>0);
-            print $message_file $message;
-            close $message_file;
-            $clean{$message_filename} = undef; # make sure we delete this file on exit.
-            $vc{commit}  .= ' --logfile='.$message_filename;
-        } else {
-        }
-    } elsif (-d "$repo/.hg") {
-        $vc{name}         = 'hg';
-        $vc{diff}         = 'hg diff';
-        $vc{commit}       = 'hg commit';
-        $vc{message_opt}  = '-m';
-        $vc{add}          = 'hg addremove';
-        $vc{remove}       = 'true';
-        $vc{patcharg}     = '-p1';
-    } else {
-        $repo.="/..";
-        printf("Trying back a dir: $repo, abs:%s\n", abs_path($repo));
-        die "couldn't find repo" if abs_path($repo) eq "/";
-    }
-}
-
-#print "Found $vc{name} in $repo\n";
-#printf("files: %s\n", join(",", @files));
-
-eval {
-    for my $f (@files) {
-        run ["cp", "-f", $f, "$f.orig.$$"] or die "couldn't make backup of $f: $!";
-        $clean{"$f.orig.$$"} = $f;
-    }
-    $SIG{PIPE} = $SIG{INT} = $SIG{QUIT} = sub { clean(); print "Cleanly aborted\n"; };
-
-    $clean{"working.patch.$$"} = $clean{"non_committed.patch.$$"} = undef;
-
-    my ($out,$err,$non_committed_patch);
-    run([split(/ /,$vc{add}),    @files],                                               '>', \$out, '2>', \$err);# Expect these 2 to fail when
-    run([split(/ /,$vc{remove}), @files],                                               '>', \$out, '2>', \$err);# there are no new files.
-    run([split(/ /,$vc{diff}),   @files], '>', "working.patch.$$",                                  '2>', \$err);# CVS diff dies. Sigh. or die "$err\n";
-    run(["interdiff", $vc{patcharg}, $patch, "working.patch.$$"], '>', "non_committed.patch.$$",    '2>', \$err) or die "$err\n";
-    run(["patch", $vc{patcharg}, "-R"], '<', "working.patch.$$",                        '>', \$out, '2>', \$err) or die "$out\n$err\n";
-    run(["patch", $vc{patcharg}], '<', $patch,                                          '>', \$out, '2>', \$err) or die "$out\n$err\n";
-    # Don't capture stdout or stderr because it can be interactive (cough cough darcs)
-    run([split(/ /,$vc{commit}), $message && $vc{message_opt} ? ($vc{message_opt}, $message) : (), @files],debug => 0) or die "commit failed.\n";
-    run(["patch", $vc{patcharg}], '<', "non_committed.patch.$$",                        '>', \$out, '2>', \$err) or die "$out\n$err\n";
-};
-sub clean() {
-    foreach my $k (keys %clean) { rename $k,$clean{$k} if $clean{$k} }
-}
-if ($@) {
-    clean();
-    die "Failed: $@";
-}
-foreach my $k (keys %clean) { unlink $k }
-
-
-=head1 NAME
-
-commit-patch - commit patches to I<CVS>, I<Darcs> or I<Mercurial> repositories
-
-=head1 SYNOPSIS
-
-commit-patch [B<-m> I<message>] I<patch-file>
-
-=head1 DESCRIPTION
-
-Normally version control systems don't allow fine grained
-commits. B<commit-patch> allows the user to control I<exactly> what
-gets committed (or "recorded", in I<Darcs> parlance) by letting the user
-supply a patch to be committed rather than using the files in the
-current working directory.
-
-B<commit-patch> currently supports the following version control systems:
-B<I<CVS>>, B<I<Darcs>>, and B<I<Mercurial>>.
-
-=head1 OPTIONS
-
-B<-m>, B<--message>=I<message> - An optional I<message> to use as the commit
-text. If the message is multiple lines then I<Mercurial> and I<Darcs>
-will use the first line as the patch name and the rest as commit
-details. If the C<-m> option is not specified then the result will be
-the same as whatever the underlying version control system would do if
-you didn't specify a message name on the command line. That is,
-B<commit-patch> does not interfere with the patch naming process of
-the underlying version control system; I<Darcs> will still ask you
-interactively and I<CVS> will still launch your editor.
-
-=head1 DIAGNOSTICS
-
-B<commit-patch> works by manipulating the working directory using
-C<patch>, C<interdiff>, and the underlying version control system's
-C<diff>.  If any part of the process fails, B<commit-patch> will
-attempt to restore the working directory to the state it was before
-the command was run. Any errors from the underlying version control
-system or from patch will be printed.
-
-=head1 CAVEATS
-
-The patch specified on the command line must originate from the same
-place as the current directory. That is, the following will not work:
-
-  cvs diff -u > ../a.patch
-  cd ..
-  commit-patch a.patch
-
-You B<must> run B<commit-patch> from the same directory that the
-original patch was based from.
-
-I<Darcs> and I<Mercurial> put C<a/> and C<b/> in front of all the paths
-in the diff output. Don't worry about this; B<commit-patch> takes it into
-account.
-
-=head1 EXAMPLES
-
-Typical I<CVS> usage:
-
-  cvs diff -u > a.patch
-  emacs a.patch
-  commit-patch a.patch
-
-I<Mercurial> usage with a message specified:
-
-  hg diff > a.patch
-  emacs a.patch
-  commit-patch -m "This is a commit message" a.patch
-
-I<Darcs> usage with a multi-line message specified:
-
-  darcs diff -u > a.patch
-  emacs a.patch
-  commit-patch -m 'This is the patch name
-  Here are the patch details' a.patch
-
-=head1 AUTHORS
-
-=over
-
-=item *
-
-David Caldwell <david@porkrind.org>
-
-=item *
-
-Jim Radford <radford@blackbean.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright 2003-2006 by David Caldwell and Jim Radford.
-
-B<commit-patch> is distributed under the GNU General Public
-License. See the COPYING file in the distribution for more details.
-
-=head1 HISTORY
-
-B<commit-patch> was originally called C<cvs-commit-patch> and was a
-bash script written in 2003 by Jim Radford (with David Caldwell in the
-room drawing the procedure on a white board). David later converted it
-do C<darcs-commit-patch>, then integrated them back together into
-B<commit-patch>. I<Mercurial> support was then added. At some point
-David translated from bash into perl because funky bash quoting issues
-were causing problems with a repository that had a space in one of the
-directory names.
-
-=cut
-
Index: pdfedit-0.4.5/tools/commit_patch/commit-patch-buffer.el
===================================================================
--- pdfedit-0.4.5.orig/tools/commit_patch/commit-patch-buffer.el
+++ /dev/null
@@ -1,62 +0,0 @@
-;; Copyright 2003-2006 Jim Radford <radford@bleackbean.org> 
-;;                 and David Caldwell <david@porkrind.org>, All Rights Reserved.
-;; This code can be distributed under the terms of the GNU Public License
-;; Version: 2.1
-
-(require 'vc)
-(require 'log-edit)
-
-(defun commit-patch-buffer (buffer directory)
-  "Commit the patch found in BUFFER applying it from DIRECTORY."
-  (interactive "bBuffer to commit: \nDDirectory: ")
-  (let* ((patch-files (with-temp-buffer
-                        (let ((lsdiff (current-buffer)))
-                          (when (eq 0 (with-current-buffer buffer
-                                        (call-process-region (point-min) (point-max) 
-                                                             "lsdiff" nil lsdiff nil)))
-                            (split-string (buffer-string)))))) 
-         (f patch-files) visiting-buffers)
-    (while (car f)
-      (let ((buf (find-buffer-visiting (car f))))
-        (when buf
-          (with-current-buffer buf (vc-buffer-sync))
-          (add-to-list 'visiting-buffers buf)))
-      (setq f (cdr f)))
-    (log-edit
-     `(lambda () (interactive)
-        (let ((patch (make-temp-file "commit-buffer" nil))
-              (comment (buffer-string))
-              (output-buffer (window-buffer
-                              (display-buffer
-                               (get-buffer-create "*commit-patch*")))))
-          (unwind-protect 
-              (progn
-                (with-current-buffer ,buffer
-                  (write-region (point-min) (point-max) patch))
-                (with-current-buffer output-buffer
-                  (erase-buffer)
-                  (let* ((default-directory ,directory) 
-                         (status (call-process "commit-patch" nil
-                                               output-buffer 'display
-                                               "-m" comment patch)))
-                    (if (not (eq status 0))
-                        (message "Commit patch failed with a status of '%S' (%S)." status patch)
-                      (mapc (lambda (buf) (with-current-buffer buf
-                                            (vc-resynch-buffer (buffer-file-name buf) 'revert 'noquery)
-                                            ;; stupid vc-revert-buffer1 doesn't call revert-buffer
-                                            ;; with preserve-modes which means the CVS version doesn't
-                                            ;; get updated, so we do it by hand.
-                                            (run-hooks 'find-file-hooks)))
-                            ',visiting-buffers)
-                      (message "Patched and commited %S file(s) and reverted %S." 
-                               ,(length patch-files) ,(length visiting-buffers))))))
-            (delete-file patch))))
-     nil
-     `(lambda () ',patch-files)
-     "*commit*")))
-
-(when (require 'diff-mode)
-  (setq diff-default-read-only nil)
-  (define-key diff-mode-map "\C-c\C-c" 'commit-patch-buffer))
-
-(provide 'commit-patch-buffer)
Index: pdfedit-0.4.5/tools/commit_patch/commit-patch.1
===================================================================
--- pdfedit-0.4.5.orig/tools/commit_patch/commit-patch.1
+++ /dev/null
@@ -1,231 +0,0 @@
-.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.32
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sh \" Subsection heading
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.if \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.\"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.hy 0
-.if n .na
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "COMMIT-PATCH 1"
-.TH COMMIT-PATCH 1 "2006-08-23" "perl v5.8.8" "User Commands"
-.SH "NAME"
-commit\-patch \- commit patches to \fICVS\fR, \fIDarcs\fR or \fIMercurial\fR repositories
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-commit-patch [\fB\-m\fR \fImessage\fR] \fIpatch-file\fR
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Normally version control systems don't allow fine grained
-commits. \fBcommit-patch\fR allows the user to control \fIexactly\fR what
-gets committed (or \*(L"recorded\*(R", in \fIDarcs\fR parlance) by letting the user
-supply a patch to be committed rather than using the files in the
-current working directory.
-.PP
-\&\fBcommit-patch\fR currently supports the following version control systems:
-\&\fB\f(BI\s-1CVS\s0\fB\fR, \fB\f(BIDarcs\fB\fR, and \fB\f(BIMercurial\fB\fR.
-.SH "OPTIONS"
-.IX Header "OPTIONS"
-\&\fB\-m\fR, \fB\-\-message\fR=\fImessage\fR \- An optional \fImessage\fR to use as the commit
-text. If the message is multiple lines then \fIMercurial\fR and \fIDarcs\fR
-will use the first line as the patch name and the rest as commit
-details. If the \f(CW\*(C`\-m\*(C'\fR option is not specified then the result will be
-the same as whatever the underlying version control system would do if
-you didn't specify a message name on the command line. That is,
-\&\fBcommit-patch\fR does not interfere with the patch naming process of
-the underlying version control system; \fIDarcs\fR will still ask you
-interactively and \fI\s-1CVS\s0\fR will still launch your editor.
-.SH "DIAGNOSTICS"
-.IX Header "DIAGNOSTICS"
-\&\fBcommit-patch\fR works by manipulating the working directory using
-\&\f(CW\*(C`patch\*(C'\fR, \f(CW\*(C`interdiff\*(C'\fR, and the underlying version control system's
-\&\f(CW\*(C`diff\*(C'\fR.  If any part of the process fails, \fBcommit-patch\fR will
-attempt to restore the working directory to the state it was before
-the command was run. Any errors from the underlying version control
-system or from patch will be printed.
-.SH "CAVEATS"
-.IX Header "CAVEATS"
-The patch specified on the command line must originate from the same
-place as the current directory. That is, the following will not work:
-.PP
-.Vb 3
-\&  cvs diff \-u > ../a.patch
-\&  cd ..
-\&  commit\-patch a.patch
-.Ve
-.PP
-You \fBmust\fR run \fBcommit-patch\fR from the same directory that the
-original patch was based from.
-.PP
-\&\fIDarcs\fR and \fIMercurial\fR put \f(CW\*(C`a/\*(C'\fR and \f(CW\*(C`b/\*(C'\fR in front of all the paths
-in the diff output. Don't worry about this; \fBcommit-patch\fR takes it into
-account.
-.SH "EXAMPLES"
-.IX Header "EXAMPLES"
-Typical \fI\s-1CVS\s0\fR usage:
-.PP
-.Vb 3
-\&  cvs diff \-u > a.patch
-\&  emacs a.patch
-\&  commit\-patch a.patch
-.Ve
-.PP
-\&\fIMercurial\fR usage with a message specified:
-.PP
-.Vb 3
-\&  hg diff > a.patch
-\&  emacs a.patch
-\&  commit\-patch \-m "This is a commit message" a.patch
-.Ve
-.PP
-\&\fIDarcs\fR usage with a multi-line message specified:
-.PP
-.Vb 4
-\&  darcs diff \-u > a.patch
-\&  emacs a.patch
-\&  commit\-patch \-m 'This is the patch name
-\&  Here are the patch details' a.patch
-.Ve
-.SH "AUTHORS"
-.IX Header "AUTHORS"
-.IP "\(bu" 4
-David Caldwell <david@porkrind.org>
-.IP "\(bu" 4
-Jim Radford <radford@blackbean.org>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright 2003\-2006 by David Caldwell and Jim Radford.
-.PP
-\&\fBcommit-patch\fR is distributed under the \s-1GNU\s0 General Public
-License. See the \s-1COPYING\s0 file in the distribution for more details.
-.SH "HISTORY"
-.IX Header "HISTORY"
-\&\fBcommit-patch\fR was originally called \f(CW\*(C`cvs\-commit\-patch\*(C'\fR and was a
-bash script written in 2003 by Jim Radford (with David Caldwell in the
-room drawing the procedure on a white board). David later converted it
-do \f(CW\*(C`darcs\-commit\-patch\*(C'\fR, then integrated them back together into
-\&\fBcommit-patch\fR. \fIMercurial\fR support was then added. At some point
-David translated from bash into perl because funky bash quoting issues
-were causing problems with a repository that had a space in one of the
-directory names.
Index: pdfedit-0.4.5/tools/make_release
===================================================================
--- pdfedit-0.4.5.orig/tools/make_release
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-# PDFedit - free program for PDF document manipulation.
-# Copyright (C) 2006-2009  PDFedit team: Michal Hocko,
-#                                        Jozef Misutka,
-#                                        Martin Petricek
-#                   Former team members: Miroslav Jahoda
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program (in doc/LICENSE.GPL); if not, write to the 
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, 
-# MA  02111-1307  USA
-#
-# Project is hosted on http://sourceforge.net/projects/pdfedit
-
-# Run in sufficiently empty directory!
-
-TARBALL=`pwd`/tarball
-fail_cleanup()
-{
-	if [ -d $TARBALL ]
-	then
-		echo cleaning $TARBALL directory
-		rm -rf $TARBALL
-	fi
-	exit 1
-}
-
-# Terminate on any error
-set -e
-
-if [ -z $CVSROOT ]
-then
-  echo CVSROOT is not defined
-  exit 1
-fi
-
-# Reasonable umask for files
-umask 022
-if [ -e $TARBALL ]
-then
- echo directory $TARBALL already exist
- exit 1
-fi
-
-# Export CVS sources into "$TARBALL" directory
-mkdir $TARBALL
-cd $TARBALL
-cvs export -D now pdfedit || fail_cleanup
-cd pdfedit
-# Generate files that should be in the distribution by default
-./makedist
-cd ..
-
-echo Do not forget to tag CVS:
-echo Use:
-echo " cvs tag RELEASE_X_Y_Z"
-echo "in cvs root dir"
-

Places

File git-2013-02-17.diff of Package pdfedit (Revision 46a0105b886be6202b96024177860898)

Places