Compare commits

...

9 Commits

3 changed files with 13 additions and 8 deletions

View File

@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12)
project(KImageFormats) project(KImageFormats)
include(FeatureSummary) include(FeatureSummary)
find_package(ECM 5.20.0 NO_MODULE) find_package(ECM 5.24.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules")
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
@ -11,13 +11,13 @@ feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKA
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
include(KDEInstallDirs) include(KDEInstallDirs)
include(KDEFrameworkCompilerSettings) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings) include(KDECMakeSettings)
include(CheckIncludeFiles) include(CheckIncludeFiles)
set(REQUIRED_QT_VERSION 5.3.0) set(REQUIRED_QT_VERSION 5.4.0)
find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
find_package(KF5Archive) find_package(KF5Archive)

View File

@ -7,6 +7,11 @@ platforms:
- name: MacOSX - name: MacOSX
- name: Windows - name: Windows
note: No EPS support on Windows note: No EPS support on Windows
- name: Android
portingAid: false portingAid: false
deprecated: false deprecated: false
release: true release: true
public_lib: true
group: Frameworks
subgroup: Tier 2

View File

@ -120,19 +120,19 @@ static quint8 readPixel(QDataStream &stream) {
quint8 pixel; quint8 pixel;
stream >> pixel; stream >> pixel;
return pixel; return pixel;
}; }
static QRgb updateRed(QRgb oldPixel, quint8 redPixel) { static QRgb updateRed(QRgb oldPixel, quint8 redPixel) {
return qRgba(redPixel, qGreen(oldPixel), qBlue(oldPixel), qAlpha(oldPixel)); return qRgba(redPixel, qGreen(oldPixel), qBlue(oldPixel), qAlpha(oldPixel));
}; }
static QRgb updateGreen(QRgb oldPixel, quint8 greenPixel) { static QRgb updateGreen(QRgb oldPixel, quint8 greenPixel) {
return qRgba(qRed(oldPixel), greenPixel, qBlue(oldPixel), qAlpha(oldPixel)); return qRgba(qRed(oldPixel), greenPixel, qBlue(oldPixel), qAlpha(oldPixel));
}; }
static QRgb updateBlue(QRgb oldPixel, quint8 bluePixel) { static QRgb updateBlue(QRgb oldPixel, quint8 bluePixel) {
return qRgba(qRed(oldPixel), qGreen(oldPixel), bluePixel, qAlpha(oldPixel)); return qRgba(qRed(oldPixel), qGreen(oldPixel), bluePixel, qAlpha(oldPixel));
}; }
static QRgb updateAlpha(QRgb oldPixel, quint8 alphaPixel) { static QRgb updateAlpha(QRgb oldPixel, quint8 alphaPixel) {
return qRgba(qRed(oldPixel), qGreen(oldPixel), qBlue(oldPixel), alphaPixel); return qRgba(qRed(oldPixel), qGreen(oldPixel), qBlue(oldPixel), alphaPixel);
}; }
typedef QRgb(*channelUpdater)(QRgb,quint8); typedef QRgb(*channelUpdater)(QRgb,quint8);
// Load the PSD image. // Load the PSD image.