Index: xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp |
diff --git a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp |
index 8f4b226e8c13c4d5811aca71d734037ea62a0443..159f27f826cdd06df2c02b41a1cdc24309fed39d 100644 |
--- a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp |
+++ b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp |
@@ -22,6 +22,7 @@ |
#include "BC_OneDimWriter.h" |
+#include <algorithm> |
#include <memory> |
#include "xfa/src/fxbarcode/BC_Writer.h" |
@@ -391,7 +392,8 @@ void CBC_OneDimWriter::RenderResult(const CFX_WideStringC& contents, |
m_outputHScale = (FX_FLOAT)m_Width / (FX_FLOAT)codeLength; |
} |
if (!isDevice) { |
- m_outputHScale = FX_MAX(m_outputHScale, m_ModuleWidth); |
+ m_outputHScale = |
+ std::max(m_outputHScale, static_cast<FX_FLOAT>(m_ModuleWidth)); |
} |
FX_FLOAT dataLengthScale = 1.0; |
if (m_iDataLenth > 0 && contents.GetLength() != 0) { |
@@ -407,7 +409,7 @@ void CBC_OneDimWriter::RenderResult(const CFX_WideStringC& contents, |
int32_t outputHeight = 1; |
if (!isDevice) { |
if (m_Height == 0) { |
- outputHeight = FX_MAX(20, m_ModuleHeight); |
+ outputHeight = std::max(20, m_ModuleHeight); |
} else { |
outputHeight = m_Height; |
} |