mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#103801 JPEG - don't handle buffer orientation in import

Browse Source 
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>
This commit is contained in:
Tomaž Vajngerl
2016-11-08 19:18:52 +01:00
committed by Tomaž Vajngerl
parent c40e6060b2
commit 0d15719161
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
vcl/source/filter/jpeg/jpegc.cxx
View File

@@ -177,16 +177,6 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, long* pLines,
pCYMKBuffer.resize(nWidth * 4); 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; std::unique_ptr<BitmapColor[]> pCols;
if (bGray) if (bGray)
@@ -228,9 +218,6 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, long* pLines,
jpeg_read_scanlines(&cinfo, reinterpret_cast<JSAMPARRAY>(&p), 1); jpeg_read_scanlines(&cinfo, reinterpret_cast<JSAMPARRAY>(&p), 1);
} }
if (!bTopDown)
yIndex = nHeight - 1 - yIndex;
if (bGray) if (bGray)
{ {
for (long x = 0; x < nWidth; ++x) for (long x = 0; x < nWidth; ++x)