Date: Sun, 14 Jun 2020 13:51:09 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r538739 - in branches/2020Q2/graphics/rawtherapee: . files Message-ID: <202006141351.05EDp9Jd071694@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Sun Jun 14 13:51:09 2020 New Revision: 538739 URL: https://svnweb.freebsd.org/changeset/ports/538739 Log: MFH: r538737 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 Approved by: ports-secteam@ (blanket approval for stability fixes) Added: branches/2020Q2/graphics/rawtherapee/files/patch-rtengine_FTblockDN.cc - copied unchanged from r538737, head/graphics/rawtherapee/files/patch-rtengine_FTblockDN.cc Modified: branches/2020Q2/graphics/rawtherapee/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/graphics/rawtherapee/Makefile ============================================================================== --- branches/2020Q2/graphics/rawtherapee/Makefile Sun Jun 14 13:49:14 2020 (r538738) +++ branches/2020Q2/graphics/rawtherapee/Makefile Sun Jun 14 13:51:09 2020 (r538739) @@ -3,7 +3,7 @@ PORTNAME= rawtherapee PORTVERSION= 5.8 -PORTREVISION= 2 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= https://rawtherapee.com/shared/source/ \ LOCAL/mandree/ Copied: branches/2020Q2/graphics/rawtherapee/files/patch-rtengine_FTblockDN.cc (from r538737, head/graphics/rawtherapee/files/patch-rtengine_FTblockDN.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/graphics/rawtherapee/files/patch-rtengine_FTblockDN.cc Sun Jun 14 13:51:09 2020 (r538739, copy of r538737, head/graphics/rawtherapee/files/patch-rtengine_FTblockDN.cc) @@ -0,0 +1,23 @@ +From 5239e61946870a5405e94b138b4196fc35159ab1 Mon Sep 17 00:00:00 2001 +From: Ingo Weyrich <heckflosse@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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006141351.05EDp9Jd071694>