From 2fc0ce5c246a70c83691e7f1afd689457e25e70f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hajo=20Nils=20Krabbenho=CC=88ft?=
 <fxtentacle@googlemail.com>
Date: Wed, 16 Sep 2015 22:19:51 +0200
Subject: [PATCH] buffer_size should be in bytes, not bits

(cherry picked from commit 7825cbeb7d70c2e1e558808d7433ece414394177)
---
 modules/highgui/src/grfmt_tiff.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/highgui/src/grfmt_tiff.cpp b/modules/highgui/src/grfmt_tiff.cpp
index 067f22de2f..c7639fe345 100644
--- a/modules/highgui/src/grfmt_tiff.cpp
+++ b/modules/highgui/src/grfmt_tiff.cpp
@@ -226,7 +226,7 @@ bool  TiffDecoder::readData( Mat& img )
                 bpp = 8;
                 ncn = 4;
             }
-            const size_t buffer_size = bpp * ncn * tile_height0 * tile_width0;
+            const size_t buffer_size = (bpp/bitsPerByte) * ncn * tile_height0 * tile_width0;
             AutoBuffer<uchar> _buffer( buffer_size );
             uchar* buffer = _buffer;
             ushort* buffer16 = (ushort*)buffer;