Commit 42c01d97 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander Trofimov
parent 024beed1
...@@ -95,7 +95,10 @@ DEFINES += \ ...@@ -95,7 +95,10 @@ DEFINES += \
win32 { win32 {
DEFINES += \ DEFINES += \
JAS_WIN_MSVC_BUILD \ JAS_WIN_MSVC_BUILD \
WIN32 WIN32 \
NOMINMAX
QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
message(windows) message(windows)
} }
......
...@@ -1178,7 +1178,7 @@ namespace PdfWriter ...@@ -1178,7 +1178,7 @@ namespace PdfWriter
ReadOS2(); ReadOS2();
} }
int CFontFileTrueType::SeekTable(char *sTag) int CFontFileTrueType::SeekTable(const char *sTag)
{ {
unsigned int nTagIndex = ((sTag[0] & 0xff) << 24) | ((sTag[1] & 0xff) << 16) | ((sTag[2] & 0xff) << 8) | (sTag[3] & 0xff); unsigned int nTagIndex = ((sTag[0] & 0xff) << 24) | ((sTag[1] & 0xff) << 16) | ((sTag[2] & 0xff) << 8) | (sTag[3] & 0xff);
for (int nIndex = 0; nIndex < m_nTablesCount; ++nIndex) for (int nIndex = 0; nIndex < m_nTablesCount; ++nIndex)
...@@ -1202,4 +1202,4 @@ namespace PdfWriter ...@@ -1202,4 +1202,4 @@ namespace PdfWriter
m_nCapHeight = GetS16BE(unOffset + 88, &m_bSuccess); m_nCapHeight = GetS16BE(unOffset + 88, &m_bSuccess);
} }
} }
} }
\ No newline at end of file
...@@ -68,7 +68,7 @@ namespace PdfWriter ...@@ -68,7 +68,7 @@ namespace PdfWriter
unsigned int ComputeTableChecksum(unsigned char *sData, int nLength); unsigned int ComputeTableChecksum(unsigned char *sData, int nLength);
void Parse(); void Parse();
int SeekTable(char *sTag); int SeekTable(const char *sTag);
void ReadOS2(); void ReadOS2();
private: private:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment