/trunk/Scribus/.travis.yml |
---|
39,7 → 39,7 |
# Linux |
- if [ $TRAVIS_OS_NAME == linux ]; then |
sudo apt-get install --force-yes cmake libboost-python-dev libcairo2-dev libcups2-dev |
libharfbuzz-dev libharfbuzz-icu0 libhunspell-dev libhyphen-dev liblcms2-dev |
libharfbuzz-dev libharfbuzz-icu0 libhunspell-dev libhyphen-dev liblcms2-dev libpng-dev |
libpodofo-dev libpoppler-dev libpoppler-cpp-dev libtiff-dev libxml2-dev |
qt510base qt510declarative qt510tools python3-all-dev python3-tk zlib1g-dev |
libgraphicsmagick++1-dev libopenscenegraph-dev libcdr-dev libmspub-dev libwpg-dev libvisio-dev |
61,6 → 61,7 |
brew install xz little-cms2 cairo qt5 hunspell ghostscript graphicsmagick poppler podofo harfbuzz; |
brew install python3 --with-tcl-tk; |
brew outdated jpeg --verbose || brew upgrade jpeg; |
brew outdated libpng --verbose || brew upgrade libpng; |
brew outdated libtiff --verbose || brew upgrade libtiff; |
brew outdated fontconfig --verbose || brew upgrade fontconfig; |
brew install openssl && brew link --force openssl; |
/trunk/Scribus/BUILDING |
---|
29,17 → 29,19 |
Requirements: |
Qt >= 5.10.0 (Scribus has specific code requiring Qt 5.10.0, not Qt 5.9.x or before) |
Freetype >= 2.1.7 (2.3.x strongly recommended) |
cairo >= 1.14.x |
cairo >= 1.14.x |
harfbuzz = > 0.9.42 |
libicu |
libjpeg (depending on how Qt is packaged) |
libpng >= 1.6.0 |
libtiff >= 3.6.0 |
libxml2 >= 2.6.0 |
LittleCMS (liblcms) >= 2.0 (2.1+ recommended) |
libjpeg (depending on how Qt is packaged) |
harfbuzz = > 0.9.42 |
libicu |
poppler and poppler-cpp >= 0.62.0 |
Recommended: |
CUPS |
Fontconfig >= 2.0 |
LibXML2 >= 2.6.0 |
GhostScript >= 8.0 (9.0+ or greater preferred) |
Python >= 3.6 |
tkinter for the font sampler script |
205,6 → 207,7 |
libfreetype6-dev (Required) |
libharfbuzz-dev (Required) |
liblcms2-dev (Required) |
libpng-dev (Required) |
libtiff5-dev (Required) |
libxml2-dev (Required) |
libboost-dev |
237,6 → 240,7 |
harfbuzz-devel (Required) |
lcms2-devel (Required) |
libjpeg-devel (Required) |
libpng-devel (Required) |
libtiff-devel (Required) |
libxml2-devel (Required) |
boost-devel |
264,6 → 268,7 |
harfbuzz-devel (required) > 0.9.42 |
libjpeg-devel (required) |
liblcms-devel (required) |
libpng16-compat-devel (required) |
libtiff-devel (required) |
libxml2-devel (required) |
openssl-devel (required if CUPS support is needed) |
/trunk/Scribus/CMakeLists.txt |
---|
411,6 → 411,7 |
${JPEG_INCLUDE_DIR} |
${LCMS2_INCLUDE_DIR} |
${LIBXML2_INCLUDE_DIR} |
${PNG_INCLUDE_DIR} |
${TIFF_INCLUDE_DIR} |
${ZLIB_INCLUDE_DIR} |
${OPENGL_INCLUDE_DIR} |
/trunk/Scribus/CMakeLists_Dependencies.cmake |
---|
120,11 → 120,17 |
endif() |
endif() |
#<< JPEG, TIFF |
#<< JPEG, PNG, TIFF |
find_package(JPEG REQUIRED) |
if (JPEG_FOUND) |
message("JPEG Library Found OK") |
endif() |
find_package(PNG 1.6 REQUIRED) |
if (PNG_FOUND) |
message("PNG Library Found OK") |
endif() |
find_package(TIFF REQUIRED) |
if (TIFF_FOUND) |
message("TIFF Library Found OK") |
/trunk/Scribus/scribus/CMakeLists.txt |
---|
788,6 → 788,7 |
imagedataloaders/scimgdataloader_pdf.cpp |
imagedataloaders/scimgdataloader_pgf.cpp |
imagedataloaders/scimgdataloader_pict.cpp |
imagedataloaders/scimgdataloader_png.cpp |
imagedataloaders/scimgdataloader_ps.cpp |
imagedataloaders/scimgdataloader_psd.cpp |
imagedataloaders/scimgdataloader_qt.cpp |
1289,6 → 1290,7 |
# ${FONTCONFIG_LIBRARIES} |
${LIBXML2_LIBRARIES} |
${TIFF_LIBRARIES} |
${PNG_LIBRARIES} |
${JPEG_LIBRARIES} |
${ZLIB_LIBRARIES} |
${WIN32_ONLY_LIBS} |
/trunk/Scribus/scribus/colormgmt/sccolorprofile.cpp |
---|
33,6 → 33,20 |
return Class_Unknown; |
} |
QString ScColorProfile::dataHash() const |
{ |
if (m_data) |
return m_data->dataHash(); |
return QString(); |
} |
bool ScColorProfile::isSuitableForOutput() const |
{ |
if (m_data) |
return m_data->isSuitableForOutput(); |
return false; |
} |
QString ScColorProfile::profilePath() const |
{ |
if (m_data) |
/trunk/Scribus/scribus/colormgmt/sccolorprofile.h |
---|
10,6 → 10,7 |
#include <QSharedPointer> |
#include <QWeakPointer> |
#include "scribusapi.h" |
#include "sccolorprofiledata.h" |
28,6 → 29,8 |
inline bool isNull() const { return (m_data.isNull() || m_data->isNull()); } |
inline operator bool () const { return !isNull(); } |
bool isSuitableForOutput() const; |
QString profilePath() const; |
QString productDescription() const; |
35,6 → 38,7 |
eProfileClass deviceClass() const; |
const ScColorProfileData* data() const { return m_data.data(); } |
QString dataHash() const; |
bool operator==(const ScColorProfile& prof) const; |
/trunk/Scribus/scribus/colormgmt/sccolorprofiledata.h |
---|
31,6 → 31,7 |
virtual bool isNull() const = 0; |
virtual eColorSpaceType colorSpace() const = 0; |
virtual eProfileClass deviceClass() const = 0; |
virtual bool isSuitableForOutput() const = 0; |
virtual QString productDescription() const = 0; |
}; |
/trunk/Scribus/scribus/colormgmt/sclcms2colorprofileimpl.cpp |
---|
39,6 → 39,23 |
return Class_Unknown; |
} |
bool ScLcms2ColorProfileImpl::isSuitableForOutput() const |
{ |
if (!m_profileHandle) |
return false; |
if (cmsIsMatrixShaper(m_profileHandle)) |
return true; |
cmsUInt32Number defaultIntent = cmsGetHeaderRenderingIntent(m_profileHandle); |
if (cmsIsCLUT(m_profileHandle, defaultIntent, LCMS_USED_AS_INPUT) && |
cmsIsCLUT(m_profileHandle, defaultIntent, LCMS_USED_AS_OUTPUT)) |
{ |
return true; |
} |
return false; |
} |
QString ScLcms2ColorProfileImpl::productDescription() const |
{ |
if (m_productDescription.isEmpty()) |
/trunk/Scribus/scribus/colormgmt/sclcms2colorprofileimpl.h |
---|
26,6 → 26,7 |
virtual eColorSpaceType colorSpace() const; |
virtual eProfileClass deviceClass() const; |
virtual bool isSuitableForOutput() const; |
virtual QString productDescription() const; |
protected: |
/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_png.cpp |
---|
0,0 → 1,135 |
/* |
For general Scribus (>=1.3.2) copyright and licensing information please refer |
to the COPYING file provided with the program. Following this notice may exist |
a copyright and/or license notice that predates the release of Scribus 1.3.2 |
for which a new license (GPL+exception) is in place. |
*/ |
#include <QByteArray> |
#include <QFile> |
#include <QFileInfo> |
#include <QImageReader> |
#include <QList> |
#include <png.h> |
#include "colormgmt/sccolormgmtengine.h" |
#include "scimgdataloader_png.h" |
#include "scribuscore.h" |
#include "util_formats.h" |
ScImgDataLoader_PNG::ScImgDataLoader_PNG() |
{ |
initSupportedFormatList(); |
} |
void ScImgDataLoader_PNG::initSupportedFormatList() |
{ |
m_supportedFormats.clear(); |
m_supportedFormats.append( "png" ); |
} |
static void ScImgDataLoader_PNG_read_fn(png_structp pngPtr, png_bytep data, png_size_t length) |
{ |
QFile *file = (QFile*) png_get_io_ptr(pngPtr); |
while (length) |
{ |
int nr = file->read((char*) data, length); |
if (nr <= 0) |
{ |
png_error(pngPtr, "Read Error"); |
return; |
} |
length -= nr; |
} |
} |
void ScImgDataLoader_PNG::loadEmbeddedProfile(const QString& fn, int /*page*/) |
{ |
m_embeddedProfile.resize(0); |
m_profileComponents = 0; |
QFile pngFile(fn); |
if (!pngFile.open(QFile::ReadOnly)) |
return; |
png_byte pngSignature[8]; |
pngFile.peek((char*) pngSignature, 8); |
if (png_sig_cmp(pngSignature, 0, 8) != 0) |
{ |
pngFile.close(); |
return; |
} |
png_structp pngPtr = png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0); |
if (!pngPtr) |
{ |
pngFile.close(); |
return; |
} |
png_infop pngInfo = png_create_info_struct(pngPtr); |
if (!pngInfo) |
{ |
png_destroy_read_struct(&pngPtr, (png_infopp) NULL, (png_infopp) NULL); |
pngFile.close(); |
return; |
} |
// Catch errors (huh!!! we have to use setjump) |
if (setjmp(png_jmpbuf(pngPtr))) |
{ |
png_destroy_read_struct(&pngPtr, &pngInfo, (png_infopp) NULL); |
pngFile.close(); |
return; |
} |
png_set_read_fn(pngPtr, &pngFile, ScImgDataLoader_PNG_read_fn); |
png_read_info(pngPtr, pngInfo); |
// Read image profile |
png_charp profileName; |
png_bytep profileData; |
int compression_type; |
png_uint_32 profileLen; |
if (png_get_iCCP(pngPtr, pngInfo, &profileName, &compression_type, &profileData, &profileLen)) |
{ |
QByteArray profArray = QByteArray((const char*) profileData, profileLen); |
ScColorProfile prof = ScCore->defaultEngine.openProfileFromMem(profArray); |
if (prof && prof.isSuitableForOutput()) |
{ |
if (prof.colorSpace() == ColorSpace_Rgb) |
m_profileComponents = 3; |
if (prof.colorSpace() == ColorSpace_Cmyk) |
m_profileComponents = 4; |
if (prof.colorSpace() == ColorSpace_Gray) |
m_profileComponents = 1; |
m_embeddedProfile = profArray; |
} |
} |
pngFile.close(); |
png_destroy_read_struct(&pngPtr, &pngInfo, (png_infopp) NULL); |
} |
bool ScImgDataLoader_PNG::loadPicture(const QString& fn, int page, int res, bool thumbnail) |
{ |
bool result1 = ScImgDataLoader_QT::loadPicture(fn, page, res, thumbnail); |
if (!result1) |
return false; |
loadEmbeddedProfile(fn, page); |
if (m_embeddedProfile.size() > 0) |
{ |
ScColorMgmtEngine engine(ScCore->defaultEngine); |
ScColorProfile imgProfile = engine.openProfileFromMem(m_embeddedProfile); |
m_imageInfoRecord.profileName = imgProfile.productDescription(); |
if (m_imageInfoRecord.profileName.isEmpty()) |
m_imageInfoRecord.profileName = "Profile #" + imgProfile.dataHash(); |
m_imageInfoRecord.isEmbedded = true; |
} |
return true; |
} |
/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_png.h |
---|
0,0 → 1,25 |
/* |
For general Scribus (>=1.3.2) copyright and licensing information please refer |
to the COPYING file provided with the program. Following this notice may exist |
a copyright and/or license notice that predates the release of Scribus 1.3.2 |
for which a new license (GPL+exception) is in place. |
*/ |
#ifndef SCIMGDATALOADER_PNG_H |
#define SCIMGDATALOADER_PNG_H |
#include "scimgdataloader.h" |
#include "scimgdataloader_qt.h" |
class ScImgDataLoader_PNG : public ScImgDataLoader_QT |
{ |
public: |
ScImgDataLoader_PNG(); |
virtual void loadEmbeddedProfile(const QString& fn, int page = 0); |
virtual bool loadPicture(const QString& fn, int page, int res, bool thumbnail); |
protected: |
void initSupportedFormatList(); |
}; |
#endif |
/trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt |
---|
30,6 → 30,7 |
target_link_libraries(${SCRIBUS_IMPORTAI_PLUGIN} |
${PLUGIN_LIBRARIES} |
${TIFF_LIBRARIES} |
${PNG_LIBRARIES} |
${JPEG_LIBRARIES} |
) |
else() |
/trunk/Scribus/scribus/scimage.cpp |
---|
44,10 → 44,11 |
#include "imagedataloaders/scimgdataloader_ora.h" |
#include "imagedataloaders/scimgdataloader_kra.h" |
#include "imagedataloaders/scimgdataloader_pict.h" |
#include "imagedataloaders/scimgdataloader_pdf.h" |
#include "imagedataloaders/scimgdataloader_pgf.h" |
#include "imagedataloaders/scimgdataloader_png.h" |
#include "imagedataloaders/scimgdataloader_ps.h" |
#include "imagedataloaders/scimgdataloader_psd.h" |
#include "imagedataloaders/scimgdataloader_pdf.h" |
#include "imagedataloaders/scimgdataloader_pgf.h" |
#include "imagedataloaders/scimgdataloader_qt.h" |
#include "imagedataloaders/scimgdataloader_tiff.h" |
#include "imagedataloaders/scimgdataloader_wpg.h" |
2007,9 → 2008,9 |
{ |
pDataLoader.reset( new ScImgDataLoader_PS() ); |
} |
else if (extensionIndicatesTIFF(ext)) |
else if (extensionIndicatesPNG(ext)) |
{ |
pDataLoader.reset( new ScImgDataLoader_TIFF() ); |
pDataLoader.reset( new ScImgDataLoader_PNG() ); |
if (pDataLoader.data()) |
pDataLoader->setRequest(imgInfo.isRequest, imgInfo.RequestProps); |
} |
2019,6 → 2020,12 |
if (pDataLoader.data()) |
pDataLoader->setRequest(imgInfo.isRequest, imgInfo.RequestProps); |
} |
else if (extensionIndicatesTIFF(ext)) |
{ |
pDataLoader.reset( new ScImgDataLoader_TIFF() ); |
if (pDataLoader.data()) |
pDataLoader->setRequest(imgInfo.isRequest, imgInfo.RequestProps); |
} |
else if (ext == "ora") |
{ |
pDataLoader.reset( new ScImgDataLoader_ORA() ); |
2135,6 → 2142,7 |
profile->resize(0); |
*components = 0; |
QFileInfo fi = QFileInfo(fn); |
if (!fi.exists()) |
return; |
2143,18 → 2151,30 |
if (ext.isEmpty() || (!ext2.isEmpty() && (ext2 != ext))) |
ext = ext2; |
QList<QByteArray> fmtList = QImageReader::supportedImageFormats(); |
QStringList fmtImg; |
for (int i = 0; i < fmtList.count(); i++) |
fmtImg.append( QString(fmtList[i].toLower()) ); |
if (extensionIndicatesPSD(ext)) |
pDataLoader = new ScImgDataLoader_PSD(); |
else if (extensionIndicatesEPSorPS(ext)) |
pDataLoader = new ScImgDataLoader_PS(); |
else if (extensionIndicatesJPEG(ext)) |
pDataLoader = new ScImgDataLoader_JPEG(); |
else if (extensionIndicatesPNG(ext)) |
pDataLoader = new ScImgDataLoader_PNG(); |
else if (extensionIndicatesTIFF(ext)) |
pDataLoader = new ScImgDataLoader_TIFF(); |
else if (extensionIndicatesJPEG(ext)) |
pDataLoader = new ScImgDataLoader_JPEG(); |
#ifdef FOUND_GMAGICK |
#ifdef GMAGICK_FOUND |
else if (fmtImg.contains(ext)) |
pDataLoader = new ScImgDataLoader_QT(); |
else |
pDataLoader = new ScImgDataLoader_GMagick(); |
#endif |
#else |
else |
pDataLoader = new ScImgDataLoader_QT(); |
#endif |
if (pDataLoader) |
{ |
2183,13 → 2203,9 |
if (profile) |
{ |
cache.addModifier(prefix + "ProfileDescription", profile.productDescription()); |
const ScColorProfileData *pd = profile.data(); |
if (pd) |
{ |
QString hash = pd->dataHash(); |
if (!hash.isEmpty()) |
cache.addModifier(prefix + "ProfileHash", hash); |
} |
QString hash = profile.dataHash(); |
if (!hash.isEmpty()) |
cache.addModifier(prefix + "ProfileHash", hash); |
} |
} |
2283,15 → 2299,17 |
pDataLoader.reset( new ScImgDataLoader_PDF() ); |
else if (extensionIndicatesEPSorPS(ext)) |
pDataLoader.reset( new ScImgDataLoader_PS() ); |
else if (extensionIndicatesTIFF(ext)) |
pDataLoader.reset( new ScImgDataLoader_TIFF() ); |
else if (extensionIndicatesJPEG(ext)) |
pDataLoader.reset( new ScImgDataLoader_JPEG() ); |
else if (extensionIndicatesPNG(ext)) |
pDataLoader.reset( new ScImgDataLoader_PNG() ); |
else if (extensionIndicatesPSD(ext)) |
{ |
pDataLoader.reset( new ScImgDataLoader_PSD() ); |
pDataLoader->setRequest(imgInfo.isRequest, imgInfo.RequestProps); |
} |
else if (extensionIndicatesJPEG(ext)) |
pDataLoader.reset( new ScImgDataLoader_JPEG() ); |
else if (extensionIndicatesTIFF(ext)) |
pDataLoader.reset( new ScImgDataLoader_TIFF() ); |
else if (ext == "pat") |
pDataLoader.reset( new ScImgDataLoader_GIMP() ); |
else if (ext == "pgf") |
/trunk/Scribus/scribus/util_formats.cpp |
---|
329,34 → 329,41 |
formatAll=QObject::tr("All Files (*)"); |
} |
bool extensionIndicatesPDF(const QString &ext) |
bool extensionIndicatesEPS(const QString &ext) |
{ |
QStringList strl; |
strl << "ai" << "pdf"; |
strl << "eps" << "epsf" << "epsi" << "eps2" << "eps3" << "epi" << "ept"; |
return strl.contains(ext, Qt::CaseInsensitive); |
} |
bool extensionIndicatesEPS(const QString &ext) |
bool extensionIndicatesEPSorPS(const QString &ext) |
{ |
QStringList strl; |
strl << "eps" << "epsf" << "epsi" << "eps2" << "eps3" << "epi" << "ept"; |
strl << "eps" << "epsf" << "epsi" << "ps" << "eps2" << "eps3" << "epi" << "ept"; |
return strl.contains(ext, Qt::CaseInsensitive); |
} |
bool extensionIndicatesEPSorPS(const QString &ext) |
bool extensionIndicatesJPEG(const QString &ext) |
{ |
QStringList strl; |
strl << "eps" << "epsf" << "epsi" << "ps" << "eps2" << "eps3" << "epi" << "ept"; |
strl << "jpg" << "jpeg"; |
return strl.contains(ext, Qt::CaseInsensitive); |
} |
bool extensionIndicatesTIFF(const QString &ext) |
bool extensionIndicatesPDF(const QString &ext) |
{ |
QStringList strl; |
strl << "tif" << "tiff"; |
strl << "ai" << "pdf"; |
return strl.contains(ext, Qt::CaseInsensitive); |
} |
bool extensionIndicatesPNG(const QString &ext) |
{ |
QStringList strl; |
strl << "png"; |
return strl.contains(ext, Qt::CaseInsensitive); |
} |
bool extensionIndicatesPSD(const QString &ext) |
{ |
QStringList strl; |
364,10 → 371,10 |
return strl.contains(ext, Qt::CaseInsensitive); |
} |
bool extensionIndicatesJPEG(const QString &ext) |
bool extensionIndicatesTIFF(const QString &ext) |
{ |
QStringList strl; |
strl << "jpg" << "jpeg"; |
strl << "tif" << "tiff"; |
return strl.contains(ext, Qt::CaseInsensitive); |
} |
/trunk/Scribus/scribus/util_formats.h |
---|
26,6 → 26,7 |
bool SCRIBUS_API extensionIndicatesEPSorPS(const QString &ext); |
bool SCRIBUS_API extensionIndicatesJPEG(const QString &ext); |
bool SCRIBUS_API extensionIndicatesPDF(const QString &ext); |
bool SCRIBUS_API extensionIndicatesPNG(const QString &ext); |
bool SCRIBUS_API extensionIndicatesPSD(const QString &ext); |
bool SCRIBUS_API extensionIndicatesPattern(const QString &ext); |
bool SCRIBUS_API extensionIndicatesTIFF(const QString &ext); |
/trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj |
---|
100,7 → 100,7 |
<Optimization>Disabled</Optimization> |
<InlineFunctionExpansion>Default</InlineFunctionExpansion> |
<IntrinsicFunctions>false</IntrinsicFunctions> |
<AdditionalIncludeDirectories>..\..\msvc2015;..\..\..\scribus;..\..\..\scribus\colormgmt;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtPrintSupport;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(HARFBUZZ_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);$(OPENSSL_INCLUDE_DIR);$(PODOFO_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
<AdditionalIncludeDirectories>..\..\msvc2015;..\..\..\scribus;..\..\..\scribus\colormgmt;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtPrintSupport;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(HARFBUZZ_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBPNG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);$(OPENSSL_INCLUDE_DIR);$(PODOFO_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;HAVE_CONFIG_H;AVOID_WIN32_FILEIO;COMPILE_SCRIBUS_MAIN_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
<MinimalRebuild>false</MinimalRebuild> |
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
117,8 → 117,8 |
<MultiProcessorCompilation>true</MultiProcessorCompilation> |
</ClCompile> |
<Link> |
<AdditionalDependencies>$(QT5CORE_LIB);$(QT5GUI_LIB);$(QT5NETWORK_LIB);$(QT5PRINTSUPPORT_LIB);$(QT5WIDGETS_LIB);$(QT5XML_LIB);$(CAIRO_LIB);$(FREETYPE_LIB);$(HARFBUZZ_LIB);$(ICU_LIB);$(LCMS_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(PODOFO_LIB);$(ZLIB_LIB);mscms.lib;WSock32.Lib;scribus-pgf.lib;scribus-wpg.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies> |
<AdditionalLibraryDirectories>$(QT5_DIR)\lib;$(CAIRO_LIB_DIR);$(FREETYPE_LIB_DIR);$(HARFBUZZ_LIB_DIR);$(ICU_LIB_DIR);$(LCMS_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(PODOFO_LIB_DIR);$(ZLIB_LIB_DIR);$(OutDir).;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
<AdditionalDependencies>$(QT5CORE_LIB);$(QT5GUI_LIB);$(QT5NETWORK_LIB);$(QT5PRINTSUPPORT_LIB);$(QT5WIDGETS_LIB);$(QT5XML_LIB);$(CAIRO_LIB);$(FREETYPE_LIB);$(HARFBUZZ_LIB);$(ICU_LIB);$(LCMS_LIB);$(LIBJPEG_LIB);$(LIBPNG_LIB);$(LIBTIFF_LIB);$(PODOFO_LIB);$(ZLIB_LIB);mscms.lib;WSock32.Lib;scribus-pgf.lib;scribus-wpg.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies> |
<AdditionalLibraryDirectories>$(QT5_DIR)\lib;$(CAIRO_LIB_DIR);$(FREETYPE_LIB_DIR);$(HARFBUZZ_LIB_DIR);$(ICU_LIB_DIR);$(LCMS_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBPNG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(PODOFO_LIB_DIR);$(ZLIB_LIB_DIR);$(OutDir).;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
<GenerateDebugInformation>true</GenerateDebugInformation> |
<AssemblyDebug /> |
<SubSystem>Console</SubSystem> |
133,7 → 133,7 |
<Optimization>Disabled</Optimization> |
<InlineFunctionExpansion>Default</InlineFunctionExpansion> |
<IntrinsicFunctions>false</IntrinsicFunctions> |
<AdditionalIncludeDirectories>..\..\msvc2015;..\..\..\scribus;..\..\..\scribus\colormgmt;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtPrintSupport;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(HARFBUZZ_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);$(OPENSSL_INCLUDE_DIR);$(PODOFO_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
<AdditionalIncludeDirectories>..\..\msvc2015;..\..\..\scribus;..\..\..\scribus\colormgmt;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtPrintSupport;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(HARFBUZZ_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBPNG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);$(OPENSSL_INCLUDE_DIR);$(PODOFO_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;HAVE_CONFIG_H;AVOID_WIN32_FILEIO;COMPILE_SCRIBUS_MAIN_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
<MinimalRebuild>false</MinimalRebuild> |
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
150,8 → 150,8 |
<MultiProcessorCompilation>true</MultiProcessorCompilation> |
</ClCompile> |
<Link> |
<AdditionalDependencies>$(QT5CORE_LIB);$(QT5GUI_LIB);$(QT5NETWORK_LIB);$(QT5PRINTSUPPORT_LIB);$(QT5WIDGETS_LIB);$(QT5XML_LIB);$(CAIRO_LIB);$(FREETYPE_LIB);$(HARFBUZZ_LIB);$(ICU_LIB);$(LCMS_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(PODOFO_LIB);$(ZLIB_LIB);mscms.lib;WSock32.Lib;scribus-pgf.lib;scribus-wpg.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies> |
<AdditionalLibraryDirectories>$(QT5_DIR)\lib;$(CAIRO_LIB_DIR);$(FREETYPE_LIB_DIR);$(HARFBUZZ_LIB_DIR);$(ICU_LIB_DIR);$(LCMS_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(PODOFO_LIB_DIR);$(ZLIB_LIB_DIR);$(OutDir).;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
<AdditionalDependencies>$(QT5CORE_LIB);$(QT5GUI_LIB);$(QT5NETWORK_LIB);$(QT5PRINTSUPPORT_LIB);$(QT5WIDGETS_LIB);$(QT5XML_LIB);$(CAIRO_LIB);$(FREETYPE_LIB);$(HARFBUZZ_LIB);$(ICU_LIB);$(LCMS_LIB);$(LIBJPEG_LIB);$(LIBPNG_LIB);$(LIBTIFF_LIB);$(PODOFO_LIB);$(ZLIB_LIB);mscms.lib;WSock32.Lib;scribus-pgf.lib;scribus-wpg.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies> |
<AdditionalLibraryDirectories>$(QT5_DIR)\lib;$(CAIRO_LIB_DIR);$(FREETYPE_LIB_DIR);$(HARFBUZZ_LIB_DIR);$(ICU_LIB_DIR);$(LCMS_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBPNG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(PODOFO_LIB_DIR);$(ZLIB_LIB_DIR);$(OutDir).;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
<GenerateDebugInformation>true</GenerateDebugInformation> |
<AssemblyDebug> |
</AssemblyDebug> |
167,7 → 167,7 |
<Optimization>MaxSpeed</Optimization> |
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
<OmitFramePointers>true</OmitFramePointers> |
<AdditionalIncludeDirectories>..\..\msvc2015;..\..\..\scribus;..\..\..\scribus\colormgmt;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtPrintSupport;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(HARFBUZZ_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);$(OPENSSL_INCLUDE_DIR);$(PODOFO_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
<AdditionalIncludeDirectories>..\..\msvc2015;..\..\..\scribus;..\..\..\scribus\colormgmt;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtPrintSupport;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(HARFBUZZ_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBPNG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);$(OPENSSL_INCLUDE_DIR);$(PODOFO_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
<PreprocessorDefinitions>WIN32;NDEBUG;_USE_MATH_DEFINES;_WINDOWS;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;HAVE_CONFIG_H;AVOID_WIN32_FILEIO;COMPILE_SCRIBUS_MAIN_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
<StringPooling>true</StringPooling> |
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> |
184,8 → 184,8 |
<MultiProcessorCompilation>true</MultiProcessorCompilation> |
</ClCompile> |
<Link> |
<AdditionalDependencies>$(QT5CORE_LIB);$(QT5GUI_LIB);$(QT5NETWORK_LIB);$(QT5PRINTSUPPORT_LIB);$(QT5WIDGETS_LIB);$(QT5XML_LIB);$(CAIRO_LIB);$(FREETYPE_LIB);$(HARFBUZZ_LIB);$(ICU_LIB);$(LCMS_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(PODOFO_LIB);$(ZLIB_LIB);mscms.lib;WSock32.Lib;scribus-pgf.lib;scribus-wpg.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies> |
<AdditionalLibraryDirectories>$(QT5_DIR)\lib;$(CAIRO_LIB_DIR);$(FREETYPE_LIB_DIR);$(HARFBUZZ_LIB_DIR);$(ICU_LIB_DIR);$(LCMS_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(PODOFO_LIB_DIR);$(ZLIB_LIB_DIR);$(OutDir).;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
<AdditionalDependencies>$(QT5CORE_LIB);$(QT5GUI_LIB);$(QT5NETWORK_LIB);$(QT5PRINTSUPPORT_LIB);$(QT5WIDGETS_LIB);$(QT5XML_LIB);$(CAIRO_LIB);$(FREETYPE_LIB);$(HARFBUZZ_LIB);$(ICU_LIB);$(LCMS_LIB);$(LIBJPEG_LIB);$(LIBPNG_LIB);$(LIBTIFF_LIB);$(PODOFO_LIB);$(ZLIB_LIB);mscms.lib;WSock32.Lib;scribus-pgf.lib;scribus-wpg.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies> |
<AdditionalLibraryDirectories>$(QT5_DIR)\lib;$(CAIRO_LIB_DIR);$(FREETYPE_LIB_DIR);$(HARFBUZZ_LIB_DIR);$(ICU_LIB_DIR);$(LCMS_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBPNG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(PODOFO_LIB_DIR);$(ZLIB_LIB_DIR);$(OutDir).;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
<GenerateDebugInformation>true</GenerateDebugInformation> |
<SubSystem>Windows</SubSystem> |
<OptimizeReferences>true</OptimizeReferences> |
202,7 → 202,7 |
<Optimization>MaxSpeed</Optimization> |
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
<OmitFramePointers>true</OmitFramePointers> |
<AdditionalIncludeDirectories>..\..\msvc2015;..\..\..\scribus;..\..\..\scribus\colormgmt;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtPrintSupport;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(HARFBUZZ_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);$(OPENSSL_INCLUDE_DIR);$(PODOFO_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
<AdditionalIncludeDirectories>..\..\msvc2015;..\..\..\scribus;..\..\..\scribus\colormgmt;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtPrintSupport;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(HARFBUZZ_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBPNG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);$(OPENSSL_INCLUDE_DIR);$(PODOFO_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
<PreprocessorDefinitions>WIN32;NDEBUG;_USE_MATH_DEFINES;_WINDOWS;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;HAVE_CONFIG_H;AVOID_WIN32_FILEIO;COMPILE_SCRIBUS_MAIN_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
<StringPooling>true</StringPooling> |
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> |
219,8 → 219,8 |
<MultiProcessorCompilation>true</MultiProcessorCompilation> |
</ClCompile> |
<Link> |
<AdditionalDependencies>$(QT5CORE_LIB);$(QT5GUI_LIB);$(QT5NETWORK_LIB);$(QT5PRINTSUPPORT_LIB);$(QT5WIDGETS_LIB);$(QT5XML_LIB);$(CAIRO_LIB);$(FREETYPE_LIB);$(HARFBUZZ_LIB);$(ICU_LIB);$(LCMS_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(PODOFO_LIB);$(ZLIB_LIB);mscms.lib;WSock32.Lib;scribus-pgf.lib;scribus-wpg.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies> |
<AdditionalLibraryDirectories>$(QT5_DIR)\lib;$(CAIRO_LIB_DIR);$(FREETYPE_LIB_DIR);$(HARFBUZZ_LIB_DIR);$(ICU_LIB_DIR);$(LCMS_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(PODOFO_LIB_DIR);$(ZLIB_LIB_DIR);$(OutDir).;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
<AdditionalDependencies>$(QT5CORE_LIB);$(QT5GUI_LIB);$(QT5NETWORK_LIB);$(QT5PRINTSUPPORT_LIB);$(QT5WIDGETS_LIB);$(QT5XML_LIB);$(CAIRO_LIB);$(FREETYPE_LIB);$(HARFBUZZ_LIB);$(ICU_LIB);$(LCMS_LIB);$(LIBJPEG_LIB);$(LIBPNG_LIB);$(LIBTIFF_LIB);$(PODOFO_LIB);$(ZLIB_LIB);mscms.lib;WSock32.Lib;scribus-pgf.lib;scribus-wpg.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies> |
<AdditionalLibraryDirectories>$(QT5_DIR)\lib;$(CAIRO_LIB_DIR);$(FREETYPE_LIB_DIR);$(HARFBUZZ_LIB_DIR);$(ICU_LIB_DIR);$(LCMS_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBPNG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(PODOFO_LIB_DIR);$(ZLIB_LIB_DIR);$(OutDir).;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
<GenerateDebugInformation>true</GenerateDebugInformation> |
<SubSystem>Windows</SubSystem> |
<OptimizeReferences>true</OptimizeReferences> |
262,6 → 262,7 |
<ClInclude Include="..\..\..\scribus\fonts\sfnt_format.h" /> |
<moc Include="..\..\..\scribus\iconmanager.h" /> |
<ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_kra.h" /> |
<ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_png.h" /> |
<ClInclude Include="..\..\..\scribus\KarbonCurveFit.h" /> |
<moc Include="..\..\..\scribus\ui\about.h" /> |
<moc Include="..\..\..\scribus\ui\aboutplugins.h" /> |
861,6 → 862,7 |
<ClCompile Include="..\..\..\scribus\fonts\sfnt.cpp" /> |
<ClCompile Include="..\..\..\scribus\iconmanager.cpp" /> |
<ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_kra.cpp" /> |
<ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_png.cpp" /> |
<ClCompile Include="..\..\..\scribus\marks.cpp" /> |
<ClCompile Include="..\..\..\scribus\nodeeditcontext.cpp" /> |
<ClCompile Include="..\..\..\scribus\pageitemiterator.cpp" /> |
/trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters |
---|
800,6 → 800,9 |
<ClInclude Include="..\..\..\scribus\actionsearch.h"> |
<Filter>Header Files</Filter> |
</ClInclude> |
<ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_png.h"> |
<Filter>Header Files</Filter> |
</ClInclude> |
</ItemGroup> |
<ItemGroup> |
<ClCompile Include="..\..\..\scribus\desaxe\digester.cpp"> |
2494,6 → 2497,9 |
<ClCompile Include="..\..\..\scribus\ui\contentpalette_default.cpp"> |
<Filter>Source Files</Filter> |
</ClCompile> |
<ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_png.cpp"> |
<Filter>Source Files</Filter> |
</ClCompile> |
</ItemGroup> |
<ItemGroup> |
<ResourceCompile Include="Scribus.rc"> |