r23489 by jghali - #15957: Embedded ICC color profiles of PNG images are not detected during import

scribus-commit scribus-commit at lists.scribus.net
Sun Mar 8 21:58:56 UTC 2020


Author: jghali
Date: Sun Mar  8 21:58:56 2020
New Revision: 23489

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23489
Log:
#15957: Embedded ICC color profiles of PNG images are not detected during import

Added:
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_png.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_png.h
Modified:
    trunk/Scribus/.travis.yml
    trunk/Scribus/BUILDING
    trunk/Scribus/CMakeLists.txt
    trunk/Scribus/CMakeLists_Dependencies.cmake
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/colormgmt/sccolorprofile.cpp
    trunk/Scribus/scribus/colormgmt/sccolorprofile.h
    trunk/Scribus/scribus/colormgmt/sccolorprofiledata.h
    trunk/Scribus/scribus/colormgmt/sclcms2colorprofileimpl.cpp
    trunk/Scribus/scribus/colormgmt/sclcms2colorprofileimpl.h
    trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt
    trunk/Scribus/scribus/scimage.cpp
    trunk/Scribus/scribus/util_formats.cpp
    trunk/Scribus/scribus/util_formats.h
    trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
    trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters

Modified: trunk/Scribus/.travis.yml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23489&path=/trunk/Scribus/.travis.yml
==============================================================================
--- trunk/Scribus/.travis.yml	(original)
+++ trunk/Scribus/.travis.yml	Sun Mar  8 21:58:56 2020
@@ -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; 

Modified: trunk/Scribus/BUILDING
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23489&path=/trunk/Scribus/BUILDING
==============================================================================
--- trunk/Scribus/BUILDING	(original)
+++ trunk/Scribus/BUILDING	Sun Mar  8 21:58:56 2020
@@ -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 
-	libtiff >= 3.6.0
-	LittleCMS (liblcms) >= 2.0 (2.1+ recommended)
-	libjpeg (depending on how Qt is packaged)
+	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)
+	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)

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23489&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/CMakeLists.txt	Sun Mar  8 21:58:56 2020
@@ -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}

Modified: trunk/Scribus/CMakeLists_Dependencies.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23489&path=/trunk/Scribus/CMakeLists_Dependencies.cmake
==============================================================================
--- trunk/Scribus/CMakeLists_Dependencies.cmake	(original)
+++ trunk/Scribus/CMakeLists_Dependencies.cmake	Sun Mar  8 21:58:56 2020
@@ -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")

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23489&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/CMakeLists.txt	Sun Mar  8 21:58:56 2020
@@ -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}

Modified: trunk/Scribus/scribus/colormgmt/sccolorprofile.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23489&path=/trunk/Scribus/scribus/colormgmt/sccolorprofile.cpp
==============================================================================
--- trunk/Scribus/scribus/colormgmt/sccolorprofile.cpp	(original)
+++ trunk/Scribus/scribus/colormgmt/sccolorprofile.cpp	Sun Mar  8 21:58:56 2020
@@ -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)

Modified: trunk/Scribus/scribus/colormgmt/sccolorprofile.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23489&path=/trunk/Scribus/scribus/colormgmt/sccolorprofile.h
==============================================================================
--- trunk/Scribus/scribus/colormgmt/sccolorprofile.h	(original)
+++ trunk/Scribus/scribus/colormgmt/sccolorprofile.h	Sun Mar  8 21:58:56 2020
@@ -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;
 	

Modified: trunk/Scribus/scribus/colormgmt/sccolorprofiledata.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23489&path=/trunk/Scribus/scribus/colormgmt/sccolorprofiledata.h
==============================================================================
--- trunk/Scribus/scribus/colormgmt/sccolorprofiledata.h	(original)
+++ trunk/Scribus/scribus/colormgmt/sccolorprofiledata.h	Sun Mar  8 21:58:56 2020
@@ -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;
 };
 

Modified: trunk/Scribus/scribus/colormgmt/sclcms2colorprofileimpl.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23489&path=/trunk/Scribus/scribus/colormgmt/sclcms2colorprofileimpl.cpp
==============================================================================
--- trunk/Scribus/scribus/colormgmt/sclcms2colorprofileimpl.cpp	(original)
+++ trunk/Scribus/scribus/colormgmt/sclcms2colorprofileimpl.cpp	Sun Mar  8 21:58:56 2020
@@ -37,6 +37,23 @@
 	if (m_profileHandle)
 		return ScLcms2ColorMgmtEngineImpl::translateLcmsProfileClass( cmsGetDeviceClass(m_profileHandle) );
 	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

Modified: trunk/Scribus/scribus/colormgmt/sclcms2colorprofileimpl.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23489&path=/trunk/Scribus/scribus/colormgmt/sclcms2colorprofileimpl.h
==============================================================================
--- trunk/Scribus/scribus/colormgmt/sclcms2colorprofileimpl.h	(original)
+++ trunk/Scribus/scribus/colormgmt/sclcms2colorprofileimpl.h	Sun Mar  8 21:58:56 2020
@@ -26,6 +26,7 @@
 
 	virtual eColorSpaceType colorSpace()  const;
 	virtual eProfileClass   deviceClass() const;
+	virtual bool            isSuitableForOutput() const;
 	virtual QString         productDescription() const;
 
 protected:

