Attachment 134627 Details for Bug 103041 – Patch that fixes the original patch

[patch] Patch that fixes the original patch

0003-Add-missing-return-in-error-paths.patch (text/plain), 1.10 KB, created by oliver.sander on 2017-10-02 22:08:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: oliver.sander

Created: 2017-10-02 22:08:15 UTC

Size: 1.10 KB

patch

obsolete

>From 18e7cf5b6dfabd1dac6c127547a51258e3a50299 Mon Sep 17 00:00:00 2001
>From: Oliver Sander <oliver.sander@tu-dresden.de>
>Date: Tue, 3 Oct 2017 00:04:17 +0200
>Subject: [PATCH 3/3] Add missing 'return' in error paths
>
>---
> qt5/src/ArthurOutputDev.cc | 2 ++
> 1 file changed, 2 insertions(+)
>
>diff --git a/qt5/src/ArthurOutputDev.cc b/qt5/src/ArthurOutputDev.cc
>index bc996cfe..58adece2 100644
>--- a/qt5/src/ArthurOutputDev.cc
>+++ b/qt5/src/ArthurOutputDev.cc
>@@ -923,6 +923,7 @@ void ArthurOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *
>   {
>     qDebug() << "Soft mask size does not match image size!";
>     drawImage(state, ref, str, width, height, colorMap, interpolate, nullptr, gFalse);
>+    return;
>   }
> 
>   // Bail out if the mask isn't a single channel.  I don't know
>@@ -931,6 +932,7 @@ void ArthurOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *
>   {
>     qDebug() << "Soft mask is not a single 8-bit channel!";
>     drawImage(state, ref, str, width, height, colorMap, interpolate, nullptr, gFalse);
>+    return;
>   }
> 
>   /* TODO: Do we want to cache these? */
>-- 
>2.14.1
>

Actions: View | Splinter Review

Attachments on bug 103041: 134571 | 134572 | 134627

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.