Merge remote-tracking branch 'origin/master'

preferencesAboutTextFull
shibakaneki 14 years ago
commit 18a0e706b1
  1. 2
      src/pdf/XPDFRenderer.cpp
  2. 6
      thirdparty/libs.pri
  3. 9
      thirdparty/xpdf/README.txt
  4. 197
      thirdparty/xpdf/xpdf.pro
  5. 112
      thirdparty/xpdf/xpdf.pro.user

@ -5,7 +5,7 @@
#include <frameworks/UBPlatformUtils.h>
#include <xpdf/SplashBitmap.h>
#include <splash/SplashBitmap.h>
#include <xpdf/Object.h>
#include <xpdf/GlobalParams.h>
#include <xpdf/SplashOutputDev.h>

@ -15,9 +15,11 @@ FREETYPE_DIR = "$$PWD/freetype/freetype-2.4.4"
LIBS += "-L$$FREETYPE_DIR/lib/$$SUB_LIB" "-lfreetype"
# no INCLUDEPATH, freetype is not used directly
XPDF_DIR = "$$PWD/xpdf/3.02"
XPDF_DIR = "$$PWD/xpdf/xpdf-3.02"
LIBS += "-L$$XPDF_DIR/lib/$$SUB_LIB" "-lxpdf"
INCLUDEPATH += "$$XPDF_DIR/include"
INCLUDEPATH += "$$XPDF_DIR"
INCLUDEPATH += "$$XPDF_DIR/goo"
INCLUDEPATH += "$$XPDF_DIR/splash"
BREAKPAD_DIR = "$$PWD/google-breakpad/r318"
INCLUDEPATH += "$$BREAKPAD_DIR/include" "$$BREAKPAD_DIR/include/google_breakpad"

@ -7,17 +7,14 @@ instructions for version 3.02
- Decompress xpdf-3.02.xx.tar.gz
Windows:
- Copy aconf-win32.h (from 3.02/src) to 3.02/aconf.h
- undefine unicode API support by adding '#undef UNICODE' to 3.02/aconf.h
- Copy aconf-win32.h to aconf.h
- undefine unicode API support by adding '#undef UNICODE' aconf.h
OSX:
- run ./configure (may need extrea options ?)
- Copy resulting aconf.h (from 3.02/src) to 3.02/aconf.h
Linux (Ubuntu 9.10):
Linux:
- run ./configure --with-freetype2-library=/usr/lib --with-freetype2-includes=/usr/include/freetype2
- Copy resulting aconf.h (from 3.02/src) to 3.02/aconf.h
- Run qmake (-spec macx-g++ on OSX)
- Run make (nmake on windows)
- Run make (nmake on windows) install

