graphics/jpeg-turbo: sync with upstream

Taken from: FreeBSD
This commit is contained in:
Franco Fichtner 2015-10-15 19:47:13 +02:00
parent 067d87b911
commit 6a79129752
3 changed files with 3 additions and 44 deletions

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= jpeg-turbo
PORTVERSION= 1.4.1
PORTVERSION= 1.4.2
PORTREVISION?= 0
CATEGORIES= graphics
MASTER_SITES= SF/lib${PORTNAME}/${PORTVERSION}

View file

@ -1,2 +1,2 @@
SHA256 (libjpeg-turbo-1.4.1.tar.gz) = 4bf5bad4ce85625bffbbd9912211e06790e00fb982b77724af7211034efafb08
SIZE (libjpeg-turbo-1.4.1.tar.gz) = 1529614
SHA256 (libjpeg-turbo-1.4.2.tar.gz) = 521bb5d3043e7ac063ce3026d9a59cc2ab2e9636c655a2515af5f4706122233e
SIZE (libjpeg-turbo-1.4.2.tar.gz) = 1569306

View file

@ -1,41 +0,0 @@
--- jcdctmgr.c.orig 2014-11-06 09:32:38 UTC
+++ jcdctmgr.c
@@ -6,7 +6,7 @@
* libjpeg-turbo Modifications:
* Copyright (C) 1999-2006, MIYASAKA Masaru.
* Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
- * Copyright (C) 2011, 2014 D. R. Commander
+ * Copyright (C) 2011, 2014-2015 D. R. Commander
* For conditions of distribution and use, see the accompanying README file.
*
* This file contains the forward-DCT management logic.
@@ -175,6 +175,19 @@ compute_reciprocal (UINT16 divisor, DCTE
UDCTELEM c;
int b, r;
+ if (divisor == 1) {
+ /* divisor == 1 means unquantized, so these reciprocal/correction/shift
+ * values will cause the C quantization algorithm to act like the
+ * identity function. Since only the C quantization algorithm is used in
+ * these cases, the scale value is irrelevant.
+ */
+ dtbl[DCTSIZE2 * 0] = (DCTELEM) 1; /* reciprocal */
+ dtbl[DCTSIZE2 * 1] = (DCTELEM) 0; /* correction */
+ dtbl[DCTSIZE2 * 2] = (DCTELEM) 1; /* scale */
+ dtbl[DCTSIZE2 * 3] = (DCTELEM) (-sizeof(DCTELEM) * 8); /* shift */
+ return 0;
+ }
+
b = flss(divisor) - 1;
r = sizeof(DCTELEM) * 8 + b;
@@ -395,7 +408,8 @@ quantize (JCOEFPTR coef_block, DCTELEM *
#if BITS_IN_JSAMPLE == 8
- UDCTELEM recip, corr, shift;
+ UDCTELEM recip, corr;
+ int shift;
UDCTELEM2 product;
for (i = 0; i < DCTSIZE2; i++) {