diff options
Diffstat (limited to 'fxbarcode')
| -rw-r--r-- | fxbarcode/oned/BC_OneDimWriter.cpp | 4 | ||||
| -rw-r--r-- | fxbarcode/qrcode/BC_QRCoderEncoder.cpp | 2 | ||||
| -rw-r--r-- | fxbarcode/utils.h | 16 |
3 files changed, 11 insertions, 11 deletions
diff --git a/fxbarcode/oned/BC_OneDimWriter.cpp b/fxbarcode/oned/BC_OneDimWriter.cpp index e09e0ce5aa..5bcb3c38bc 100644 --- a/fxbarcode/oned/BC_OneDimWriter.cpp +++ b/fxbarcode/oned/BC_OneDimWriter.cpp @@ -158,7 +158,7 @@ void CBC_OneDimWriter::CalcTextInfo(const ByteString& text, charPos[0].m_Origin = CFX_PointF(penX + left, penY + top); charPos[0].m_GlyphIndex = encoding->GlyphFromCharCode(pCharCode[0]); charPos[0].m_FontCharWidth = cFont->GetGlyphWidth(charPos[0].m_GlyphIndex); -#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ charPos[0].m_ExtGID = charPos[0].m_GlyphIndex; #endif penX += (float)(charPos[0].m_FontCharWidth) * (float)fontSize / 1000.0f; @@ -166,7 +166,7 @@ void CBC_OneDimWriter::CalcTextInfo(const ByteString& text, charPos[i].m_Origin = CFX_PointF(penX + left, penY + top); charPos[i].m_GlyphIndex = encoding->GlyphFromCharCode(pCharCode[i]); charPos[i].m_FontCharWidth = cFont->GetGlyphWidth(charPos[i].m_GlyphIndex); -#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ charPos[i].m_ExtGID = charPos[i].m_GlyphIndex; #endif penX += (float)(charPos[i].m_FontCharWidth) * (float)fontSize / 1000.0f; diff --git a/fxbarcode/qrcode/BC_QRCoderEncoder.cpp b/fxbarcode/qrcode/BC_QRCoderEncoder.cpp index e1a4917792..c8ee709235 100644 --- a/fxbarcode/qrcode/BC_QRCoderEncoder.cpp +++ b/fxbarcode/qrcode/BC_QRCoderEncoder.cpp @@ -443,7 +443,7 @@ void SplitString(const ByteString& content, uint8_t c = static_cast<uint8_t>(content[index]); if (((c >= 0xA1 && c <= 0xAA) || (c >= 0xB0 && c <= 0xFA))) break; -#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ +#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ bool high = !!IsDBCSLeadByte(content[index]); #else bool high = content[index] > 127; diff --git a/fxbarcode/utils.h b/fxbarcode/utils.h index ec3992805e..55d1c96af0 100644 --- a/fxbarcode/utils.h +++ b/fxbarcode/utils.h @@ -19,24 +19,24 @@ bool BC_FX_ByteString_Replace(ByteString& dst, void BC_FX_ByteString_Append(ByteString& dst, int32_t count, char c); void BC_FX_ByteString_Append(ByteString& dst, const std::vector<uint8_t>& ba); -#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ +#if _FX_OS_ == _FX_OS_WIN32_ || _FX_OS_ == _FX_OS_WIN64_ #include <limits> -#elif _FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_LINUX_DESKTOP_ +#elif _FX_OS_ == _FX_OS_MACOSX_ || _FX_OS_ == _FX_OS_LINUX_ #include <limits.h> #endif -#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ +#if _FX_OS_ == _FX_OS_WIN32_ || _FX_OS_ == _FX_OS_WIN64_ #define FXSYS_isnan(x) _isnan(x) -#elif _FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_LINUX_DESKTOP_ || \ - _FX_OS_ == _FX_ANDROID_ +#elif _FX_OS_ == _FX_OS_MACOSX_ || _FX_OS_ == _FX_OS_LINUX_ || \ + _FX_OS_ == _FX_OS_ANDROID_ #include <cmath> #define FXSYS_isnan(x) std::isnan(x) #endif -#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ +#if _FX_OS_ == _FX_OS_WIN32_ || _FX_OS_ == _FX_OS_WIN64_ #define FXSYS_nan() (std::numeric_limits<float>::quiet_NaN()) -#elif _FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_LINUX_DESKTOP_ || \ - _FX_OS_ == _FX_ANDROID_ +#elif _FX_OS_ == _FX_OS_MACOSX_ || _FX_OS_ == _FX_OS_LINUX_ || \ + _FX_OS_ == _FX_OS_ANDROID_ #define FXSYS_nan() NAN #endif |