Commit a0be62da authored by Tomas Mecir's avatar Tomas Mecir

Merge branch 'master' of git://anongit.kde.org/calligra

parents 111e9c3e 17858596
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <QVector> #include <QVector>
#include <QFile> #include <QFile>
#include <QTextStream> #include <QTextStream>
#include <QFileInfo>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
...@@ -181,8 +182,21 @@ bool KoColorSet::init() ...@@ -181,8 +182,21 @@ bool KoColorSet::init()
setValid(true); setValid(true);
return true; return true;
} else if (s.length() == 768) { } else if (m_data.length() == 768) {
kWarning(30009) << "Photoshop format palette file. Not implemented yet"; // Photoshop .act files
QFileInfo info(filename());
setName(info.baseName());
KoColorSetEntry e;
for (int i = 0; i < m_data.size(); i += 3) {
quint8 r = m_data[i];
quint8 g = m_data[i+1];
quint8 b = m_data[i+2];
e.color = KoColor(KoColorSpaceRegistry::instance()->rgb8());
e.color.fromQColor(QColor(r, g, b));
add(e);
}
setValid(true);
return true;
} }
return false; return false;
} }
......
...@@ -285,6 +285,7 @@ LcmsEnginePlugin::LcmsEnginePlugin(QObject *parent, const QVariantList &) ...@@ -285,6 +285,7 @@ LcmsEnginePlugin::LcmsEnginePlugin(QObject *parent, const QVariantList &)
registry->addProfileAlias("sRGB built-in - (lcms internal)", "sRGB built-in"); registry->addProfileAlias("sRGB built-in - (lcms internal)", "sRGB built-in");
registry->addProfileAlias("gray built-in - (lcms internal)", "gray built-in"); registry->addProfileAlias("gray built-in - (lcms internal)", "gray built-in");
registry->addProfileAlias("Lab identity built-in - (lcms internal)", "Lab identity built-in"); registry->addProfileAlias("Lab identity built-in - (lcms internal)", "Lab identity built-in");
registry->addProfileAlias("XYZ built-in - (lcms internal)", "XYZ identity built-in");
} }
#include <LcmsEnginePlugin.moc> #include <LcmsEnginePlugin.moc>
...@@ -98,7 +98,7 @@ public: ...@@ -98,7 +98,7 @@ public:
} }
virtual QString defaultProfile() const { virtual QString defaultProfile() const {
return "XYZ built-in - (lcms internal)"; return "XYZ identity built-in";
} }
......
...@@ -98,7 +98,7 @@ public: ...@@ -98,7 +98,7 @@ public:
} }
virtual QString defaultProfile() const { virtual QString defaultProfile() const {
return "XYZ built-in - (lcms internal)"; return "XYZ identity built-in";
} }
......
...@@ -85,7 +85,7 @@ public: ...@@ -85,7 +85,7 @@ public:
} }
virtual QString defaultProfile() const { virtual QString defaultProfile() const {
return "XYZ built-in - (lcms internal)"; return "XYZ identity built-in";
} }
}; };
......
...@@ -93,7 +93,7 @@ public: ...@@ -93,7 +93,7 @@ public:
} }
virtual QString defaultProfile() const { virtual QString defaultProfile() const {
return "XYZ built-in - (lcms internal)"; return "XYZ identity built-in";
} }
}; };
......
...@@ -92,7 +92,7 @@ QString BgSpellCheck::fetchMoreText() ...@@ -92,7 +92,7 @@ QString BgSpellCheck::fetchMoreText()
m_nextPosition = m_endPosition; // ends run m_nextPosition = m_endPosition; // ends run
return QString(); return QString();
} }
if (block.length() == 1) { // only linefeed if (block.length() <= 1) { // only linefeed or empty block
block = block.next(); block = block.next();
m_currentPosition++; m_currentPosition++;
continue; continue;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment