moved pdf merger file into src directory.

13 years ago · 7564a8badf
parent 97cee1b6b0
commit 7564a8badf
55 changed files with 3883 additions and 3884 deletions
--- a/thirdparty/mera/pdf-merger/ASCII85Decode.cpp
+++ b/thirdparty/mera/pdf-merger/ASCII85Decode.cpp
--- a/thirdparty/mera/pdf-merger/ASCII85Decode.h
+++ b/thirdparty/mera/pdf-merger/ASCII85Decode.h
--- a/thirdparty/mera/pdf-merger/ASCIIHexDecode.cpp
+++ b/thirdparty/mera/pdf-merger/ASCIIHexDecode.cpp
--- a/thirdparty/mera/pdf-merger/ASCIIHexDecode.h
+++ b/thirdparty/mera/pdf-merger/ASCIIHexDecode.h
--- a/thirdparty/mera/pdf-merger/AbstractBoxElementHandler.h
+++ b/thirdparty/mera/pdf-merger/AbstractBoxElementHandler.h
--- a/thirdparty/mera/pdf-merger/AnnotsHandler.cpp
+++ b/thirdparty/mera/pdf-merger/AnnotsHandler.cpp
--- a/thirdparty/mera/pdf-merger/AnnotsHandler.h
+++ b/thirdparty/mera/pdf-merger/AnnotsHandler.h
--- a/thirdparty/mera/pdf-merger/CCITTFaxDecode.h
+++ b/thirdparty/mera/pdf-merger/CCITTFaxDecode.h
--- a/thirdparty/mera/pdf-merger/Config.h
+++ b/thirdparty/mera/pdf-merger/Config.h
--- a/thirdparty/mera/pdf-merger/ContentHandler.cpp
+++ b/thirdparty/mera/pdf-merger/ContentHandler.cpp
--- a/thirdparty/mera/pdf-merger/ContentHandler.h
+++ b/thirdparty/mera/pdf-merger/ContentHandler.h
--- a/thirdparty/mera/pdf-merger/CropBoxElementHandler.h
+++ b/thirdparty/mera/pdf-merger/CropBoxElementHandler.h
--- a/thirdparty/mera/pdf-merger/DCTDecode.h
+++ b/thirdparty/mera/pdf-merger/DCTDecode.h
--- a/thirdparty/mera/pdf-merger/Decoder.h
+++ b/thirdparty/mera/pdf-merger/Decoder.h
--- a/thirdparty/mera/pdf-merger/Document.cpp
+++ b/thirdparty/mera/pdf-merger/Document.cpp
--- a/thirdparty/mera/pdf-merger/Document.h
+++ b/thirdparty/mera/pdf-merger/Document.h
--- a/thirdparty/mera/pdf-merger/Exception.h
+++ b/thirdparty/mera/pdf-merger/Exception.h
--- a/thirdparty/mera/pdf-merger/FileIsAbsentException.h
+++ b/thirdparty/mera/pdf-merger/FileIsAbsentException.h
--- a/thirdparty/mera/pdf-merger/Filter.cpp
+++ b/thirdparty/mera/pdf-merger/Filter.cpp
--- a/thirdparty/mera/pdf-merger/Filter.h
+++ b/thirdparty/mera/pdf-merger/Filter.h
--- a/thirdparty/mera/pdf-merger/FilterPredictor.cpp
+++ b/thirdparty/mera/pdf-merger/FilterPredictor.cpp
--- a/thirdparty/mera/pdf-merger/FilterPredictor.h
+++ b/thirdparty/mera/pdf-merger/FilterPredictor.h
--- a/thirdparty/mera/pdf-merger/FlateDecode.cpp
+++ b/thirdparty/mera/pdf-merger/FlateDecode.cpp
--- a/thirdparty/mera/pdf-merger/FlateDecode.h
+++ b/thirdparty/mera/pdf-merger/FlateDecode.h
--- a/thirdparty/mera/pdf-merger/JBIG2Decode.h
+++ b/thirdparty/mera/pdf-merger/JBIG2Decode.h
--- a/thirdparty/mera/pdf-merger/LZWDecode.cpp
+++ b/thirdparty/mera/pdf-merger/LZWDecode.cpp
--- a/thirdparty/mera/pdf-merger/LZWDecode.h
+++ b/thirdparty/mera/pdf-merger/LZWDecode.h
--- a/thirdparty/mera/pdf-merger/MediaBoxElementHandler.h
+++ b/thirdparty/mera/pdf-merger/MediaBoxElementHandler.h
--- a/thirdparty/mera/pdf-merger/MergePageDescription.h
+++ b/thirdparty/mera/pdf-merger/MergePageDescription.h
--- a/thirdparty/mera/pdf-merger/Merger.cpp
+++ b/thirdparty/mera/pdf-merger/Merger.cpp
--- a/thirdparty/mera/pdf-merger/Merger.h
+++ b/thirdparty/mera/pdf-merger/Merger.h
--- a/thirdparty/mera/pdf-merger/Object.cpp
+++ b/thirdparty/mera/pdf-merger/Object.cpp
--- a/thirdparty/mera/pdf-merger/Object.h
+++ b/thirdparty/mera/pdf-merger/Object.h
--- a/thirdparty/mera/pdf-merger/OverlayDocumentParser.cpp
+++ b/thirdparty/mera/pdf-merger/OverlayDocumentParser.cpp
--- a/thirdparty/mera/pdf-merger/OverlayDocumentParser.h
+++ b/thirdparty/mera/pdf-merger/OverlayDocumentParser.h
--- a/thirdparty/mera/pdf-merger/Page.cpp
+++ b/thirdparty/mera/pdf-merger/Page.cpp
--- a/thirdparty/mera/pdf-merger/Page.h
+++ b/thirdparty/mera/pdf-merger/Page.h
--- a/thirdparty/mera/pdf-merger/PageElementHandler.cpp
+++ b/thirdparty/mera/pdf-merger/PageElementHandler.cpp
--- a/thirdparty/mera/pdf-merger/PageElementHandler.h
+++ b/thirdparty/mera/pdf-merger/PageElementHandler.h
--- a/thirdparty/mera/pdf-merger/PageParser.h
+++ b/thirdparty/mera/pdf-merger/PageParser.h
--- a/thirdparty/mera/pdf-merger/Parser.cpp
+++ b/thirdparty/mera/pdf-merger/Parser.cpp
--- a/thirdparty/mera/pdf-merger/Parser.h
+++ b/thirdparty/mera/pdf-merger/Parser.h
--- a/thirdparty/mera/pdf-merger/Rectangle.cpp
+++ b/thirdparty/mera/pdf-merger/Rectangle.cpp
--- a/thirdparty/mera/pdf-merger/Rectangle.h
+++ b/thirdparty/mera/pdf-merger/Rectangle.h
--- a/thirdparty/mera/pdf-merger/RemoveHimSelfHandler.h
+++ b/thirdparty/mera/pdf-merger/RemoveHimSelfHandler.h
--- a/thirdparty/mera/pdf-merger/RemoveHimselfHandler.cpp
+++ b/thirdparty/mera/pdf-merger/RemoveHimselfHandler.cpp
--- a/thirdparty/mera/pdf-merger/RotationHandler.h
+++ b/thirdparty/mera/pdf-merger/RotationHandler.h
--- a/thirdparty/mera/pdf-merger/RunLengthDecode.cpp
+++ b/thirdparty/mera/pdf-merger/RunLengthDecode.cpp
--- a/thirdparty/mera/pdf-merger/RunLengthDecode.h
+++ b/thirdparty/mera/pdf-merger/RunLengthDecode.h
--- a/thirdparty/mera/pdf-merger/Transformation.h
+++ b/thirdparty/mera/pdf-merger/Transformation.h
--- a/thirdparty/mera/pdf-merger/TypeElementHandler.h
+++ b/thirdparty/mera/pdf-merger/TypeElementHandler.h
--- a/thirdparty/mera/pdf-merger/Utils.cpp
+++ b/thirdparty/mera/pdf-merger/Utils.cpp
--- a/thirdparty/mera/pdf-merger/Utils.h
+++ b/thirdparty/mera/pdf-merger/Utils.h
--- a/thirdparty/mera/pdf-merger/doc/PDF
+++ b/thirdparty/mera/pdf-merger/doc/PDF
--- a/thirdparty/mera/pdf-merger/pdfMerger.pri
+++ b/thirdparty/mera/pdf-merger/pdfMerger.pri
@ -1,4 +1,3 @@
-INCLUDEPATH  += "$$PWD/../../zlib/1.2.3/include"

 HEADERS += \
 	AnnotsHandler.h \