mirror of
https://invent.kde.org/frameworks/kimageformats.git
synced 2025-07-16 19:34:17 -04:00
Compare commits
5 Commits
v5.60.0-rc
...
v5.62.0
Author | SHA1 | Date | |
---|---|---|---|
9a9ac6e8fe | |||
4bf2894bde | |||
40353da5db | |||
068e711847 | |||
90ba55d982 |
@ -3,12 +3,12 @@ cmake_minimum_required(VERSION 3.5)
|
||||
project(KImageFormats)
|
||||
|
||||
include(FeatureSummary)
|
||||
find_package(ECM 5.60.0 NO_MODULE)
|
||||
find_package(ECM 5.62.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})
|
||||
|
||||
include(KDEInstallDirs)
|
||||
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
|
||||
|
@ -1,7 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Type=Service
|
||||
X-KDE-ServiceTypes=QImageIOPlugins
|
||||
X-KDE-ImageFormat=pnm
|
||||
X-KDE-MimeType=image/x-portable-anymap
|
||||
X-KDE-Read=true
|
||||
X-KDE-Write=false
|
@ -252,7 +252,10 @@ static bool LoadTGA(QDataStream &s, const TgaHeader &tga, QImage &img)
|
||||
// RLE pixels.
|
||||
assert(pixel_size <= 8);
|
||||
char pixel[8];
|
||||
s.readRawData(pixel, pixel_size);
|
||||
const int dataRead = s.readRawData(pixel, pixel_size);
|
||||
if (dataRead < (int)pixel_size) {
|
||||
memset(&pixel[dataRead], 0, pixel_size - dataRead);
|
||||
}
|
||||
do {
|
||||
memcpy(dst, pixel, pixel_size);
|
||||
dst += pixel_size;
|
||||
|
Reference in New Issue
Block a user