@ -1,13 +1,13 @@
TEMPLATE = lib
CONFIG += staticlib release warn_off
XPDF_DIR = "3.02"
XPDF_DIR = "xpdf-3.02"
linux-g++ {
SUB_LIB = "linux"
}
macx {
macx {
SUB_LIB = "macx"
}
@ -25,106 +25,105 @@ macx {
}
# Free type includes and lib
FREETYPE_DIR = "../freetype/2.3.8"
FREETYPE_DIR = "../freetype/freetype-2.4.4"
INCLUDEPATH += "$$FREETYPE_DIR/include" "$$FREETYPE_DIR/include/freetype2"
LIBS += "-L$$FREETYPE_DIR/lib" "-lfreetype"
INCLUDEPATH += $$XPDF_DIR $$XPDF_DIR/src "$$XPDF_DIR/src/fofi" "$$XPDF_DIR/src/goo" "$$XPDF_DIR/src/splash" "$$XPDF_DIR/include"
INCLUDEPATH += $$XPDF_DIR $$XPDF_DIR "$$XPDF_DIR/fofi" "$$XPDF_DIR/goo" "$$XPDF_DIR/splash" "$$XPDF_DIR/include" xpdf-3.02Extra
aconf.path = "$$XPDF_DIR/include"
aconf.files = aconf2.h
headers.path = "$$XPDF_DIR/include/xpdf"
headers.files = $$XPDF_DIR/src/goo/gmem.h \
$$XPDF_DIR/src/goo/gtypes.h \
$$XPDF_DIR/src/goo/GMutex.h \
$$XPDF_DIR/src/goo/GString.h \
$$XPDF_DIR/src/splash/SplashTypes.h \
$$XPDF_DIR/src/splash/SplashBitmap.h \
$$XPDF_DIR/src/xpdf/config.h \
$$XPDF_DIR/src/xpdf/Array.h \
$$XPDF_DIR/src/xpdf/CharTypes.h \
$$XPDF_DIR/src/xpdf/Dict.h \
$$XPDF_DIR/src/xpdf/Function.h \
$$XPDF_DIR/src/xpdf/GfxState.h \
$$XPDF_DIR/src/xpdf/GlobalParams.h \
$$XPDF_DIR/src/xpdf/Object.h \
$$XPDF_DIR/src/xpdf/OutputDev.h \
$$XPDF_DIR/src/xpdf/PDFDoc.h \
$$XPDF_DIR/src/xpdf/SplashOutputDev.h \
$$XPDF_DIR/src/xpdf/Catalog.h \
$$XPDF_DIR/src/xpdf/Page.h \
$$XPDF_DIR/src/xpdf/Stream.h \
$$XPDF_DIR/src/xpdf/XRef.h
aconf.path = $$XPDF_DIR
aconf.files = $$XPDF_DIR/aconf.h
headers.path = "$$XPDF_DIR/xpdf"
headers.files = $$XPDF_DIR/goo/gmem.h \
$$XPDF_DIR/goo/gtypes.h \
$$XPDF_DIR/goo/GMutex.h \
$$XPDF_DIR/goo/GString.h \
$$XPDF_DIR/splash/SplashTypes.h \
$$XPDF_DIR/splash/SplashBitmap.h \
$$XPDF_DIR/xpdf/config.h \
$$XPDF_DIR/xpdf/Array.h \
$$XPDF_DIR/xpdf/CharTypes.h \
$$XPDF_DIR/xpdf/Dict.h \
$$XPDF_DIR/xpdf/Function.h \
$$XPDF_DIR/xpdf/GfxState.h \
$$XPDF_DIR/xpdf/GlobalParams.h \
$$XPDF_DIR/xpdf/Object.h \
$$XPDF_DIR/xpdf/OutputDev.h \
$$XPDF_DIR/xpdf/PDFDoc.h \
$$XPDF_DIR/xpdf/SplashOutputDev.h \
$$XPDF_DIR/xpdf/Catalog.h \
$$XPDF_DIR/xpdf/Page.h \
$$XPDF_DIR/xpdf/Stream.h \
$$XPDF_DIR/xpdf/XRef.h
INSTALLS += "aconf" "headers"
#INSTALLS += "aconf" "headers"
INSTALLS += "headers"
SOURCES += $$XPDF_DIR/src/fofi/FoFiBase.cc \
$$XPDF_DIR/src/fofi/FoFiEncodings.cc \
$$XPDF_DIR/src/fofi/FoFiTrueType.cc \
$$XPDF_DIR/src/fofi/FoFiType1.cc \
$$XPDF_DIR/src/fofi/FoFiType1C.cc \
$$XPDF_DIR/src/fofi/FoFiIdentifier.cc \
$$XPDF_DIR/src/goo/gfile.cc \
$$XPDF_DIR/src/goo/GHash.cc \
$$XPDF_DIR/src/goo/GList.cc \
$$XPDF_DIR/src/goo/gmem.cc \
$$XPDF_DIR/src/goo/GString.cc \
$$XPDF_DIR/src/splash/Splash.cc \
$$XPDF_DIR/src/splash/SplashBitmap.cc \
$$XPDF_DIR/src/splash/SplashClip.cc \
$$XPDF_DIR/src/splash/SplashFTFont.cc \
$$XPDF_DIR/src/splash/SplashFTFontEngine.cc \
$$XPDF_DIR/src/splash/SplashFTFontFile.cc \
$$XPDF_DIR/src/splash/SplashFont.cc \
$$XPDF_DIR/src/splash/SplashFontEngine.cc \
$$XPDF_DIR/src/splash/SplashFontFile.cc \
$$XPDF_DIR/src/splash/SplashFontFileID.cc \
$$XPDF_DIR/src/splash/SplashPath.cc \
$$XPDF_DIR/src/splash/SplashPattern.cc \
$$XPDF_DIR/src/splash/SplashScreen.cc \
$$XPDF_DIR/src/splash/SplashState.cc \
$$XPDF_DIR/src/splash/SplashXPath.cc \
$$XPDF_DIR/src/splash/SplashXPathScanner.cc \
$$XPDF_DIR/src/xpdf/Annot.cc \
$$XPDF_DIR/src/xpdf/Array.cc \
$$XPDF_DIR/src/xpdf/BuiltinFont.cc \
$$XPDF_DIR/src/xpdf/BuiltinFontTables.cc \
$$XPDF_DIR/src/xpdf/Catalog.cc \
$$XPDF_DIR/src/xpdf/CharCodeToUnicode.cc \
$$XPDF_DIR/src/xpdf/CMap.cc \
$$XPDF_DIR/src/xpdf/CoreOutputDev.cc \
$$XPDF_DIR/src/xpdf/Decrypt.cc \
$$XPDF_DIR/src/xpdf/Dict.cc \
$$XPDF_DIR/src/xpdf/Error.cc \
$$XPDF_DIR/src/xpdf/FontEncodingTables.cc \
$$XPDF_DIR/src/xpdf/Function.cc \
$$XPDF_DIR/src/xpdf/Gfx.cc \
$$XPDF_DIR/src/xpdf/GfxFont.cc \
$$XPDF_DIR/src/xpdf/GfxState.cc \
$$XPDF_DIR/src/xpdf/GlobalParams.cc \
$$XPDF_DIR/src/xpdf/ImageOutputDev.cc \
$$XPDF_DIR/src/xpdf/JArithmeticDecoder.cc \
$$XPDF_DIR/src/xpdf/JBIG2Stream.cc \
$$XPDF_DIR/src/xpdf/JPXStream.cc \
$$XPDF_DIR/src/xpdf/Lexer.cc \
$$XPDF_DIR/src/xpdf/Link.cc \
$$XPDF_DIR/src/xpdf/NameToCharCode.cc \
$$XPDF_DIR/src/xpdf/Object.cc \
$$XPDF_DIR/src/xpdf/OptionalContent.cc \
$$XPDF_DIR/src/xpdf/Outline.cc \
$$XPDF_DIR/src/xpdf/OutputDev.cc \
$$XPDF_DIR/src/xpdf/Page.cc \
$$XPDF_DIR/src/xpdf/Parser.cc \
$$XPDF_DIR/src/xpdf/PDFCore.cc \
$$XPDF_DIR/src/xpdf/PDFDoc.cc \
$$XPDF_DIR/src/xpdf/PDFDocEncoding.cc \
$$XPDF_DIR/src/xpdf/PreScanOutputDev.cc \
$$XPDF_DIR/src/xpdf/PSOutputDev.cc \
$$XPDF_DIR/src/xpdf/PSTokenizer.cc \
$$XPDF_DIR/src/xpdf/SecurityHandler.cc \
$$XPDF_DIR/src/xpdf/SplashOutputDev.cc \
$$XPDF_DIR/src/xpdf/Stream.cc \
$$XPDF_DIR/src/xpdf/TextOutputDev.cc \
$$XPDF_DIR/src/xpdf/UnicodeMap.cc \
$$XPDF_DIR/src/xpdf/UnicodeTypeTable.cc \
$$XPDF_DIR/src/xpdf/XRef.cc
SOURCES += $$XPDF_DIR/fofi/FoFiBase.cc \
$$XPDF_DIR/fofi/FoFiEncodings.cc \
$$XPDF_DIR/fofi/FoFiTrueType.cc \
$$XPDF_DIR/fofi/FoFiType1.cc \
$$XPDF_DIR/fofi/FoFiType1C.cc \
$$XPDF_DIR/goo/gfile.cc \
$$XPDF_DIR/goo/GHash.cc \
$$XPDF_DIR/goo/GList.cc \
$$XPDF_DIR/goo/gmem.cc \
$$XPDF_DIR/goo/GString.cc \
$$XPDF_DIR/splash/Splash.cc \
$$XPDF_DIR/splash/SplashBitmap.cc \
$$XPDF_DIR/splash/SplashClip.cc \
$$XPDF_DIR/splash/SplashFTFont.cc \
$$XPDF_DIR/splash/SplashFTFontEngine.cc \
$$XPDF_DIR/splash/SplashFTFontFile.cc \
$$XPDF_DIR/splash/SplashFont.cc \
$$XPDF_DIR/splash/SplashFontEngine.cc \
$$XPDF_DIR/splash/SplashFontFile.cc \
$$XPDF_DIR/splash/SplashFontFileID.cc \
$$XPDF_DIR/splash/SplashPath.cc \
$$XPDF_DIR/splash/SplashPattern.cc \
$$XPDF_DIR/splash/SplashScreen.cc \
$$XPDF_DIR/splash/SplashState.cc \
$$XPDF_DIR/splash/SplashXPath.cc \
$$XPDF_DIR/splash/SplashXPathScanner.cc \
$$XPDF_DIR/xpdf/Annot.cc \
$$XPDF_DIR/xpdf/Array.cc \
$$XPDF_DIR/xpdf/BuiltinFont.cc \
$$XPDF_DIR/xpdf/BuiltinFontTables.cc \
$$XPDF_DIR/xpdf/Catalog.cc \
$$XPDF_DIR/xpdf/CharCodeToUnicode.cc \
$$XPDF_DIR/xpdf/CMap.cc \
$$XPDF_DIR/xpdf/CoreOutputDev.cc \
$$XPDF_DIR/xpdf/Decrypt.cc \
$$XPDF_DIR/xpdf/Dict.cc \
$$XPDF_DIR/xpdf/Error.cc \
$$XPDF_DIR/xpdf/FontEncodingTables.cc \
$$XPDF_DIR/xpdf/Function.cc \
$$XPDF_DIR/xpdf/Gfx.cc \
$$XPDF_DIR/xpdf/GfxFont.cc \
$$XPDF_DIR/xpdf/GfxState.cc \
$$XPDF_DIR/xpdf/GlobalParams.cc \
$$XPDF_DIR/xpdf/ImageOutputDev.cc \
$$XPDF_DIR/xpdf/JArithmeticDecoder.cc \
$$XPDF_DIR/xpdf/JBIG2Stream.cc \
$$XPDF_DIR/xpdf/JPXStream.cc \
$$XPDF_DIR/xpdf/Lexer.cc \
$$XPDF_DIR/xpdf/Link.cc \
$$XPDF_DIR/xpdf/NameToCharCode.cc \
$$XPDF_DIR/xpdf/Object.cc \
$$XPDF_DIR/xpdf/Outline.cc \
$$XPDF_DIR/xpdf/OutputDev.cc \
$$XPDF_DIR/xpdf/Page.cc \
$$XPDF_DIR/xpdf/Parser.cc \
$$XPDF_DIR/xpdf/PDFCore.cc \
$$XPDF_DIR/xpdf/PDFDoc.cc \
$$XPDF_DIR/xpdf/PDFDocEncoding.cc \
$$XPDF_DIR/xpdf/PreScanOutputDev.cc \
$$XPDF_DIR/xpdf/PSOutputDev.cc \
$$XPDF_DIR/xpdf/PSTokenizer.cc \
$$XPDF_DIR/xpdf/SecurityHandler.cc \
$$XPDF_DIR/xpdf/SplashOutputDev.cc \
$$XPDF_DIR/xpdf/Stream.cc \
$$XPDF_DIR/xpdf/TextOutputDev.cc \
$$XPDF_DIR/xpdf/UnicodeMap.cc \
$$XPDF_DIR/xpdf/UnicodeTypeTable.cc \
$$XPDF_DIR/xpdf/XRef.cc

@ -1,112 +0,0 @@
<!DOCTYPE QtCreatorProject>
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
<value type="int">0</value>
</data>
<data>
<variable>ProjectExplorer.Project.EditorSettings</variable>
<valuemap type="QVariantMap">
<value key="EditorConfiguration.Codec" type="QByteArray">System</value>
</valuemap>
</data>
<data>
<variable>ProjectExplorer.Project.Target.0</variable>
<valuemap type="QVariantMap">
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Desktop</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Target.DesktopTarget</value>
<value key="ProjectExplorer.Target.ActiveBuildConfiguration" type="int">0</value>
<value key="ProjectExplorer.Target.ActiveRunConfiguration" type="int">0</value>
<valuemap key="ProjectExplorer.Target.BuildConfiguration.0" type="QVariantMap">
<valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap">
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">qmake</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
<valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList"/>
</valuemap>
<valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.1" type="QVariantMap">
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Make</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
<value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
<valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
<value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
</valuemap>
<value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">2</value>
<valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" type="QVariantMap">
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Make</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
<value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
<valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList">
<value type="QString">clean</value>
</valuelist>
<value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
</valuemap>
<value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value>
<value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
<valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Debug</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/claudio/project/UniboardClaudioEvo/thirdparty/xpdf-build-desktop</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">2</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
</valuemap>
<valuemap key="ProjectExplorer.Target.BuildConfiguration.1" type="QVariantMap">
<valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap">
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">qmake</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
<valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList"/>
</valuemap>
<valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.1" type="QVariantMap">
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Make</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
<value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
<valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
<value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
</valuemap>
<value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">2</value>
<valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" type="QVariantMap">
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Make</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
<value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
<valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList">
<value type="QString">clean</value>
</valuelist>
<value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
</valuemap>
<value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value>
<value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
<valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Release</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/claudio/project/UniboardClaudioEvo/thirdparty/xpdf-build-desktop</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">2</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
</valuemap>
<value key="ProjectExplorer.Target.BuildConfigurationCount" type="int">2</value>
<valuemap key="ProjectExplorer.Target.RunConfiguration.0" type="QVariantMap">
<valuelist key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments" type="QVariantList"/>
<value key="ProjectExplorer.CustomExecutableRunConfiguration.BaseEnvironmentBase" type="int">2</value>
<value key="ProjectExplorer.CustomExecutableRunConfiguration.Executable" type="QString"></value>
<value key="ProjectExplorer.CustomExecutableRunConfiguration.UseTerminal" type="bool">false</value>
<valuelist key="ProjectExplorer.CustomExecutableRunConfiguration.UserEnvironmentChanges" type="QVariantList"/>
<value key="ProjectExplorer.CustomExecutableRunConfiguration.UserName" type="QString"></value>
<value key="ProjectExplorer.CustomExecutableRunConfiguration.UserSetName" type="bool">false</value>
<value key="ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory" type="QString">$BUILDDIR</value>
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Custom Executable</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.CustomExecutableRunConfiguration</value>
</valuemap>
<value key="ProjectExplorer.Target.RunConfigurationCount" type="int">1</value>
</valuemap>
</data>
<data>
<variable>ProjectExplorer.Project.TargetCount</variable>
<value type="int">1</value>
</data>
<data>
<variable>ProjectExplorer.Project.Updater.FileVersion</variable>
<value type="int">4</value>
</data>
</qtcreator>
Loading…
Cancel
Save