mirror of
				https://github.com/JakubMelka/PDF4QT.git
				synced 2025-06-05 21:59:17 +02:00 
			
		
		
		
	Issue #22: Clang compilation fix
This commit is contained in:
		@@ -23,6 +23,11 @@
 | 
			
		||||
#include <QApplication>
 | 
			
		||||
#include <QReadWriteLock>
 | 
			
		||||
 | 
			
		||||
#ifdef PDF4QT_COMPILER_CLANG
 | 
			
		||||
#pragma clang diagnostic push
 | 
			
		||||
#pragma clang diagnostic ignored "-Wregister"
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef PDF4QT_COMPILER_MSVC
 | 
			
		||||
#pragma warning(push)
 | 
			
		||||
#pragma warning(disable:5033)
 | 
			
		||||
@@ -34,6 +39,9 @@
 | 
			
		||||
#pragma warning(pop)
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef PDF4QT_COMPILER_CLANG
 | 
			
		||||
#pragma clang diagnostic pop
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef Q_OS_WIN
 | 
			
		||||
#ifndef NOMINMAX
 | 
			
		||||
 
 | 
			
		||||
@@ -2508,8 +2508,8 @@ void PDFJBIG2Decoder::processGenericRegion(const PDFJBIG2SegmentHeader& header)
 | 
			
		||||
        QByteArray endSequence(2, 0);
 | 
			
		||||
        if (!parameters.MMR)
 | 
			
		||||
        {
 | 
			
		||||
            endSequence[0] = unsigned char(0xFF);
 | 
			
		||||
            endSequence[1] = unsigned char(0xAC);
 | 
			
		||||
            endSequence[0] = (unsigned char)(0xFF);
 | 
			
		||||
            endSequence[1] = (unsigned char)(0xAC);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        int endPosition = stream->indexOf(endSequence);
 | 
			
		||||
 
 | 
			
		||||
@@ -38,12 +38,21 @@
 | 
			
		||||
#endif
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef PDF4QT_COMPILER_CLANG
 | 
			
		||||
#pragma clang diagnostic push
 | 
			
		||||
#pragma clang diagnostic ignored "-Wregister"
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#pragma warning(push)
 | 
			
		||||
#pragma warning(disable:5033)
 | 
			
		||||
#define CMS_NO_REGISTER_KEYWORD
 | 
			
		||||
#include <lcms2.h>
 | 
			
		||||
#pragma warning(pop)
 | 
			
		||||
 | 
			
		||||
#ifdef PDF4QT_COMPILER_CLANG
 | 
			
		||||
#pragma clang diagnostic pop
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
namespace pdf
 | 
			
		||||
{
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user