From: DRC <information@libjpeg-turbo.org>
Date: Tue, 13 Feb 2018 22:34:21 +0000 (-0600)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.5.90~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4e240795cc33bfad75b30b8bf17e95132842e9b4;p=libjpeg-turbo

Merge branch 'master' into dev
---

4e240795cc33bfad75b30b8bf17e95132842e9b4
diff --cc ChangeLog.md
index 28ace13,406c6db..98ca0ae
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -101,6 -7,10 +101,10 @@@ to decompress a specially-crafted malfo
  pose a security threat, but removing the warnings makes it easier to detect
  actual security issues, should they arise in the future.
  
 -2. Fixed a bug in the merged 4:2:0 upsampling/dithered RGB565 color conversion
++11. Fixed a bug in the merged 4:2:0 upsampling/dithered RGB565 color conversion
+ algorithm that caused incorrect dithering in the output image.  This algorithm
+ now produces bitwise-identical results to the unmerged algorithms.
+ 
  
  1.5.3
  =====