From patchwork Thu Sep 7 14:03:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43640 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b17:b0:149:dfde:5c0a with SMTP id l23csp623346pzh; Thu, 7 Sep 2023 07:04:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEmqH68oCSnG0zFyOAiHXQHgZHLagbkG1u6arPvloi9iYCm4ECmSWdsYlJDpwG1PCLXw7B5 X-Received: by 2002:a05:6402:274c:b0:52c:8e9b:6bcd with SMTP id z12-20020a056402274c00b0052c8e9b6bcdmr3849934edd.12.1694095455654; Thu, 07 Sep 2023 07:04:15 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bx7-20020a0564020b4700b0052c9f1d3ceesi7274379edb.319.2023.09.07.07.03.58; Thu, 07 Sep 2023 07:04:15 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=fF+RfFbw; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6A0DE68C88E; Thu, 7 Sep 2023 17:03:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2101.outbound.protection.outlook.com [40.92.75.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 87D1468C883 for ; Thu, 7 Sep 2023 17:03:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mopfGytPEeiubTNFrWCnIP2zOAnAkgILja75DAwmE/LaV015rXyCkyxrbUp2e1OK+MVjUVxcUxACrRwPNjhW5AzkefB4B35u/VnjCLVg+cvx3R5f9I5RUux9+9sqgI/EjiOJfBbJJZ5PjTjtScA4HKJRAFKxwiS/m+NeYL4DV+4vpEQNfuDFr7d+5MkZrtaPpXo/qBAavrDpGGhzyq7AgeQqRex44wbpSiB18EEuYSKo4TrtSryzUzXWd0gSwlgMoTer7OI/61uOQWXhbNtWOzwJXH+TPiDIfWmMdYOXMM9EWqf430cIK4VGUarabyrlhdxJUi+iIu5xWBOPvbrbXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+Hk0CbKRBpsdJVDbOtkYf/eyV0aJjRJyKLlkZWBrHO8=; b=P0lZgB5pbxeeCENnN+IzIirSaYNIF3WLWL9N2l6FJj2rYJmiFCUvOdigOYXjNGhNCPhU41A6C657/9R6CSWV/voZ7UfjvYsIXj2SCwKaiKrOoEdsiZ8ajNWQDQxi5u1SkIFd15wafd5f2MLYzAw9cc0liHQITGSaf+OfW7Dt8nAnYJvIUJMcx5YpyVA8LHmQyUqfVXA0txA0V98JV/cV6VSlFRID8j7PXEQRRzvemtZsElXsqKlVrRRbvhXFIsobu8JWw3Sm7XUHPmONNNq5lyg5q9/YejVSl3gY7hQkrgfLLaGNzfCGb70afmhlddWM8psLwpKCF6bgi2TqQrU3ug== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+Hk0CbKRBpsdJVDbOtkYf/eyV0aJjRJyKLlkZWBrHO8=; b=fF+RfFbw/6M3MbISfUUVHJ00em96bvwzRTgg4GZxB3fIA3D+VCIu2M7XUc5YxTfFM2aTefwQxFGg94Ov6HCxGSHMcX8acGB0ESyQbPNmMTp/9SBMFZRFl/0ObmtgwWxPEblT+g+lztypTd+ROWHYSPCCY0hDIKSZpwyLgeXZQ/dH1DOxQO/YbZKaASgyiCjEK1YE6E68UbALw+rg876GhAr5jJFmrj/wSP/39ICz5iZofS1+2nD+oICruH2wSA/ZOPu9CiPd3yMd5T/A4uiSHtBR55xOTGC6if7KKSh97h3bBPEbbaF9xzRBW9n9cyz8Vo+cXT1UoEHXj85A+PjSmQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0151.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:176::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.34; Thu, 7 Sep 2023 14:03:42 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6745.034; Thu, 7 Sep 2023 14:03:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Sep 2023 16:03:22 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [CxnF8MDm7sRMFDjsWPXM2GiaMRTs6y5W] X-ClientProxiedBy: ZR0P278CA0035.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::22) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230907140322.725171-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0151:EE_ X-MS-Office365-Filtering-Correlation-Id: 2ee44aef-b287-40f4-9c39-08dbafab3df6 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ftvw+t8hZM/KhxPSrLttxH5I5nSTypENLiLlz/40h+Ri8VTVJ2zu1GJNP7bWb4jipcgsgQXVPBY5fTOZlLpjev1R09+Z6ziTMqmvJPBumiIe6wdA1iOw8aa/HNLhlZ/4LFQbXg/JQPR272Pec/s7dSm+Z2uI+m7yrPm4PXj0maI4TT57IB+CJTLvKr5FckVSjlRsl+z2kSM+ImC2ocVf4pDyN8X9WGI2xVjhWQ6+dy8STrugs8IELUBpohjX7XAgW7lMV2Tz3v16txPBeyXOLwIAtqPIorF/Sv8VXxHZfiDnAZ5gokxesfZXF7lY5ikeEa9gkj0JuZoqu1DMIMqpDSJBQ604oVRqsijZmAsNITOVpS6i6aBha9FN/3iU9eg+3PmkMCGftrcTiu+fOH4ObLPLygSqv1f9NA8wJPNAVdEWvHTbhtpcu1HDZ3JgYGwzDVPio5F047MEtzDvV4VniJHJMJDJOdxTuqBjqbFI650FLgkqTW+pgFnumXD2H1Jt1p0NA7waurBQyahki8Erk8p6tegppRDb/joB+AAZNso3k70x48wBsVPEalXzMezkLK2bL6SvsQAVksK4JRtRCzy4Od6HprRlDEk8sUEMVdB58/B5Onc5vcc2cv39lVUM X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JO/uzzj6eOPpPZvftJ+HUMzvVbn/UytIALkeWu1SLjM0kTN6VoSasa3uc9NKgg7iak4rWKfhp1ohjNyuFtXLNMWUEt/xzSd2oxets+a5gEfgBOUiu5KzcBQF/qyUlxLub51Wol4w7lgSTjdLF4hBZUzTGiff5WUzFFbfPRzdr/0apne5fuP8d20/iO93U8uo7DO22DofcdU/pxynoCGxP/5Ak4y+FiUCUvcVn2X/swEgBbMr8egQW4GJU4AG2kjrPeci8DKwMlc051Vis6WyHG8JhZxhnBHvaj/yPKjATpLmgN0k04hKdnmQP/rfGsfEOkJXtHlX+NH6G4GpglAoeLo32AzrcHf0UEYwPzoW+DR7pyZwHR6DFoYoCkgCyRsBcGQNBV4/56qXTaSC622+ryrJsZuqvsLinRVi/UVPYHvGey+wvke7BFlEaervK9O47DFWFjEDBLFLx+lRTxKovM8gnJdt8vk5X77kE7pMXTNEkJHP/EyCRTsZvGw0MKFjtj17+UiPf6eb/Adi7X/sRyLDbcYnChoB76yaU+sk0LsCZn+h4aL1+qSj9EI6XxB656+lHUhhUbTjFL+uCvcKaS+giSWvLel/RpTn2AFonsofOu86K/AlA0a3hB/s0LU8xdFnn+MGsL0E4QMr8vkGBv7ok22NtqDTZDPxpQDMlJtVzpiJPAzLg9PF0PDg98wVtVu1aHiSepvv2rWME96mj+3qRusvWfCcqWvVjh7p8WrXL98lH9EvqX230zDQ0IPAZEpvokmhlu4nk+ETOhwel/kL9m6cPONtqOEKF1e2VKkfhb1ttJBv98cN5EAaJatyMOoBNbMAANglQJrC2PWAN6fPVqkQxL6XjjaxQABuJNSOTlSs+tKG/jKWyWxQhkjwIVudnDGsvXw2/dCzIzmZBNA9nWqifxzzzk2TejT6pYB956Pz1s5d+jbzVN+NAysQlOl+D5pPx1SrGI6q6PyNpxksxHxo6uufFzoB3iL1AiIXCtQuN5Wt5dGPApH2fx58ZN7fdbWRyaFoGKN6ugiYty1wWoyIaQpAbJss1/rkCPyszmASa04S3kIP6fuOdr8sIAPw0NCw3XzYdnoHPzeSCXc7zHLRWW0uTw5YSB7W4qBjqH9BZBDLipqob+ypCjoZuLvgVn8wBZMKOaEM6ji1mUqHKD72aLCy36PCkVnY6vuSdCYyv6Qelo1BFizkmASwSALhfwrjZjtU9Ev+C/m4DGdO34kwfaPTOf+UdKW+aeznEnHJK7/2+M3vdpv339Ti X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ee44aef-b287-40f4-9c39-08dbafab3df6 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2023 14:03:41.9291 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3P250MB0151 Subject: [FFmpeg-devel] [PATCH 31/31] avfilter/blend_modes: Always preserve constness X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: H8NGZHo1X7Fj These casts cast const away temporarily; they are safe, because the pointers that are initialized point to const data. But this is nevertheless not nice and leads to warnings when using -Wcast-qual. blend_modes.c generates 546 (2*39*7) such warnings which is the majority of such warnings for FFmpeg as a whole. vf_blend.c and vf_blend_init.h also use this pattern; they have also been changed. Signed-off-by: Andreas Rheinhardt --- libavfilter/blend_modes.c | 4 ++-- libavfilter/vf_blend.c | 4 ++-- libavfilter/vf_blend_init.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavfilter/blend_modes.c b/libavfilter/blend_modes.c index e2be676243..65c5e6f890 100644 --- a/libavfilter/blend_modes.c +++ b/libavfilter/blend_modes.c @@ -93,8 +93,8 @@ static void fn0(NAME)(const uint8_t *_top, ptrdiff_t top_linesize, \ ptrdiff_t width, ptrdiff_t height, \ FilterParams *param, double *values, int starty) \ { \ - const PIXEL *top = (PIXEL *)_top; \ - const PIXEL *bottom = (PIXEL *)_bottom; \ + const PIXEL *top = (const PIXEL *)_top; \ + const PIXEL *bottom = (const PIXEL *)_bottom; \ PIXEL *dst = (PIXEL *)_dst; \ const float opacity = param->opacity; \ \ diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index dfe2b8b174..7100d9f372 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -133,8 +133,8 @@ static void blend_expr_## name(const uint8_t *_top, ptrdiff_t top_linesize, ptrdiff_t width, ptrdiff_t height, \ FilterParams *param, double *values, int starty) \ { \ - const type *top = (type*)_top; \ - const type *bottom = (type*)_bottom; \ + const type *top = (const type*)_top; \ + const type *bottom = (const type*)_bottom; \ type *dst = (type*)_dst; \ AVExpr *e = param->e; \ int y, x; \ diff --git a/libavfilter/vf_blend_init.h b/libavfilter/vf_blend_init.h index f531338a54..d24f178032 100644 --- a/libavfilter/vf_blend_init.h +++ b/libavfilter/vf_blend_init.h @@ -82,8 +82,8 @@ static void blend_normal_##name(const uint8_t *_top, ptrdiff_t top_linesize, ptrdiff_t width, ptrdiff_t height, \ FilterParams *param, double *values, int starty) \ { \ - const type *top = (type*)_top; \ - const type *bottom = (type*)_bottom; \ + const type *top = (const type*)_top; \ + const type *bottom = (const type*)_bottom; \ type *dst = (type*)_dst; \ const float opacity = param->opacity; \ \