From owner-svn-ports-branches@freebsd.org Sun Jun 14 15:33:40 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 20BF933D486; Sun, 14 Jun 2020 15:33:40 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49lJQX06Jpz4ZfK; Sun, 14 Jun 2020 15:33:40 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F2F2CE8D0; Sun, 14 Jun 2020 15:33:39 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05EFXdgG044527; Sun, 14 Jun 2020 15:33:39 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05EFXd7Y044526; Sun, 14 Jun 2020 15:33:39 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <202006141533.05EFXd7Y044526@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Sun, 14 Jun 2020 15:33:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r538814 - in branches/2020Q2/graphics/rawtherapee: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in branches/2020Q2/graphics/rawtherapee: . files X-SVN-Commit-Revision: 538814 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Jun 2020 15:33:40 -0000 Author: mandree Date: Sun Jun 14 15:33:39 2020 New Revision: 538814 URL: https://svnweb.freebsd.org/changeset/ports/538814 Log: MFH: r538813 graphics/rawtherapee: fix another potential SIGSEGV in RGB_denoise Manually cherry-pick and merge 6c1055f from upstream Git into existing files/patch-rtengine_FTblockDN.cc Bump PORTREVISION again. https://github.com/Beep6581/RawTherapee/issues/5796#issuecomment-643774987 Reported by: Ingo Weyrich Obtained from: Ingo Weyrich Approved by: ports-secteam@ (blanket approval for small stability fixes) Modified: branches/2020Q2/graphics/rawtherapee/Makefile branches/2020Q2/graphics/rawtherapee/files/patch-rtengine_FTblockDN.cc Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/graphics/rawtherapee/Makefile ============================================================================== --- branches/2020Q2/graphics/rawtherapee/Makefile Sun Jun 14 15:32:59 2020 (r538813) +++ branches/2020Q2/graphics/rawtherapee/Makefile Sun Jun 14 15:33:39 2020 (r538814) @@ -3,7 +3,7 @@ PORTNAME= rawtherapee PORTVERSION= 5.8 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= https://rawtherapee.com/shared/source/ \ LOCAL/mandree/ Modified: branches/2020Q2/graphics/rawtherapee/files/patch-rtengine_FTblockDN.cc ============================================================================== --- branches/2020Q2/graphics/rawtherapee/files/patch-rtengine_FTblockDN.cc Sun Jun 14 15:32:59 2020 (r538813) +++ branches/2020Q2/graphics/rawtherapee/files/patch-rtengine_FTblockDN.cc Sun Jun 14 15:33:39 2020 (r538814) @@ -1,10 +1,36 @@ +This is a manual combination (otherwise patch would mess up) +of the two pathes mentioned below: + += PATCH 1 GIT HEADER ============================ From 5239e61946870a5405e94b138b4196fc35159ab1 Mon Sep 17 00:00:00 2001 From: Ingo Weyrich 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 +--- + rtengine/FTblockDN.cc | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +diff --git a/rtengine/FTblockDN.cc b/rtengine/FTblockDN.cc +index 89e4c1b8d..49b566767 100644 + += PATCH 2 GIT HEADER ============================ +From 6c1055f985a202e1b1a87f8d33b482748f41a167 Mon Sep 17 00:00:00 2001 +From: Ingo Weyrich +Date: Fri, 12 Jun 2020 13:02:37 +0200 +Subject: [PATCH] Fix another segfault in denoise + +--- + rtengine/FTblockDN.cc | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +diff --git a/rtengine/FTblockDN.cc b/rtengine/FTblockDN.cc +index 49b566767..0146f0a7d 100644 + +==== MERGED PATCHES ============================= +diff -up ./rtengine/FTblockDN.cc.orig ./rtengine/FTblockDN.cc +--- ./rtengine/FTblockDN.cc.orig 2020-02-04 07:39:52.000000000 +0100 ++++ ./rtengine/FTblockDN.cc 2020-06-14 17:14:55.390169000 +0200 @@ -957,13 +957,8 @@ BENCHFUN labdn->b[i1][j1] = B_ < 65535.f ? gamcurve[B_] : Color::gammanf(B_ / 65535.f, gam) * 32768.f; @@ -21,3 +47,19 @@ Subject: [PATCH] Fix segfault in denoise, fixes #5796 } //end chroma +@@ -995,13 +990,8 @@ BENCHFUN + labdn->b[i1][j1] = (Y - Z); + + 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; + } + } + }