Accepting request 352773 from home:wolfi323:test

Add fix-psd.patch: fixes loading of RLE compressed PSD files (kde#354413)

OBS-URL: https://build.opensuse.org/request/show/352773
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kimageformats?expand=0&rev=73
This commit is contained in:
Hrvoje Senjan 2016-01-10 23:14:49 +00:00 committed by Git OBS Bridge
parent 6de2f1879a
commit 182a449071
3 changed files with 40 additions and 0 deletions

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)
{

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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 Sat Jan 2 17:43:47 UTC 2016 - hrvoje.senjan@gmail.com

View File

@ -38,6 +38,8 @@ Group: System/GUI/KDE
Url: http://www.kde.org Url: http://www.kde.org
Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
Source1: baselibs.conf 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -48,6 +50,7 @@ image formats.
%prep %prep
%setup -q %setup -q
%patch -p1
%build %build
%cmake_kf5 -d build %cmake_kf5 -d build