svn commit: r538737 - in head/graphics/rawtherapee: . files

[Matthias Andree]

Author: mandree
Date: Sun Jun 14 13:48:09 2020
New Revision: 538737
URL: https://svnweb.freebsd.org/changeset/ports/538737

Log:
  graphics/rawtherapee: fix SIGSEGV in RGB_denoise
  
  - Bug report https://github.com/Beep6581/RawTherapee/issues/5796
  - Cherry-pick https://github.com/Beep6581/RawTherapee/commit/5239e61946870a5405e94b138b4196fc35159ab1
  - Bump PORTREVISION
  
  Obtained from:	Ingo Weyrich/upstream Github repo
  MFH:		2020Q2 (blanket approval for stability fixes)

Added:
  head/graphics/rawtherapee/files/patch-rtengine_FTblockDN.cc   (contents, props changed)
Modified:
  head/graphics/rawtherapee/Makefile

Modified: head/graphics/rawtherapee/Makefile
==============================================================================
--- head/graphics/rawtherapee/Makefile	Sun Jun 14 13:25:01 2020	(r538736)
+++ head/graphics/rawtherapee/Makefile	Sun Jun 14 13:48:09 2020	(r538737)
@@ -3,7 +3,7 @@
 
 PORTNAME=	rawtherapee
 PORTVERSION=	5.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	https://rawtherapee.com/shared/source/ \
 		LOCAL/mandree/

Added: head/graphics/rawtherapee/files/patch-rtengine_FTblockDN.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/rawtherapee/files/patch-rtengine_FTblockDN.cc	Sun Jun 14 13:48:09 2020	(r538737)
@@ -0,0 +1,23 @@
+From 5239e61946870a5405e94b138b4196fc35159ab1 Mon Sep 17 00:00:00 2001
+From: Ingo Weyrich <heckflosse at users.noreply.github.com>
+Date: Fri, 12 Jun 2020 12:57:52 +0200
+Subject: [PATCH] Fix segfault in denoise, fixes #5796
+
+--- rtengine/FTblockDN.cc.orig	2020-02-04 06:39:52 UTC
++++ rtengine/FTblockDN.cc
+@@ -957,13 +957,8 @@ BENCHFUN
+                                         labdn->b[i1][j1] = B_ < 65535.f ? gamcurve[B_] : Color::gammanf(B_ / 65535.f, gam) * 32768.f;
+ 
+                                         if (((i1 | j1) & 1) == 0) {
+-                                            if (numTries == 1) {
+-                                                noisevarlum[(i1 >> 1) * width2 + (j1 >> 1)] = useNoiseLCurve ? lumcalc[i >> 1][j >> 1] : noisevarL;
+-                                                noisevarchrom[(i1 >> 1) * width2 + (j1 >> 1)] = useNoiseCCurve ? maxNoiseVarab * ccalc[i >> 1][j >> 1] : 1.f;
+-                                            } else {
+-                                                noisevarlum[(i1 >> 1) * width2 + (j1 >> 1)] = lumcalc[i >> 1][j >> 1];
+-                                                noisevarchrom[(i1 >> 1) * width2 + (j1 >> 1)] = ccalc[i >> 1][j >> 1];
+-                                            }
++                                            noisevarlum[(i1 >> 1) * width2 + (j1 >> 1)] = useNoiseLCurve ? lumcalc[i >> 1][j >> 1] : noisevarL;
++                                            noisevarchrom[(i1 >> 1) * width2 + (j1 >> 1)] = useNoiseCCurve ? maxNoiseVarab * ccalc[i >> 1][j >> 1] : 1.f;
+                                         }
+ 
+                                         //end chroma