Compare commits

...

10 Commits

Author SHA1 Message Date
c7a04b0ed6 less verbose categorized logging, move to ecm module later 2015-08-02 13:01:54 +02:00
feddd046d7 Upgrade Qt version requirement to 5.3 2015-08-01 14:41:18 +02:00
5800e2f011 Upgrade ECM and KF5 version requirements for 5.13.0 release. 2015-08-01 12:14:00 +00:00
df707db404 Upgrade ECM and KF5 version requirements for 5.12.0 release. 2015-07-04 20:36:35 +00:00
e1bcc3b033 Upgrade ECM and KF5 version requirements for 5.11.0 release. 2015-06-06 09:28:19 +00:00
8c8db0fcd2 Add verbose message for when ECM is not found. 2015-05-13 20:41:18 -06:00
52c7839741 Initialize variable to silence warning [-Wsometimes-uninitialized]
It's uninitialized if the else {} is hit.
2015-05-02 23:32:24 +01:00
3dadfa564d Upgrade ECM and KF5 version requirements for 5.10.0 release. 2015-05-01 15:17:27 +00:00
0414b32297 Upgrade ECM and KF5 version requirements for 5.9.0 release. 2015-04-04 11:48:54 +00:00
55af097749 Don't warn the user/developer about something he can't fix
image formats are loaded via qimage/qimagereader and friends, the user/developer does not choose which ones will be used so giving him a warning about sequential devices not being supported is not going to help anyone, only spam their shell/logs.

REVIEW: 123156
Acked by David Edmundson
2015-03-29 23:21:17 +02:00
4 changed files with 16 additions and 6 deletions

View File

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

View File

@ -17,7 +17,13 @@
#include <QProcess> #include <QProcess>
#include <QTemporaryFile> #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") Q_LOGGING_CATEGORY(EPSPLUGIN, "epsplugin")
#endif
//#define EPS_PERFORMANCE_DEBUG 1 //#define EPS_PERFORMANCE_DEBUG 1
#define BBOX_BUFLEN 200 #define BBOX_BUFLEN 200

View File

@ -219,7 +219,7 @@ bool RASHandler::canRead(QIODevice *device)
} }
if (device->isSequential()) { if (device->isSequential()) {
qWarning("Reading ras files from sequential devices not supported"); // qWarning("Reading ras files from sequential devices not supported");
return false; return false;
} }

View File

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