summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>2012-08-11 10:40:23 +0000
committerjghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>2012-08-11 10:40:23 +0000
commitc948c08a5d32e0e926e1d111e96bfdab8fa9cbbe (patch)
treefd9d36bbf5f65ebe0486ff754bd013d1fe71b1b3
parent8b81ec270ec6d5bb1b77a90c29bb44863ca59019 (diff)
downloadscribus-c948c08a5d32e0e926e1d111e96bfdab8fa9cbbe.tar.gz
scribus-c948c08a5d32e0e926e1d111e96bfdab8fa9cbbe.tar.xz
scribus-c948c08a5d32e0e926e1d111e96bfdab8fa9cbbe.zip
#11028: Qt image reader backend labels all images as RGB
git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17754 11d20701-8431-0410-a711-e3c959e3b870
-rw-r--r--scribus/scimgdataloader_qt.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/scribus/scimgdataloader_qt.cpp b/scribus/scimgdataloader_qt.cpp
index 5d61b34..9ca62fd 100644
--- a/scribus/scimgdataloader_qt.cpp
+++ b/scribus/scimgdataloader_qt.cpp
@@ -42,10 +42,12 @@ bool ScImgDataLoader_QT::loadPicture(const QString& fn, int /*page*/, int /*res*
float xres = m_image.dotsPerMeterX() * 0.0254;
float yres = m_image.dotsPerMeterY() * 0.0254;
int resInf = m_imageInfoRecord.lowResType;
+ m_imageInfoRecord.colorspace = ColorSpaceRGB;
+ if (m_image.isGrayscale() || m_image.depth() == 1)
+ m_imageInfoRecord.colorspace = ColorSpaceGray;
m_image = m_image.convertToFormat(QImage::Format_ARGB32);
m_image.setDotsPerMeterX (qMax(2834, (int) (xres / 0.0254)));
m_image.setDotsPerMeterY (qMax(2834, (int) (yres / 0.0254)));
- m_imageInfoRecord.colorspace = ColorSpaceRGB;
m_imageInfoRecord.xres = qMax(72, qRound(xres));
m_imageInfoRecord.yres = qMax(72, qRound(yres));
m_imageInfoRecord.lowResType = resInf;