fenix
/
PDF4QT
mirror of https://github.com/JakubMelka/PDF4QT.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #22: Clang compilation fix

This commit is contained in:
Jakub Melka 2022-07-31 19:17:43 +02:00
parent e310efb763
commit ae5e2fa9cd
4 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Pdf4QtDocPageOrganizer/pageitemmodel.cpp
View File

@ -923,6 +923,10 @@ void PageItemModel::updateItemCaptionAndTags(PageGroupItem& item) const
hasEmptyPage = true; hasEmptyPage = true;
++emptyPageCount; ++emptyPageCount;
break; break;
case pdfdocpage::PT_Last:
Q_ASSERT(false);
break;
} }
} }

8
Pdf4QtLib/sources/pdfcms.cpp
View File

@ -23,6 +23,11 @@
#include <QApplication> #include <QApplication>
#include <QReadWriteLock> #include <QReadWriteLock>
#ifdef PDF4QT_COMPILER_CLANG
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wregister"
#endif
#ifdef PDF4QT_COMPILER_MSVC #ifdef PDF4QT_COMPILER_MSVC
#pragma warning(push) #pragma warning(push)
#pragma warning(disable:5033) #pragma warning(disable:5033)
@ -34,6 +39,9 @@
#pragma warning(pop) #pragma warning(pop)
#endif #endif
#ifdef PDF4QT_COMPILER_CLANG
#pragma clang diagnostic pop
#endif
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#ifndef NOMINMAX #ifndef NOMINMAX

4
Pdf4QtLib/sources/pdfjbig2decoder.cpp
View File

@ -2508,8 +2508,8 @@ void PDFJBIG2Decoder::processGenericRegion(const PDFJBIG2SegmentHeader& header)
QByteArray endSequence(2, 0); QByteArray endSequence(2, 0);
if (!parameters.MMR) if (!parameters.MMR)
{ {
endSequence[0] = unsigned char(0xFF); endSequence[0] = (unsigned char)(0xFF);
endSequence[1] = unsigned char(0xAC); endSequence[1] = (unsigned char)(0xAC);
} }
int endPosition = stream->indexOf(endSequence); int endPosition = stream->indexOf(endSequence);

9
Pdf4QtLib/sources/pdfutils.cpp
View File

@ -38,12 +38,21 @@
#endif #endif
#endif #endif
#ifdef PDF4QT_COMPILER_CLANG
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wregister"
#endif
#pragma warning(push) #pragma warning(push)
#pragma warning(disable:5033) #pragma warning(disable:5033)
#define CMS_NO_REGISTER_KEYWORD #define CMS_NO_REGISTER_KEYWORD
#include <lcms2.h> #include <lcms2.h>
#pragma warning(pop) #pragma warning(pop)
#ifdef PDF4QT_COMPILER_CLANG
#pragma clang diagnostic pop
#endif
namespace pdf namespace pdf
{ {