summaryrefslogtreecommitdiff
path: root/vcl/source/filter/jpeg/jpegc.cxx
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2016-11-08 19:18:52 +0100
committerTomaž Vajngerl <quikee@gmail.com>2016-11-09 14:13:08 +0000
commit0d1571916116e16ce6a64ab231f7f8632fcbd0e8 (patch)
tree32d763657657d72214220b0b154b419091df5ed3 /vcl/source/filter/jpeg/jpegc.cxx
parentc40e6060b2f0945cc9df052e8bdd578c88a258cb (diff)
tdf#103801 JPEG - don't handle buffer orientation in import
We don't need to read buffer in reverse scanline order if image is bottom-up. This is handled by CopyScanline already. Change-Id: Ibb20978c01115743de8a457e56003d28ef6dd6d9 Reviewed-on: https://gerrit.libreoffice.org/30710 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl/source/filter/jpeg/jpegc.cxx')
-rw-r--r--vcl/source/filter/jpeg/jpegc.cxx13
1 files changed, 0 insertions, 13 deletions
diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index 28af8c915d4b..8fc0ed83b8bf 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -177,16 +177,6 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, long* pLines,
pCYMKBuffer.resize(nWidth * 4);
}
- const ScanlineFormat nFormat = pAccess->GetScanlineFormat();
-
- bool bTopDown = true;
-
- if (( bGray && nFormat == ScanlineFormat::N8BitPal) ||
- (!bGray && nFormat == ScanlineFormat::N24BitTcRgb))
- {
- bTopDown = pAccess->IsTopDown();
- }
-
std::unique_ptr<BitmapColor[]> pCols;
if (bGray)
@@ -228,9 +218,6 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, long* pLines,
jpeg_read_scanlines(&cinfo, reinterpret_cast<JSAMPARRAY>(&p), 1);
}
- if (!bTopDown)
- yIndex = nHeight - 1 - yIndex;
-
if (bGray)
{
for (long x = 0; x < nWidth; ++x)