rpm/kimageformats
SHA256
1
0
Fork 0
forked from pool/kimageformats
Code Pull Requests Activity

Accepting request 352914 from KDE:Frameworks5

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/352914
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kimageformats?expand=0&rev=26
This commit is contained in:
Dominique Leuenberger 2016-01-20 08:50:31 +00:00 committed by Git OBS Bridge
commit c4b6b4283d
5 changed files with 53 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fix-psd.patch Normal file
View File

@ -0,0 +1,31 @@
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Sun, 10 Jan 2016 12:24:35 +0000
Subject: fix loading of RLE compressed PSD files
X-Git-Url: http://quickgit.kde.org/?p=kimageformats.git&a=commitdiff&h=5d7ef7c38e9f6aa473fec5ee7f1daabcb405ffd7
---
fix loading of RLE compressed PSD files
decodeRLEData() expects a quint16 as length, but the PSD loader calls it
with a quint32.
We do need quint32 for PSD, otherwise it would overflow for images
bigger than 256x256 pixels (it's the pixel count there, i.e. width x
height).
BUG: 354413
FIXED-IN: 5.19.0
REVIEW: 126684
---
--- a/src/imageformats/rle_p.h
+++ b/src/imageformats/rle_p.h
@@ -75,7 +75,7 @@
static inline bool decodeRLEData(RLEVariant variant,
QDataStream &stream,
Item *dest,
- quint16 length,
+ quint32 length,
Func1 readData,
Func2 updateItem)
{

3
kimageformats-5.17.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7a7d58e573b82ff4fcb9a8d9313e7b9c77e487ee186d1dea7dd081c2f8018037
size 85184

3
kimageformats-5.18.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cc5e4977fe26278374f1b18cc1225a7e921b5401cea2bc95f35893ae0960dff8
size 85192

13
kimageformats.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri Jan 8 20:35:13 UTC 2016 - wbauer@tmo.at
- Add fix-psd.patch: fixes loading of RLE compressed PSD files
(kde#354413)
-------------------------------------------------------------------
Sat Jan 2 17:43:47 UTC 2016 - hrvoje.senjan@gmail.com
- Update to 5.18.0
* For more details please see:
https://www.kde.org/announcements/kde-frameworks-5.18.0.php
-------------------------------------------------------------------
Thu Dec 10 23:06:47 UTC 2015 - hrvoje.senjan@gmail.com

9
kimageformats.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package kimageformats
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,9 +16,9 @@
#
%define _tar_path 5.17
%define _tar_path 5.18
Name: kimageformats
Version: 5.17.0
Version: 5.18.0
Release: 0
BuildRequires: cmake >= 2.8.12
BuildRequires: extra-cmake-modules >= %{_tar_path}
@ -38,6 +38,8 @@ Group: System/GUI/KDE
Url: http://www.kde.org
Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM fix-psd.patch kde#354413 -- fixes loading of RLE compressed PSD files
Patch: fix-psd.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -48,6 +50,7 @@ image formats.
%prep
%setup -q
%patch -p1
%build
%cmake_kf5 -d build