vcl/source/filter/jpeg/jpegc.cxx | 13 ------------- 1 file changed, 13 deletions(-)
New commits: commit 0d1571916116e16ce6a64ab231f7f8632fcbd0e8 Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk> Date: Tue Nov 8 19:18:52 2016 +0100 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 <c...@libreoffice.org> Reviewed-by: Tomaž Vajngerl <qui...@gmail.com> diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx index 28af8c9..8fc0ed8 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)
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits