Skip to content

O
onlyoffice_core
Commit 118d6c0d authored by Ivan.Shulga's avatar Ivan.Shulga Committed by Alexander Trofimov
Browse files
Options

std::max -> (std::max) 

std::min -> (std::min)

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59189 954022d7-b5bf-4e40-9824-e11837661b57
parent 43b90c39
Show whitespace changes
Inline Side-by-side
Showing with 55 additions and 55 deletions
Common/DocxFormat/Source/Common/SimpleTypes_Drawing.h
View file @ 118d6c0d
...@@ -991,12 +991,12 @@ namespace SimpleTypes ...@@ -991,12 +991,12 @@ namespace SimpleTypes
void SetValue(int nValue) void SetValue(int nValue)
{ {
this->m_eValue = std::min( 5400000, std::max( -5400000, nValue ) ); this->m_eValue = (std::min)( 5400000, (std::max)( -5400000, nValue ) );
} }
virtual int FromString(CString &sValue) virtual int FromString(CString &sValue)
{ {
this->m_eValue = std::min( 5400000, std::max( -5400000, _wtoi( sValue.GetString() ) ) ); this->m_eValue = (std::min)( 5400000, (std::max)( -5400000, _wtoi( sValue.GetString() ) ) );
return this->m_eValue; return this->m_eValue;
} }
...@@ -1036,7 +1036,7 @@ namespace SimpleTypes ...@@ -1036,7 +1036,7 @@ namespace SimpleTypes
void SetValue(double dValue) void SetValue(double dValue)
{ {
m_dValue = std::min( 100.0, std::max( -100.0, dValue ) ); m_dValue = (std::min)( 100.0, (std::max)( -100.0, dValue ) );
} }
virtual double FromString(CString &sValue) virtual double FromString(CString &sValue)
...@@ -1048,14 +1048,14 @@ namespace SimpleTypes ...@@ -1048,14 +1048,14 @@ namespace SimpleTypes
if ( -1 == nPos ) if ( -1 == nPos )
{ {
// 12.1.2.1 Part4 // 12.1.2.1 Part4
int nValue = std::min( 100000, std::max( -100000, _wtoi( sValue ) ) ); int nValue = (std::min)( 100000, (std::max)( -100000, _wtoi( sValue ) ) );
m_dValue = nValue / 1000.0; m_dValue = nValue / 1000.0;
} }
else else
m_dValue = 0; m_dValue = 0;
} }
else else
m_dValue = std::min( 100.0, std::max( -100.0, _wtof( sValue.Mid( 0, nLen - 1 ) ) ) ); m_dValue = (std::min)( 100.0, (std::max)( -100.0, _wtof( sValue.Mid( 0, nLen - 1 ) ) ) );
return m_dValue; return m_dValue;
} }
...@@ -1141,12 +1141,12 @@ namespace SimpleTypes ...@@ -1141,12 +1141,12 @@ namespace SimpleTypes
void SetValue(int nValue) void SetValue(int nValue)
{ {
this->m_eValue = std::min( 10800000, std::max( 0, nValue ) ); this->m_eValue = (std::min)( 10800000, (std::max)( 0, nValue ) );
} }
virtual int FromString(CString &sValue) virtual int FromString(CString &sValue)
{ {
this->m_eValue = std::min( 10800000, std::max( 0, _wtoi( sValue.GetString() ) ) ); this->m_eValue = (std::min)( 10800000, (std::max)( 0, _wtoi( sValue.GetString() ) ) );
return this->m_eValue; return this->m_eValue;
} }
...@@ -2048,12 +2048,12 @@ namespace SimpleTypes ...@@ -2048,12 +2048,12 @@ namespace SimpleTypes
void SetValue(int nValue) void SetValue(int nValue)
{ {
this->m_eValue = std::min( 21600000, std::max( 0, nValue ) ); this->m_eValue = (std::min)( 21600000, (std::max)( 0, nValue ) );
} }
virtual int FromString(CString &sValue) virtual int FromString(CString &sValue)
{ {
this->m_eValue = std::min( 21600000, std::max( 0, _wtoi( sValue.GetString() ) ) ); this->m_eValue = (std::min)( 21600000, (std::max)( 0, _wtoi( sValue.GetString() ) ) );
return this->m_eValue; return this->m_eValue;
} }
...@@ -2090,7 +2090,7 @@ namespace SimpleTypes ...@@ -2090,7 +2090,7 @@ namespace SimpleTypes
void SetValue(double dValue) void SetValue(double dValue)
{ {
m_dValue = std::min( 100.0, std::max( 0.0, dValue ) ); m_dValue = (std::min)( 100.0, (std::max)( 0.0, dValue ) );
} }
virtual double FromString(CString &sValue) virtual double FromString(CString &sValue)
...@@ -2102,14 +2102,14 @@ namespace SimpleTypes ...@@ -2102,14 +2102,14 @@ namespace SimpleTypes
if ( -1 == nPos ) if ( -1 == nPos )
{ {
// 12.1.2.3 (Part4) // 12.1.2.3 (Part4)
int nValue = std::max( 0, std::min( 100000, _wtoi( sValue ) ) ); int nValue = (std::max)( 0, (std::min)( 100000, _wtoi( sValue ) ) );
m_dValue = nValue / 1000.0; m_dValue = nValue / 1000.0;
} }
else else
m_dValue = 0; m_dValue = 0;
} }
else else
m_dValue = std::min( 100.0, std::max( 0.0, _wtof( sValue.Mid( 0, nLen - 1 ) ) ) ); m_dValue = (std::min)( 100.0, (std::max)( 0.0, _wtof( sValue.Mid( 0, nLen - 1 ) ) ) );
return m_dValue; return m_dValue;
} }
...@@ -2144,7 +2144,7 @@ namespace SimpleTypes ...@@ -2144,7 +2144,7 @@ namespace SimpleTypes
void SetValue(double dValue) void SetValue(double dValue)
{ {
m_dValue = std::max( 0.0, dValue ); m_dValue = (std::max)( 0.0, dValue );
} }
virtual double FromString(CString &sValue) virtual double FromString(CString &sValue)
...@@ -2156,14 +2156,14 @@ namespace SimpleTypes ...@@ -2156,14 +2156,14 @@ namespace SimpleTypes
if ( -1 == nPos ) if ( -1 == nPos )
{ {
// 12.1.2.4 (Part4) // 12.1.2.4 (Part4)
int nValue = std::max( 0, _wtoi( sValue ) ); int nValue = (std::max)( 0, _wtoi( sValue ) );
m_dValue = nValue / 1000.0; m_dValue = nValue / 1000.0;
} }
return return
m_dValue; m_dValue;
} }
else else
m_dValue = std::max( 0.0, _wtof( sValue.Mid( 0, nLen - 1 ) ) ); m_dValue = (std::max)( 0.0, _wtof( sValue.Mid( 0, nLen - 1 ) ) );
return m_dValue; return m_dValue;
} }
...@@ -4869,7 +4869,7 @@ namespace SimpleTypes ...@@ -4869,7 +4869,7 @@ namespace SimpleTypes
virtual void SetValue (unsigned char unValue) virtual void SetValue (unsigned char unValue)
{ {
this->m_eValue = std::min( 16, std::max( 1, (int) unValue ) ); this->m_eValue = (std::min)( 16, (std::max)( 1, (int) unValue ) );
} }
virtual unsigned char FromString(CString &sValue) virtual unsigned char FromString(CString &sValue)
{ {
...@@ -4988,7 +4988,7 @@ namespace SimpleTypes ...@@ -4988,7 +4988,7 @@ namespace SimpleTypes
if ( -1 == nPos ) if ( -1 == nPos )
{ {
// 12.1.2.5 (Part4) // 12.1.2.5 (Part4)
int nValue = std::min( 100000, std::max( 1000, _wtoi( sValue ) ) ); int nValue = (std::min)( 100000, (std::max)( 1000, _wtoi( sValue ) ) );
m_dValue = nValue / 1000.0; m_dValue = nValue / 1000.0;
} }
return return
...@@ -5441,7 +5441,7 @@ namespace SimpleTypes ...@@ -5441,7 +5441,7 @@ namespace SimpleTypes
if ( -1 == nPos ) if ( -1 == nPos )
{ {
// 12.1.2.7 (Part4) // 12.1.2.7 (Part4)
int nValue = std::min( 13200000, std::max( 0, _wtoi( sValue ) ) ); int nValue = (std::min)( 13200000, (std::max)( 0, _wtoi( sValue ) ) );
m_dValue = nValue / 1000.0; m_dValue = nValue / 1000.0;
} }
return m_dValue; return m_dValue;
......
Common/DocxFormat/Source/Common/SimpleTypes_Shared.h
View file @ 118d6c0d
...@@ -625,7 +625,7 @@ namespace SimpleTypes ...@@ -625,7 +625,7 @@ namespace SimpleTypes
if ( m_sValue.GetLength() < 20 ) if ( m_sValue.GetLength() < 20 )
return 0; return 0;
nIndex = std::max( 0, std::min( 9, nIndex ) ); nIndex = (std::max)( 0, (std::min)( 9, nIndex ) );
unsigned int unChar1 = XmlUtils::GetDigit( m_sValue[2 * nIndex] ); unsigned int unChar1 = XmlUtils::GetDigit( m_sValue[2 * nIndex] );
unsigned int unChar2 = XmlUtils::GetDigit( m_sValue[2 * nIndex + 1] ); unsigned int unChar2 = XmlUtils::GetDigit( m_sValue[2 * nIndex + 1] );
......
Common/DocxFormat/Source/Common/SimpleTypes_Vml.h
View file @ 118d6c0d
...@@ -2675,12 +2675,12 @@ namespace SimpleTypes ...@@ -2675,12 +2675,12 @@ namespace SimpleTypes
void SetValue(double dValue) void SetValue(double dValue)
{ {
m_dValue = std::max( 0.0, std::min( 1.0, dValue) ); m_dValue = (std::max)( 0.0, (std::min)( 1.0, dValue) );
} }
void SetValue(int nValue) void SetValue(int nValue)
{ {
m_dValue = std::max( 0.0, std::min( 65536.0, (double) nValue) ) / 65536.0; m_dValue = (std::max)( 0.0, (std::min)( 65536.0, (double) nValue) ) / 65536.0;
} }
virtual double FromString(CString &sValue) virtual double FromString(CString &sValue)
...@@ -4742,16 +4742,16 @@ namespace SimpleTypes ...@@ -4742,16 +4742,16 @@ namespace SimpleTypes
void SetValue(double dValue) void SetValue(double dValue)
{ {
m_dValue = std::max( 0.0, std::min( 1.0, dValue) ); m_dValue = (std::max)( 0.0, (std::min)( 1.0, dValue) );
} }
void SetValue(int nValue) void SetValue(int nValue)
{ {
m_dValue = std::max( 0.0, std::min( 65536.0, (double) nValue) ) / 65536.0; m_dValue = (std::max)( 0.0, (std::min)( 65536.0, (double) nValue) ) / 65536.0;
} }
void SetPercentage(double dValue) void SetPercentage(double dValue)
{ {
m_dValue = std::max( 0.0, std::min( 100.0, dValue ) ) / 100.0; m_dValue = (std::max)( 0.0, (std::min)( 100.0, dValue ) ) / 100.0;
} }
virtual double FromString(CString &sValue) virtual double FromString(CString &sValue)
......
Common/DocxFormat/Source/Common/SimpleTypes_Word.h
View file @ 118d6c0d
...@@ -5804,14 +5804,14 @@ namespace SimpleTypes ...@@ -5804,14 +5804,14 @@ namespace SimpleTypes
virtual void SetValue(int nValue) virtual void SetValue(int nValue)
{ {
this->m_eValue = std::min( 600, std::max( 0, nValue ) ); this->m_eValue = (std::min)( 600, (std::max)( 0, nValue ) );
} }
virtual int FromString(CString &sValue) virtual int FromString(CString &sValue)
{ {
this->m_eValue = _wtoi( sValue ); this->m_eValue = _wtoi( sValue );
this->m_eValue = std::min( 600, std::max( 0, this->m_eValue ) ); this->m_eValue = (std::min)( 600, (std::max)( 0, this->m_eValue ) );
return this->m_eValue; return this->m_eValue;
} }
...@@ -6627,7 +6627,7 @@ namespace SimpleTypes ...@@ -6627,7 +6627,7 @@ namespace SimpleTypes
void Parse(CString &sValue) void Parse(CString &sValue)
{ {
int nLen = std::min( sValue.GetLength(), 12 ); int nLen = (std::min)( sValue.GetLength(), 12 );
for ( int nIndex = 0, nMult = 1; nIndex < nLen; nIndex++, nMult <<= 1 ) for ( int nIndex = 0, nMult = 1; nIndex < nLen; nIndex++, nMult <<= 1 )
{ {
......
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingColors.h
View file @ 118d6c0d
...@@ -1645,7 +1645,7 @@ namespace OOX ...@@ -1645,7 +1645,7 @@ namespace OOX
double dVal = pAlphaTr->m_oVal.GetValue() / 100.0; double dVal = pAlphaTr->m_oVal.GetValue() / 100.0;
int nA = (int)std::max( 0.0, std::min( 255.0, 255 * dVal ) ); int nA = (int)(std::max)( 0.0, (std::min)( 255.0, 255 * dVal ) );
m_unA = static_cast<unsigned char>(nA); m_unA = static_cast<unsigned char>(nA);
break; break;
...@@ -1656,7 +1656,7 @@ namespace OOX ...@@ -1656,7 +1656,7 @@ namespace OOX
double dVal = pAlphaTr->m_oVal.GetValue() / 100.0; double dVal = pAlphaTr->m_oVal.GetValue() / 100.0;
int nA = (int)std::max( 0.0, std::min( 255.0, m_unA * dVal ) ); int nA = (int)(std::max)( 0.0, (std::min)( 255.0, m_unA * dVal ) );
m_unA = static_cast<unsigned char>(nA); m_unA = static_cast<unsigned char>(nA);
break; break;
...@@ -1667,7 +1667,7 @@ namespace OOX ...@@ -1667,7 +1667,7 @@ namespace OOX
double dVal = pAlphaTr->m_oVal.GetValue() / 100.0; double dVal = pAlphaTr->m_oVal.GetValue() / 100.0;
int nA = (int)std::max( 0.0, std::min( 255.0, m_unA + 255 * dVal ) ); int nA = (int)(std::max)( 0.0, (std::min)( 255.0, m_unA + 255 * dVal ) );
m_unA = static_cast<unsigned char>(nA); m_unA = static_cast<unsigned char>(nA);
break; break;
...@@ -1678,7 +1678,7 @@ namespace OOX ...@@ -1678,7 +1678,7 @@ namespace OOX
double dVal = pBlueTr->m_oVal.GetValue() / 100.0; double dVal = pBlueTr->m_oVal.GetValue() / 100.0;
int nB = (int)std::max( 0.0, std::min( 255.0, 255 * dVal ) ); int nB = (int)(std::max)( 0.0, (std::min)( 255.0, 255 * dVal ) );
m_unB = static_cast<unsigned char>(nB); m_unB = static_cast<unsigned char>(nB);
break; break;
...@@ -1689,7 +1689,7 @@ namespace OOX ...@@ -1689,7 +1689,7 @@ namespace OOX
double dVal = pBlueTr->m_oVal.GetValue() / 100.0; double dVal = pBlueTr->m_oVal.GetValue() / 100.0;
int nB = (int)std::max( 0.0, std::min( 255.0, m_unB * dVal ) ); int nB = (int)(std::max)( 0.0, (std::min)( 255.0, m_unB * dVal ) );
m_unB = static_cast<unsigned char>(nB); m_unB = static_cast<unsigned char>(nB);
break; break;
...@@ -1700,7 +1700,7 @@ namespace OOX ...@@ -1700,7 +1700,7 @@ namespace OOX
double dVal = pBlueTr->m_oVal.GetValue() / 100.0; double dVal = pBlueTr->m_oVal.GetValue() / 100.0;
int nB = (int)std::max( 0.0, std::min( 255.0, m_unB + 255 * dVal ) ); int nB = (int)(std::max)( 0.0, (std::min)( 255.0, m_unB + 255 * dVal ) );
m_unB = static_cast<unsigned char>(nB); m_unB = static_cast<unsigned char>(nB);
break; break;
...@@ -1734,7 +1734,7 @@ namespace OOX ...@@ -1734,7 +1734,7 @@ namespace OOX
double dVal = pGreenTr->m_oVal.GetValue() / 100.0; double dVal = pGreenTr->m_oVal.GetValue() / 100.0;
int nG = (int)std::max( 0.0, std::min( 255.0, 255 * dVal ) ); int nG = (int)(std::max)( 0.0, (std::min)( 255.0, 255 * dVal ) );
m_unG = static_cast<unsigned char>(nG); m_unG = static_cast<unsigned char>(nG);
break; break;
...@@ -1745,7 +1745,7 @@ namespace OOX ...@@ -1745,7 +1745,7 @@ namespace OOX
double dVal = pGreenTr->m_oVal.GetValue() / 100.0; double dVal = pGreenTr->m_oVal.GetValue() / 100.0;
int nG = (int)std::max( 0.0, std::min( 255.0, m_unG * dVal ) ); int nG = (int)(std::max)( 0.0, (std::min)( 255.0, m_unG * dVal ) );
m_unG = static_cast<unsigned char>(nG); m_unG = static_cast<unsigned char>(nG);
break; break;
...@@ -1756,7 +1756,7 @@ namespace OOX ...@@ -1756,7 +1756,7 @@ namespace OOX
double dVal = pGreenTr->m_oVal.GetValue() / 100.0; double dVal = pGreenTr->m_oVal.GetValue() / 100.0;
int nG = (int)std::max( 0.0, std::min( 255.0, m_unG + 255 * dVal ) ); int nG = (int)(std::max)( 0.0, (std::min)( 255.0, m_unG + 255 * dVal ) );
m_unG = static_cast<unsigned char>(nG); m_unG = static_cast<unsigned char>(nG);
break; break;
...@@ -1769,7 +1769,7 @@ namespace OOX ...@@ -1769,7 +1769,7 @@ namespace OOX
double dH, dS, dL; double dH, dS, dL;
RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL ); RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL );
dH = std::max( 0.0, std::min( 1.0, dVal ) ); dH = (std::max)( 0.0, (std::min)( 1.0, dVal ) );
HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB ); HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB );
...@@ -1783,7 +1783,7 @@ namespace OOX ...@@ -1783,7 +1783,7 @@ namespace OOX
double dH, dS, dL; double dH, dS, dL;
RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL ); RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL );
dH = std::max( 0.0, std::min( 1.0, dH * dVal ) ); dH = (std::max)( 0.0, (std::min)( 1.0, dH * dVal ) );
HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB ); HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB );
...@@ -1797,7 +1797,7 @@ namespace OOX ...@@ -1797,7 +1797,7 @@ namespace OOX
double dH, dS, dL; double dH, dS, dL;
RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL ); RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL );
dH = std::max( 0.0, std::min( 1.0, dH + dVal ) ); dH = (std::max)( 0.0, (std::min)( 1.0, dH + dVal ) );
HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB ); HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB );
...@@ -1823,7 +1823,7 @@ namespace OOX ...@@ -1823,7 +1823,7 @@ namespace OOX
double dH, dS, dL; double dH, dS, dL;
RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL ); RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL );
dL = std::max( 0.0, std::min( 1.0, dVal ) ); dL = (std::max)( 0.0, (std::min)( 1.0, dVal ) );
HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB ); HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB );
...@@ -1837,7 +1837,7 @@ namespace OOX ...@@ -1837,7 +1837,7 @@ namespace OOX
double dH, dS, dL; double dH, dS, dL;
RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL ); RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL );
dL = std::max( 0.0, std::min( 1.0, dL * dVal ) ); dL = (std::max)( 0.0, (std::min)( 1.0, dL * dVal ) );
HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB ); HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB );
...@@ -1851,7 +1851,7 @@ namespace OOX ...@@ -1851,7 +1851,7 @@ namespace OOX
double dH, dS, dL; double dH, dS, dL;
RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL ); RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL );
dL = std::max( 0.0, std::min( 1.0, dL + dVal ) ); dL = (std::max)( 0.0, (std::min)( 1.0, dL + dVal ) );
HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB ); HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB );
...@@ -1863,7 +1863,7 @@ namespace OOX ...@@ -1863,7 +1863,7 @@ namespace OOX
double dVal = pRedTr->m_oVal.GetValue() / 100.0; double dVal = pRedTr->m_oVal.GetValue() / 100.0;
int nR = (int)std::max( 0.0, std::min( 255.0, 255 * dVal ) ); int nR = (int)(std::max)( 0.0, (std::min)( 255.0, 255 * dVal ) );
m_unR = static_cast<unsigned char>(nR); m_unR = static_cast<unsigned char>(nR);
break; break;
...@@ -1874,7 +1874,7 @@ namespace OOX ...@@ -1874,7 +1874,7 @@ namespace OOX
double dVal = pRedTr->m_oVal.GetValue() / 100.0; double dVal = pRedTr->m_oVal.GetValue() / 100.0;
int nR = (int)std::max( 0.0, std::min( 255.0, m_unR * dVal ) ); int nR = (int)(std::max)( 0.0, (std::min)( 255.0, m_unR * dVal ) );
m_unR = static_cast<unsigned char>(nR); m_unR = static_cast<unsigned char>(nR);
break; break;
...@@ -1885,7 +1885,7 @@ namespace OOX ...@@ -1885,7 +1885,7 @@ namespace OOX
double dVal = pRedTr->m_oVal.GetValue() / 100.0; double dVal = pRedTr->m_oVal.GetValue() / 100.0;
int nR = (int)std::max( 0.0, std::min( 255.0, m_unR + 255 * dVal ) ); int nR = (int)(std::max)( 0.0, (std::min)( 255.0, m_unR + 255 * dVal ) );
m_unR = static_cast<unsigned char>(nR); m_unR = static_cast<unsigned char>(nR);
break; break;
...@@ -1898,7 +1898,7 @@ namespace OOX ...@@ -1898,7 +1898,7 @@ namespace OOX
double dH, dS, dL; double dH, dS, dL;
RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL ); RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL );
dS = std::max( 0.0, std::min( 1.0, dVal ) ); dS = (std::max)( 0.0, (std::min)( 1.0, dVal ) );
HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB ); HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB );
...@@ -1912,7 +1912,7 @@ namespace OOX ...@@ -1912,7 +1912,7 @@ namespace OOX
double dH, dS, dL; double dH, dS, dL;
RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL ); RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL );
dS = std::max( 0.0, std::min( 1.0, dS * dVal ) ); dS = (std::max)( 0.0, (std::min)( 1.0, dS * dVal ) );
HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB ); HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB );
...@@ -1926,7 +1926,7 @@ namespace OOX ...@@ -1926,7 +1926,7 @@ namespace OOX
double dH, dS, dL; double dH, dS, dL;
RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL ); RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL );
dS = std::max( 0.0, std::min( 1.0, dS + dVal ) ); dS = (std::max)( 0.0, (std::min)( 1.0, dS + dVal ) );
HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB ); HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB );
...@@ -1962,8 +1962,8 @@ namespace OOX ...@@ -1962,8 +1962,8 @@ namespace OOX
private: private:
inline void RGB2HSL(unsigned char unR, unsigned char unG, unsigned char unB, double& dH, double& dS, double& dL) inline void RGB2HSL(unsigned char unR, unsigned char unG, unsigned char unB, double& dH, double& dS, double& dL)
{ {
int nmin = std::min( unR, std::min( unG, unB ) ); int nmin = (std::min)( unR, (std::min)( unG, unB ) );
int nmax = std::max( unR, std::max( unG, unB ) ); int nmax = (std::max)( unR, (std::max)( unG, unB ) );
int nDelta = nmax - nmin; int nDelta = nmax - nmin;
double dmax = ( nmax + nmin ) / 255.0; double dmax = ( nmax + nmin ) / 255.0;
double dDelta = nDelta / 255.0; double dDelta = nDelta / 255.0;
...@@ -2275,9 +2275,9 @@ namespace OOX ...@@ -2275,9 +2275,9 @@ namespace OOX
double dG = m_oG.GetValue() / 100.0; double dG = m_oG.GetValue() / 100.0;
double dB = m_oB.GetValue() / 100.0; double dB = m_oB.GetValue() / 100.0;
unsigned char unR = (unsigned char)std::min( 255.0, std::max( 0.0, 255 * dR ) ); unsigned char unR = (unsigned char)(std::min)( 255.0, (std::max)( 0.0, 255 * dR ) );
unsigned char unG = (unsigned char)std::min( 255.0, std::max( 0.0, 255 * dG ) ); unsigned char unG = (unsigned char)(std::min)( 255.0, (std::max)( 0.0, 255 * dG ) );
unsigned char unB = (unsigned char)std::min( 255.0, std::max( 0.0, 255 * dB ) ); unsigned char unB = (unsigned char)(std::min)( 255.0, (std::max)( 0.0, 255 * dB ) );
SetRGBA( unR, unG, unB ); SetRGBA( unR, unG, unB );
} }
......
Common/DocxFormat/Source/DocxFormat/IFileContainer.cpp
View file @ 118d6c0d
...@@ -272,7 +272,7 @@ namespace OOX ...@@ -272,7 +272,7 @@ namespace OOX
void IFileContainer::Add(const OOX::RId& rId, const smart_ptr<OOX::File>& pFile) void IFileContainer::Add(const OOX::RId& rId, const smart_ptr<OOX::File>& pFile)
{ {
m_lMaxRid = std::max( m_lMaxRid, rId.getNumber() ); m_lMaxRid = (std::max)( m_lMaxRid, rId.getNumber() );
m_mContainer [rId.get()] = pFile; m_mContainer [rId.get()] = pFile;
} }
smart_ptr<OOX::File> IFileContainer::Find(const FileType& oType) const smart_ptr<OOX::File> IFileContainer::Find(const FileType& oType) const
......
Common/DocxFormat/Source/XlsxFormat/IFileContainer_Spreadsheet.cpp
View file @ 118d6c0d
...@@ -271,7 +271,7 @@ namespace OOX ...@@ -271,7 +271,7 @@ namespace OOX
m_mapAddNamePair [pFile->type().OverrideType()] = nIndex; m_mapAddNamePair [pFile->type().OverrideType()] = nIndex;
} }
m_lMaxRid = std::max( m_lMaxRid, rId.getNumber() ); m_lMaxRid = (std::max)( m_lMaxRid, rId.getNumber() );
m_mContainer [rId.get()] = pFile; m_mContainer [rId.get()] = pFile;
} }
smart_ptr<OOX::File> IFileContainer::Find(const FileType& oType) const smart_ptr<OOX::File> IFileContainer::Find(const FileType& oType) const
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7