From patchwork Sat Sep 28 02:26:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15357 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 5F53D448ABC for ; Sat, 28 Sep 2019 05:42:14 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A7AD68A626; Sat, 28 Sep 2019 05:42:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E5FB0689CFF for ; Sat, 28 Sep 2019 05:42:07 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id w12so5130764wro.5 for ; Fri, 27 Sep 2019 19:42:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KEzzphIAvPkgW1LYSVyFNvopA3MLX7BmmMUmYH0i3Qo=; b=rwRLH+Yad+uNDnMOslwZF5ldkZPOhqsoDoO5s3LZtF1MtEJofgZ9OMWFjvZuSnBuRC 2DwxpGENCUPEM9uKs8gTxBSgaq/Cuf+3cbfDf+k2mCH677s65qZ5TUlyRrF1tIbpCtOJ LHqXCepK49TWe4aRJ4bYdfoPSC7oDvRQ4QuUDa/wANQHzdI6LmrB0B87z5rCD3yJEopN mploApCYmmBPYSXtsFRW33XyIAvReWiKYIhHf543tvPgkOwLoPjpUEJ+Q7IooPs0mbwX cBEjuDZw7DYZGkhjoyOpznSYYrtHQwxnckbSWn2lRqatYp3hVHSaIZxopLuXslYckmuC KQIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KEzzphIAvPkgW1LYSVyFNvopA3MLX7BmmMUmYH0i3Qo=; b=Y1iAXQqdSxeqI2jLX2IznKRZBKy5nHvptGCOJ7c2Qoxub7/CT3i5s81uoOSJHM8X8j kdnkb0NyUBeLaPKIUd8+gNJztxUY19dBi2GtuF5xywccT9JUmsbfeH6YybuB+AegHpRL sPMaBmPN1e0MFodVnieALaMEpJop/ofU0hG5YyLuGxcheIWKTtn40XaRkrfCeKBBcXVO dxhjSSe+TvnyJIg0CQEyStD8uvPOUcnkSRrbTKUnCfvD8Ms49VbEKTKCe6fmaqD4pkx8 rzA/yrc1/O+VyXuo8JwUiBPcUdBIdXpjAIxY196QVMW/80IIfWEoKSD5KvLQG8UQMZam Z76g== X-Gm-Message-State: APjAAAWRYrqCgA0x1liiT0NDOiPrHlakD07h90XAKpBV97pffQNwxyVI oGKlCIHHW/1+C7mY2xNaqX7avN1V X-Google-Smtp-Source: APXvYqwb6x+YzDwJ8515wwgPTb3RMFS77cc9Dm14UrMoEoEaw5q4yof4h1Pelu2Ne5Icok0ioBMlBw== X-Received: by 2002:a5d:4dd0:: with SMTP id f16mr4874098wru.85.1569638044820; Fri, 27 Sep 2019 19:34:04 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc0f857.dynamic.kabel-deutschland.de. [188.192.248.87]) by smtp.gmail.com with ESMTPSA id r7sm4484231wrx.87.2019.09.27.19.34.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2019 19:34:04 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Sep 2019 04:26:10 +0200 Message-Id: <20190928022610.5903-15-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190928022610.5903-1-andreas.rheinhardt@gmail.com> References: <20190928022610.5903-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 15/15] avcodec/jpeg2000dwt: Fix undefined shifts of negative numbers X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Affected the vsynth*-jpeg2000 and the vsynth*-jpeg2000-97 FATE tests (where * ranges over { 1, 2, 3, _lena }) as well as ticket #7983. Signed-off-by: Andreas Rheinhardt --- libavcodec/jpeg2000dwt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/jpeg2000dwt.c b/libavcodec/jpeg2000dwt.c index badf0f8cd0..f418454ee9 100644 --- a/libavcodec/jpeg2000dwt.c +++ b/libavcodec/jpeg2000dwt.c @@ -255,7 +255,7 @@ static void dwt_encode97_int(DWTContext *s, int *t) line += 5; for (i = 0; i < w * h; i++) - t[i] <<= I_PRESHIFT; + t[i] *= 1 << I_PRESHIFT; for (lev = s->ndeclevels-1; lev >= 0; lev--){ int lh = s->linelen[lev][0],