From owner-svn-ports-all@freebsd.org Sun Jun 14 13:48:10 2020 Return-Path: Delivered-To: svn-ports-all@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 962F633A178; Sun, 14 Jun 2020 13:48:10 +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 49lG4p3Ql1z4NSl; Sun, 14 Jun 2020 13:48:10 +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 6C2C2D0C7; Sun, 14 Jun 2020 13:48:10 +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 05EDmAjf067907; Sun, 14 Jun 2020 13:48:10 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05EDmA61067905; Sun, 14 Jun 2020 13:48:10 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <202006141348.05EDmA61067905@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 13:48:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538737 - in head/graphics/rawtherapee: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in head/graphics/rawtherapee: . files X-SVN-Commit-Revision: 538737 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Jun 2020 13:48:10 -0000 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 +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