Добавлен проектный файл Qt. Сделаны изменения, чтобы проект компилировался под Qt.

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62570 954022d7-b5bf-4e40-9824-e11837661b57

PdfReader/PdfReader.cpp

@@ -269,7 +269,7 @@ namespace PdfReader
 				nCounter++;
 				wsFolder = wsFolderName + L"_" + std::to_wstring(nCounter);
 			}
-			NSDirectory::CreateDirectoryW(wsFolder);
+			NSDirectory::CreateDirectory(wsFolder);
 			m_wsTempFolder = AllocWString(wsFolder);
 		}
 		else

PdfReader/PdfReader.pro

+#-------------------------------------------------
+#
+# Project created by QtCreator 2015-05-15T12:43:02
+#
+#-------------------------------------------------
+
+QT       -= core gui
+
+TARGET = PdfReader
+TEMPLATE = lib
+
+DEFINES += PDFREADER_LIBRARY
+
+linux-g++ | linux-g++-64 | linux-g++-32 {
+    DEFINES += \
+    HAVE_UNISTD_H \
+    LINUX \
+    _LINUX \
+    _LINUX_QT
+
+    CONFIG += c++11
+
+    message(linux)
+}
+
+INCLUDEPATH += \
+    ../DesktopEditor/agg-2.4/include \
+    ../DesktopEditor/freetype-2.5.2/include \
+    ../DesktopEditor/cximage/jasper/include \
+    ../DesktopEditor/cximage/jpeg \
+    ../DesktopEditor/cximage/png \
+    ../DesktopEditor/cximage/zlib
+
+SOURCES += \
+    Src/Annot.cpp \
+    Src/Array.cpp \
+    Src/Catalog.cpp \
+    Src/CharCodeToUnicode.cpp \
+    Src/CMap.cpp \
+    Src/Decrypt.cpp \
+    Src/Dict.cpp \
+    Src/ExtractImageOutputDev.cpp \
+    Src/FontFileBase.cpp \
+    Src/FontFileTrueType.cpp \
+    Src/FontFileType1.cpp \
+    Src/FontFileType1C.cpp \
+    Src/Function.cpp \
+    Src/GFont.cpp \
+    Src/GlobalParams.cpp \
+    Src/Graphics.cpp \
+    Src/GState.cpp \
+    Src/Hash.cpp \
+    Src/JArithmeticDecoder.cpp \
+    Src/JBIG2Stream.cpp \
+    Src/JPXStream.cpp \
+    Src/Lexer.cpp \
+    Src/Link.cpp \
+    Src/List.cpp \
+    Src/NameToCharCode.cpp \
+    Src/Object.cpp \
+    Src/Outline.cpp \
+    Src/OutputDevice.cpp \
+    Src/Page.cpp \
+    Src/Parser.cpp \
+    Src/PDFDoc.cpp \
+    Src/PSLexer.cpp \
+    Src/RendererOutputDev.cpp \
+    Src/SecurityHandler.cpp \
+    Src/Stream.cpp \
+    Src/StringExt.cpp \
+    Src/UnicodeMap.cpp \
+    Src/XRef.cpp \
+    PdfReader.cpp
+
+HEADERS +=\
+    Resources/Fontd050000l.h \
+    Resources/Fontn019003l.h \
+    Resources/Fontn019004l.h \
+    Resources/Fontn019023l.h \
+    Resources/Fontn019024l.h \
+    Resources/Fontn021003l.h \
+    Resources/Fontn021004l.h \
+    Resources/Fontn021023l.h \
+    Resources/Fontn021024l.h \
+    Resources/Fontn022003l.h \
+    Resources/Fontn022004l.h \
+    Resources/Fontn022023l.h \
+    Resources/Fontn022024l.h \
+    Resources/Fonts050000l.h \
+    Src/Annot.h \
+    Src/Array.h \
+    Src/BuiltinFont.h \
+    Src/BuiltinFontTables.h \
+    Src/Catalog.h \
+    Src/CCITT-Tables.h \
+    Src/CharCodeToUnicode.h \
+    Src/CharTypes.h \
+    Src/CMap.h \
+    Src/Constants.h \
+    Src/Decrypt.h \
+    Src/Dict.h \
+    Src/EncodingTables.h \
+    Src/ErrorConstants.h \
+    Src/ExtractImageOutputDev.h \
+    Src/File.h \
+    Src/FontFileBase.h \
+    Src/FontFileEncodings.h \
+    Src/FontFileTrueType.h \
+    Src/FontFileType1.h \
+    Src/FontFileType1C.h \
+    Src/Function.h \
+    Src/GFont.h \
+    Src/GlobalParams.h \
+    Src/Graphics.h \
+    Src/GState.h \
+    Src/Hash.h \
+    Src/JArithmeticDecoder.h \
+    Src/JBIG2Stream.h \
+    Src/JPXStream.h \
+    Src/Lexer.h \
+    Src/Link.h \
+    Src/List.h \
+    Src/MemoryUtils.h \
+    Src/NameToCharCode.h \
+    Src/NameToUnicodeTable.h \
+    Src/Object.h \
+    Src/Outline.h \
+    Src/OutputDevice.h \
+    Src/Page.h \
+    Src/Parser.h \
+    Src/PDFDoc.h \
+    Src/PDFDocEncoding.h \
+    Src/PSLexer.h \
+    Src/RendererOutputDev.h \
+    Src/SecurityHandler.h \
+    Src/Stream.h \
+    Src/StringExt.h \
+    Src/UnicodeMap.h \
+    Src/UnicodeMapTables.h \
+    Src/UTF8.h \
+    Src/XmlUtils.h \
+    Src/XRef.h \
+    PdfReader.h
+
+unix {
+    target.path = /usr/lib
+    INSTALLS += target
+}