Modified: trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23489&path=/trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt	Sun Mar  8 21:58:56 2020
@@ -30,6 +30,7 @@
 	target_link_libraries(${SCRIBUS_IMPORTAI_PLUGIN}
 		${PLUGIN_LIBRARIES}
 		${TIFF_LIBRARIES}
+		${PNG_LIBRARIES}
 		${JPEG_LIBRARIES}
 	)
 else()

Modified: trunk/Scribus/scribus/scimage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23489&path=/trunk/Scribus/scribus/scimage.cpp
==============================================================================
--- trunk/Scribus/scribus/scimage.cpp	(original)
+++ trunk/Scribus/scribus/scimage.cpp	Sun Mar  8 21:58:56 2020
@@ -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,15 +2008,21 @@
 	{
 		pDataLoader.reset( new ScImgDataLoader_PS() );
 	}
-	else if (extensionIndicatesTIFF(ext))
-	{
-		pDataLoader.reset( new ScImgDataLoader_TIFF() );
+	else if (extensionIndicatesPNG(ext))
+	{
+		pDataLoader.reset( new ScImgDataLoader_PNG() );
 		if	(pDataLoader.data())
 			pDataLoader->setRequest(imgInfo.isRequest, imgInfo.RequestProps);
 	}
 	else if (extensionIndicatesPSD(ext))
 	{
 		pDataLoader.reset( new ScImgDataLoader_PSD() );
+		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);
 	}
@@ -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 (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 (extensionIndicatesTIFF(ext))
 		pDataLoader.reset( new ScImgDataLoader_TIFF() );
-	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 (ext == "pat")
 		pDataLoader.reset( new ScImgDataLoader_GIMP() );
 	else if (ext == "pgf")

Modified: trunk/Scribus/scribus/util_formats.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23489&path=/trunk/Scribus/scribus/util_formats.cpp
==============================================================================
--- trunk/Scribus/scribus/util_formats.cpp	(original)
+++ trunk/Scribus/scribus/util_formats.cpp	Sun Mar  8 21:58:56 2020
@@ -329,6 +329,27 @@
 	formatAll=QObject::tr("All Files (*)");
 }
 
+bool extensionIndicatesEPS(const QString &ext)
+{
+	QStringList strl;
+	strl << "eps" << "epsf" << "epsi" << "eps2" << "eps3" << "epi" << "ept";
+	return strl.contains(ext, Qt::CaseInsensitive);
+}
+
+bool extensionIndicatesEPSorPS(const QString &ext)
+{
+	QStringList strl;
+	strl << "eps" << "epsf" << "epsi" << "ps" << "eps2" << "eps3" << "epi" << "ept";
+	return strl.contains(ext, Qt::CaseInsensitive);
+}
+
+bool extensionIndicatesJPEG(const QString &ext)
+{
+	QStringList strl;
+	strl << "jpg" << "jpeg";
+	return strl.contains(ext, Qt::CaseInsensitive);
+}
+
 bool extensionIndicatesPDF(const QString &ext)
 {
 	QStringList strl;
@@ -336,17 +357,17 @@
 	return strl.contains(ext, Qt::CaseInsensitive);
 }
 
-bool extensionIndicatesEPS(const QString &ext)
-{
-	QStringList strl;
-	strl << "eps" << "epsf" << "epsi" << "eps2" << "eps3" << "epi" << "ept";
-	return strl.contains(ext, Qt::CaseInsensitive);
-}
-
-bool extensionIndicatesEPSorPS(const QString &ext)
-{
-	QStringList strl;
-	strl << "eps" << "epsf" << "epsi" << "ps" << "eps2" << "eps3" << "epi" << "ept";
+bool extensionIndicatesPNG(const QString &ext)
+{
+	QStringList strl;
+	strl << "png";
+	return strl.contains(ext, Qt::CaseInsensitive);
+}
+
+bool extensionIndicatesPSD(const QString &ext)
+{
+	QStringList strl;
+	strl << "psd";
 	return strl.contains(ext, Qt::CaseInsensitive);
 }
 
@@ -354,20 +375,6 @@
 {
 	QStringList strl;
 	strl << "tif" << "tiff";
-	return strl.contains(ext, Qt::CaseInsensitive);
-}
-
-bool extensionIndicatesPSD(const QString &ext)
-{
-	QStringList strl;
-	strl << "psd";
-	return strl.contains(ext, Qt::CaseInsensitive);
-}
-
-bool extensionIndicatesJPEG(const QString &ext)
-{
-	QStringList strl;
-	strl << "jpg" << "jpeg";
 	return strl.contains(ext, Qt::CaseInsensitive);
 }
 

Modified: trunk/Scribus/scribus/util_formats.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23489&path=/trunk/Scribus/scribus/util_formats.h
==============================================================================
--- trunk/Scribus/scribus/util_formats.h	(original)
+++ trunk/Scribus/scribus/util_formats.h	Sun Mar  8 21:58:56 2020
@@ -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);

Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23489&path=/trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj	Sun Mar  8 21:58:56 2020
@@ -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" />

Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23489&path=/trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters	Sun Mar  8 21:58:56 2020
@@ -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">
@@ -2492,6 +2495,9 @@
       <Filter>Source Files</Filter>
     </ClCompile>
     <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>




More information about the scribus-commit mailing list