From d4b89fdb51c0936c50457a2f1e8f6b38d5dd7eb2 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 13 Mar 2017 09:26:36 +0000 Subject: this is a swap Change-Id: Iaf6310055b60da772187fdbeaca74d6eb296cfca --- filter/source/graphicfilter/ios2met/ios2met.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'filter/source') diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 83bd93a3d290..0faf7c313af0 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -26,6 +26,7 @@ #include #include +#include #include class FilterConfigItem; @@ -2301,16 +2302,16 @@ void OS2METReader::ReadImageData(sal_uInt16 nDataID, sal_uInt16 nDataLen) std::unique_ptr pBuf(new sal_uInt8[nDataLen]); pOS2MET->ReadBytes(pBuf.get(), nDataLen); if (p->nBitsPerPixel==24) { - sal_uInt8 nTemp; sal_uLong nBytesPerLine = (p->nWidth * 3 + 3) & 0xfffffffc; sal_uLong nAlign = p->nMapPos - (p->nMapPos % nBytesPerLine); sal_uLong i=0; while (nAlign+i+2nMapPos+nDataLen) { if (nAlign+i>=p->nMapPos) { sal_uLong j = nAlign + i - p->nMapPos; - nTemp=pBuf[j]; pBuf[j]=pBuf[j+2]; pBuf[j+2]=nTemp; + std::swap(pBuf[j], pBuf[j+2]); } - i+=3; if (i+2>=nBytesPerLine) { + i+=3; + if (i+2>=nBytesPerLine) { nAlign+=nBytesPerLine; i=0; } -- cgit 3'>distro/cib/libreoffice-6-3 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/extensions/source/macosx
1e8eef6c744330567512e55b'>weld ListSelectionDialog
AgeCommit message (Expand)Author
2019-11-19tdf#128208: Don't crash if the zip archive is brokenTor Lillqvist
2019-11-19tdf#128208: Add a testbench for the Spotlight importerTor Lillqvist
2019-11-19The macOS SDK 10.15 has a tighter declaration of objc_msgSend()Tor Lillqvist
2019-06-15ERROR ITMS-90511: CFBundleIdentifier CollisionAndras Timar
Caolán McNamara
2018-03-20drop unnecessary includesCaolán McNamara
2017-10-26vcl: make MapMode constructor explicitMichael Stahl
2017-10-23loplugin:includeform: extensionsStephan Bergmann
2017-09-25Rename GetSelectEntryCount -> GetSelectedEntryCountSamuel Mehrbrodt
2017-09-21Rename GetSelectEntryPos -> GetSelectedEntryPosSamuel Mehrbrodt
2017-07-21migrate to boost::gettextCaolán McNamara
2017-07-06use more begin()/end() for SequenceNoel Grandin
2016-10-05convert MapUnit to scoped enumNoel Grandin
2016-04-01sequence->vector in extensionsNoel Grandin
2015-09-12Update many ListBox users to its sal_Int32 interfaceMatteo Casalin
2015-04-10vclwidget: only call dispose() onceNoel Grandin
2015-04-10vclwidget: change all vcl::window fields to be wrapped in VclPtrNoel Grandin
2014-09-23fdo#82577: Handle WindowNoel Grandin
2014-08-14convert RID_DLG_SELECTION to .ui formatCaolán McNamara
2014-05-02extensions: sal_Bool->boolNoel Grandin
2014-02-27Remove visual noise from extensionsAlexander Wilms
2014-02-23Remove unneccessary commentsAlexander Wilms
2013-10-01convert extensions module from String to OUStringNoel Grandin