PdfReader/Src/JBIG2Stream.cpp

@@ -1140,7 +1140,7 @@ namespace PdfReader
 	{
 	public:
 
-		JBIG2SymbolDict::JBIG2SymbolDict(unsigned int unSegNum, unsigned int unSize) : JBIG2Segment(unSegNum)
+		JBIG2SymbolDict(unsigned int unSegNum, unsigned int unSize) : JBIG2Segment(unSegNum)
 		{
 			m_unSize    = unSize;
 			m_ppBitmaps = (JBIG2Bitmap **)MemUtilsMallocArray(m_unSize, sizeof(JBIG2Bitmap *));

PdfReader/Src/MemoryUtils.h

@@ -5,6 +5,12 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifndef INT_MAX
+#define INT_MIN     (-2147483647 - 1) /* minimum (signed) int value */
+#define INT_MAX       2147483647    /* maximum (signed) int value */
+#endif
+
+
 namespace PdfReader
 {
 	//------------------------------------------------------------------------

PdfReader/Src/RendererOutputDev.cpp

@@ -2739,7 +2739,7 @@ namespace PdfReader
 		m_pRenderer->EndCommand(c_nPathType);
 		m_pRenderer->EndCommand(c_nClipType);
 	}
-	void RendererOutputDev::ClipToText(std::wstring& wsFontName, std::wstring& wsFontPath, double dFontSize, int nFontStyle, double *pMatrix, std::wstring& wsText, double dX, double dY, double dWidth, double dHeight, double dBaseLineOffset)
+	void RendererOutputDev::ClipToText(const std::wstring& wsFontName, const std::wstring& wsFontPath, double dFontSize, int nFontStyle, double *pMatrix, const std::wstring& wsText, double dX, double dY, double dWidth, double dHeight, double dBaseLineOffset)
 	{
 		if (m_bTransparentGroup)
 			return;

PdfReader/Src/RendererOutputDev.h

@@ -226,7 +226,7 @@ namespace PdfReader
 
 		void Transform(double *pMatrix, double dUserX, double dUserY, double *pdDeviceX, double *pdDeviceY);
 		void DoPath(GrState *pGState, GrPath *pPath, double dPageHeight, double *pCTM);
-		void ClipToText(std::wstring& wsFontName, std::wstring& wsFontPath, double dFontSize, int nFontStyle, double* pMatrix, std::wstring& wsText, double dX, double dY, double dWidth = 0, double dHeight = 0, double dBaseLineOffset = 0);
+		void ClipToText(const std::wstring& wsFontName, const std::wstring& wsFontPath, double dFontSize, int nFontStyle, double* pMatrix, const std::wstring& wsText, double dX, double dY, double dWidth = 0, double dHeight = 0, double dBaseLineOffset = 0);
 		void UpdateClip(GrState *pGState);
 		void UpdateClipAttack(GrState *pGState);
 		void DoTransform(double *pMatrix, double *pdShiftX, double *pdShiftY, bool bText = false);

PdfReader/Src/StringExt.h

@@ -4,6 +4,7 @@
 #include <stdarg.h>
 #include <string>
 #include "../../DesktopEditor/common/String.h"
+#include <string.h>
 
 namespace PdfReader
 {
@@ -12,7 +13,7 @@ namespace PdfReader
 	//---------------------------------------------------------------------------------------
 	typedef wchar_t* WString;
 
-	static WString AllocWString(std::wstring& wsString)
+	static WString AllocWString(const std::wstring& wsString)
 	{
 		int nLen = wsString.length();
 		WString wsResult = new wchar_t[nLen + 1];