Compare commits

...

8 Commits

3 changed files with 15 additions and 5 deletions

View File

@ -2,7 +2,11 @@ cmake_minimum_required(VERSION 2.8.12)
project(KImageFormats)
find_package(ECM 5.9.0 REQUIRED NO_MODULE)
include(FeatureSummary)
find_package(ECM 5.13.0 NO_MODULE)
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)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
@ -10,17 +14,17 @@ include(KDEInstallDirs)
include(KDEFrameworkCompilerSettings)
include(KDECMakeSettings)
include(FeatureSummary)
include(CheckIncludeFiles)
set(REQUIRED_QT_VERSION 5.2.0)
set(REQUIRED_QT_VERSION 5.3.0)
find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
# EPS support depends on the gs utility; non-UNIX systems are unlikely to have
# this available in PATH
set(BUILD_EPS_PLUGIN FALSE)
if (UNIX)
find_package(Qt5PrintSupport 5.2.0 NO_MODULE)
find_package(Qt5PrintSupport ${REQUIRED_QT_VERSION} NO_MODULE)
set_package_properties(Qt5PrintSupport PROPERTIES
PURPOSE "Required for the QImage plugin for EPS images"
TYPE OPTIONAL

View File

@ -17,7 +17,13 @@
#include <QProcess>
#include <QTemporaryFile>
#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
// logging category for this framework, default: log stuff >= warning
Q_LOGGING_CATEGORY(EPSPLUGIN, "epsplugin", QtWarningMsg)
#else
Q_LOGGING_CATEGORY(EPSPLUGIN, "epsplugin")
#endif
//#define EPS_PERFORMANCE_DEBUG 1
#define BBOX_BUFLEN 200

View File

@ -86,7 +86,7 @@ static inline bool decodeRLEData(RLEVariant variant,
stream >> count1;
if (count1 >= 128u) {
unsigned length;
unsigned length = 0;
if (variant == RLEVariant::PIC) {
if (count1 == 128u) {
// If the value is exactly 128, it means that it is more than