From: DRC <information@libjpeg-turbo.org>
Date: Thu, 18 Jul 2019 20:18:27 +0000 (-0500)
Subject: Merge branch 'master' into dev
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7fbfe29c65ef23614fba4f243abd8ff66fdac791;p=libjpeg-turbo

Merge branch 'master' into dev
---

7fbfe29c65ef23614fba4f243abd8ff66fdac791
diff --cc jdsample.c
index 15be7aa,50a68b3..da8f151
--- a/jdsample.c
+++ b/jdsample.c
@@@ -334,8 -338,8 +338,8 @@@ h1v2_fancy_upsample(j_decompress_ptr ci
        outptr = output_data[outrow++];
  
        for (colctr = 0; colctr < compptr->downsampled_width; colctr++) {
 -        thiscolsum = GETJSAMPLE(*inptr0++) * 3 + GETJSAMPLE(*inptr1++);
 +        thiscolsum = (*inptr0++) * 3 + (*inptr1++);
-         *outptr++ = (JSAMPLE)((thiscolsum + 1) >> 2);
+         *outptr++ = (JSAMPLE)((thiscolsum + bias) >> 2);
        }
      }
      inrow++;
diff --cc release/makemacpkg.in
index d499ef4,42b455d..e5e9c56
--- a/release/makemacpkg.in
+++ b/release/makemacpkg.in
@@@ -54,8 -54,12 +54,10 @@@ VERSION=@VERSION
  BUILD=@BUILD@
  SRCDIR=@CMAKE_CURRENT_SOURCE_DIR@
  BUILDDIR32=@OSX_32BIT_BUILD@
 -BUILDDIRARMV7=@IOS_ARMV7_BUILD@
 -BUILDDIRARMV7S=@IOS_ARMV7S_BUILD@
  BUILDDIRARMV8=@IOS_ARMV8_BUILD@
  WITH_JAVA=@WITH_JAVA@
+ OSX_APP_CERT_NAME="@OSX_APP_CERT_NAME@"
+ OSX_INST_CERT_NAME="@OSX_INST_CERT_NAME@"
  LIPO=lipo
  
  PREFIX=@CMAKE_INSTALL_PREFIX@