Skip to content

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

min->std::min 

max->std::max

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59184 954022d7-b5bf-4e40-9824-e11837661b57
parent c2a1ddeb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 375 additions and 374 deletions
ASCHTMLRenderer/CASCImage.cpp
View file @ fb822d16
......@@ -77,7 +77,8 @@ namespace NSGdiMeta
return bSuccess;
}
}
#else
#include <unistd.h>
#endif
namespace NSHtmlRenderer
......
ASCImageStudio3/ASCGraphics/Objects/Image/Wmf/RendererOutput.h
View file @ fb822d16
......@@ -1836,7 +1836,7 @@ private:
unsigned short ushColorTableLen = 256;
if ( 0 != unColorUsed )
ushColorTableLen = min( 256, unColorUsed );
ushColorTableLen = std::min( (unsigned short) 256, (unsigned short) unColorUsed );
TWmfRGB oColorTable[256];
......
ASCImageStudio3/ASCGraphics/Objects/Image/Wmf/WmfFile.h
View file @ fb822d16
......@@ -52,7 +52,7 @@ public:
WriteBegin("C:\\WmfTest.xml");
m_oStore.pAttrlist = NULL;
m_oStore.ulMax = 0;
m_oStore.ulMax = 0;
m_oStore.ulCount = 0;
m_oColorData.SetErrorHandler( &m_eError );
......@@ -273,7 +273,7 @@ public:
return;
}
pPlayer->nDCStackMaxLen = 0;
pPlayer->nDCStackMaxLen = 0;
pPlayer->ppDCStack = 0;
pPlayer->pObjects = NULL;
......@@ -310,8 +310,8 @@ public:
}
}
//pPlayer->pParameters = (unsigned char *)m_oMemoryManager.Malloc( (m_pFile->pHeader->unMaxRecordSize - 3) * 2 * sizeof(unsigned char) );
pPlayer->pParameters = (unsigned char *)m_oMemoryManager.Malloc( m_pFile->pHeader->unMaxRecordSize * 2 * sizeof(unsigned char), _T("Player->pParamters") );
//pPlayer->pParameters = (unsigned char *)m_oMemoryManager.Malloc( (m_pFile->pHeader->unMaxRecordSize - 3) * 2 * sizeof(unsigned char) );
pPlayer->pParameters = (unsigned char *)m_oMemoryManager.Malloc( m_pFile->pHeader->unMaxRecordSize * 2 * sizeof(unsigned char), _T("Player->pParamters") );
if ( NULL == pPlayer->pParameters )
{
......@@ -887,7 +887,7 @@ private:
// pList->ulOffset = 0;
// pList->ulCount = 0;
// pList->ulMax = 0;
// pList->ulmax = 0;
// pList->psAttrs = (char **)m_oMemoryManager.Malloc( 2 * (8 + 1) * sizeof (char *), _T("AttrNew function") );
// if ( NULL == pList->psAttrs )
......@@ -896,7 +896,7 @@ private:
// return;
// }
// pList->ulMax = 8;
// pList->ulmax = 8;
// pList->psAttrs[pList->ulCount] = 0;
//}
......@@ -934,7 +934,7 @@ private:
// pList->psAttrs = 0;
// }
//
// pList->ulMax = 0;
// pList->ulmax = 0;
//}
//const char *AttrAdd (TWmfAttributes *pList, const char *sName, const char *sValue)
......@@ -973,9 +973,9 @@ private:
// return NULL;
// }
// if ( pList->ulCount == pList->ulMax )
// if ( pList->ulCount == pList->ulmax )
// {
// char **psMore = (char **)m_oMemoryManager.Realloc( pList->psAttrs, 2 * (pList->ulMax + 8 + 1) * sizeof (char *) );
// char **psMore = (char **)m_oMemoryManager.Realloc( pList->psAttrs, 2 * (pList->ulmax + 8 + 1) * sizeof (char *) );
// if ( NULL == psMore )
// {
......@@ -984,7 +984,7 @@ private:
// }
// pList->psAttrs = psMore;
// pList->ulMax += 8;
// pList->ulmax += 8;
// }
// pList->psAttrs[pList->ulCount++] = sCopyName;
// pList->psAttrs[pList->ulCount++] = sCopyValue;
......@@ -1155,19 +1155,19 @@ private:
m_eError = wmf_error_NotEnoughMemory;
return;
}
pPlayer->nDCStackMaxLen = 8;
pPlayer->nDCStackMaxLen = 8;
}
if ( pPlayer->nDCStackLength == pPlayer->nDCStackMaxLen )
if ( pPlayer->nDCStackLength == pPlayer->nDCStackMaxLen )
{
TWmfDC **ppMore = (TWmfDC**)m_oMemoryManager.Realloc( pPlayer->ppDCStack, (pPlayer->nDCStackMaxLen + 8) * sizeof (TWmfDC*));
TWmfDC **ppMore = (TWmfDC**)m_oMemoryManager.Realloc( pPlayer->ppDCStack, (pPlayer->nDCStackMaxLen + 8) * sizeof (TWmfDC*));
if ( NULL == ppMore )
{
m_eError = wmf_error_NotEnoughMemory;
return;
}
pPlayer->ppDCStack = ppMore;
pPlayer->nDCStackMaxLen += 8;
pPlayer->nDCStackMaxLen += 8;
}
pPlayer->ppDCStack[pPlayer->nDCStackLength] = pDC;
......@@ -1199,7 +1199,7 @@ private:
m_oMemoryManager.Free( pPlayer->ppDCStack );
pPlayer->ppDCStack = NULL;
pPlayer->nDCStackMaxLen = 0;
pPlayer->nDCStackMaxLen = 0;
}
......@@ -1518,7 +1518,7 @@ private:
if ( 0 == ( pPlayer->ulFlags & PLAYER_PLAY ) )
{
m_oColorData.Add( &(oDrawPixel.oColor) );
float fScope = (float)max( oDrawPixel.dPixelWidth, oDrawPixel.dPixelHeight );
float fScope = (float)std::max( oDrawPixel.dPixelWidth, oDrawPixel.dPixelHeight );
CoordFRegister( oDrawPixel.oPoint, fScope );
return 0;
}
......@@ -1570,7 +1570,7 @@ private:
{
TWmfPen *pPen = pPlayer->pDC->pPen;
float fScope = (float)( max( pPen->dWidth, pPen->dHeight ) ) / 2;
float fScope = (float)( std::max( pPen->dWidth, pPen->dHeight ) ) / 2;
CoordFRegister( oDrawArc.oEnd, fScope );
CoordFRegister( oDrawArc.oStart, fScope );
......@@ -1802,7 +1802,7 @@ private:
{
TWmfPen *pPen = pPlayer->pDC->pPen;
float fScope = (float) ( max( pPen->dWidth, pPen->dHeight ) ) / 2;
float fScope = (float) ( std::max( pPen->dWidth, pPen->dHeight ) ) / 2;
CoordFRegister( oDrawArc.oTL, fScope );
CoordFRegister( oDrawArc.oBR, fScope );
......@@ -1836,7 +1836,7 @@ private:
{
TWmfPen *pPen = pPlayer->pDC->pPen;
float fScope = (float) ( max( pPen->dWidth, pPen->dHeight ) ) / 2;
float fScope = (float) ( std::max( pPen->dWidth, pPen->dHeight ) ) / 2;
CoordFRegister( oDrawLine.oFrom, fScope );
CoordFRegister( oDrawLine.oTo, fScope );
return 0;
......@@ -1863,7 +1863,7 @@ private:
{
TWmfPen *pPen = pPlayer->pDC->pPen;
float fScope = (float) ( max( pPen->dHeight, pPen->dWidth ) ) / 2;
float fScope = (float) ( std::max( pPen->dHeight, pPen->dWidth ) ) / 2;
ulParamIndex = 1;
for ( unsigned short ushPointIndex = 0; ushPointIndex < oPolyLine.ushCount; ushPointIndex++ )
......@@ -1924,7 +1924,7 @@ private:
{
TWmfPen *pPen = pPlayer->pDC->pPen;
float fScope = (float) ( max( pPen->dWidth, pPen->dHeight ) ) / 2;
float fScope = (float) ( std::max( pPen->dWidth, pPen->dHeight ) ) / 2;
ulParamIndex = 1;
for ( unsigned short ushPointIndex = 0; ushPointIndex < oPolyLine.ushCount; ushPointIndex++ )
......@@ -2048,7 +2048,7 @@ private:
{
TWmfPen *pPen = pPlayer->pDC->pPen;
float fScope = (float) ( max( pPen->dWidth, pPen->dHeight ) ) / 2;
float fScope = (float) ( std::max( pPen->dWidth, pPen->dHeight ) ) / 2;
ulParamIndex = 1 + oPolyPoly.ushPolyCount;
for ( unsigned short ushPointCount = 0; ushPointCount < ushNumPars; ushPointCount++ )
......@@ -2174,7 +2174,7 @@ private:
{
TWmfPen *pPen = pPlayer->pDC->pPen;
float fScope = (float) ( max ( pPen->dWidth, pPen->dHeight ) ) / 2;
float fScope = (float) ( std::max ( pPen->dWidth, pPen->dHeight ) ) / 2;
CoordFRegister( oDrawRect.oTL, fScope );
CoordFRegister( oDrawRect.oBR, fScope );
return 0;
......@@ -2216,7 +2216,7 @@ private:
{
TWmfPen *pPen = pPlayer->pDC->pPen;
float fScope = (float) ( max( pPen->dHeight, pPen->dWidth ) ) / 2;
float fScope = (float) ( std::max( pPen->dHeight, pPen->dWidth ) ) / 2;
CoordFRegister( oDrawRect.oTL, fScope );
CoordFRegister( oDrawRect.oBR, fScope );
......@@ -2310,7 +2310,7 @@ private:
TWmfRegion *pClip = (TWmfRegion*)pPlayer->pDC->pClip;
oPolyRect.unCount = max( pClip->unNumRects, pRegion->unNumRects + 1 );
oPolyRect.unCount = std::max( pClip->unNumRects, pRegion->unNumRects + 1 );
oPolyRect.pTL = (TWmfCoordF *)m_oMemoryManager.Malloc( oPolyRect.unCount * sizeof(TWmfCoordF), _T("Meta_RegionBrush") );
if ( NULL == oPolyRect.pTL )
......@@ -2440,7 +2440,7 @@ private:
TWmfRegion *pClip = (TWmfRegion*)pPlayer->pDC->pClip;
oPolyRect.unCount = max( pClip->unNumRects, pRegion->unNumRects + 1 );
oPolyRect.unCount = std::max( pClip->unNumRects, pRegion->unNumRects + 1 );
oPolyRect.pTL = (TWmfCoordF *)m_oMemoryManager.Malloc( oPolyRect.unCount * sizeof(TWmfCoordF), _T("Meta_RegionPaint") );
if ( NULL == oPolyRect.pTL )
......@@ -2560,10 +2560,10 @@ private:
TWmfRecord oEnd = Record_OffsetRecord( pRecord, 10 );
unsigned long ulMaxIndex = 10;
unsigned long ulmaxIndex = 10;
for ( unsigned short ushScanIndex = 0; ushScanIndex < ushScanCount; ushScanIndex++ )
{
ulMaxIndex++;
ulmaxIndex++;
TWmfRecord oStart = Record_OffsetRecord( &oEnd, 1 );
unsigned short ushCount = Record_GetUShortPar( &oStart, 0 );
......@@ -2578,7 +2578,7 @@ private:
}
unsigned ushPairCount = ushCount >> 1;
ulMaxIndex += ushCount + 3;
ulmaxIndex += ushCount + 3;
oEnd = Record_OffsetRecord( &oStart, (unsigned long)( ushCount + 3 ) );
......@@ -3501,8 +3501,8 @@ private:
TBBox oBox = m_pFontManager->MeasureString2();
fTempX = oBox.fMinX;
fTempY = oBox.fMinY;
fTempW = oBox.fMaxX - oBox.fMinX;
fTempH = oBox.fMaxX - oBox.fMinX;
fTempW = oBox.fMaxX - oBox.fMinX;
fTempH = oBox.fMaxX - oBox.fMinX;
#else
m_pFontManager->LoadFontByName( A2W(pPlayer->pDC->pFont->sFaceName), (float)(oDrawText.dFontHeight * 72 / 25.4), lStyle, 72.0f, 72.0f );
m_pFontManager->LoadStringW( A2W(oDrawText.sText), 0, 0 );
......@@ -3847,7 +3847,7 @@ private:
pPen->ushStyle = ( pPen->ushStyle & ~PS_TYPE_MASK ) | ( ushStyle & PS_TYPE_MASK );
unsigned short ushWidth = Record_GetUShortPar( pRecord, 1 );
ushWidth = max( 1, ushWidth );
ushWidth = std::max( (unsigned short) 1, ushWidth );
pPen->dWidth = (double) ushWidth * abs( pPlayer->pDC->dPixelWidth );
pPen->dHeight = (double) ushWidth * abs( pPlayer->pDC->dPixelHeight );
......@@ -4666,7 +4666,7 @@ private:
m_pFile->pHeader->ushVersion = ReadShort();
m_pFile->pHeader->unFileSize = ReadLong(NULL, NULL);
m_pFile->pHeader->ushNumberOfObjects = ReadShort();
m_pFile->pHeader->unMaxRecordSize = ReadLong(NULL, NULL);
m_pFile->pHeader->unMaxRecordSize = ReadLong(NULL, NULL);
m_pFile->pHeader->ushNumberOfMembers = ReadShort();
m_pFile->lPos = Tell();
......@@ -4751,8 +4751,8 @@ private:
break;
}
//if ( ( ulSize > m_pFile->pHeader->unMaxRecordSize ) || ( ulSize < 3 ) )
if ( ( (ulSize - 3) > m_pFile->pHeader->unMaxRecordSize ) || ( ulSize < 3 ) )
//if ( ( ulSize > m_pFile->pHeader->unMaxRecordSize ) || ( ulSize < 3 ) )
if ( ( (ulSize - 3) > m_pFile->pHeader->unMaxRecordSize ) || ( ulSize < 3 ) )
{
m_eError = wmf_error_BadFormat;
break;
......
ASCImageStudio3/ASCGraphics/Objects/Image/Wmf/WmfRegion.h
View file @ fb822d16
......@@ -185,10 +185,10 @@ static bool REGION_UnionRegion(TWmfRegion *pNewRegion, TWmfRegion *pRegionA, TWm
REGION_RegionOp( pNewRegion, pRegionA, pRegionB, REGION_UnionO, REGION_UnionNonO, REGION_UnionNonO);
pNewRegion->oExtents.oTL.fX = min( pRegionA->oExtents.oTL.fX, pRegionB->oExtents.oTL.fX );
pNewRegion->oExtents.oTL.fY = min( pRegionA->oExtents.oTL.fY, pRegionB->oExtents.oTL.fY );
pNewRegion->oExtents.oBR.fX = max( pRegionA->oExtents.oBR.fX, pRegionB->oExtents.oBR.fX );
pNewRegion->oExtents.oBR.fY = max( pRegionA->oExtents.oBR.fY, pRegionB->oExtents.oBR.fY );
pNewRegion->oExtents.oTL.fX = std::min( pRegionA->oExtents.oTL.fX, pRegionB->oExtents.oTL.fX );
pNewRegion->oExtents.oTL.fY = std::min( pRegionA->oExtents.oTL.fY, pRegionB->oExtents.oTL.fY );
pNewRegion->oExtents.oBR.fX = std::max( pRegionA->oExtents.oBR.fX, pRegionB->oExtents.oBR.fX );
pNewRegion->oExtents.oBR.fY = std::max( pRegionA->oExtents.oBR.fY, pRegionB->oExtents.oBR.fY );
pNewRegion->ushType = ( pNewRegion->unNumRects ? COMPLEXREGION : NULLREGION );
......@@ -267,7 +267,7 @@ static void REGION_RegionOp (TWmfRegion *pNewRegion, TWmfRegion *pRegionA, TWm
* have to worry about using too much memory. I hope to be able to
* nuke the Xrealloc() at the end of this function eventually.
*/
pNewRegion->unSize = max( pRegionA->unNumRects, pRegionB->unNumRects ) * 2;
pNewRegion->unSize = std::max( pRegionA->unNumRects, pRegionB->unNumRects ) * 2;
if ( NULL == ( pNewRegion->pRects = (TWmfRectF *)malloc( sizeof(TWmfRectF) * pNewRegion->unSize ) ) )
{
......@@ -336,8 +336,8 @@ static void REGION_RegionOp (TWmfRegion *pNewRegion, TWmfRegion *pRegionA, TWm
*/
if ( r1->oTL.fY < r2->oTL.fY )
{
top = max( r1->oTL.fY, ybot );
bot = min( r1->oBR.fY, r2->oTL.fY );
top = std::max( r1->oTL.fY, ybot );
bot = std::min( r1->oBR.fY, r2->oTL.fY );
if ( ( top != bot ) && ( pNonOverlap1Func ) )
{
......@@ -348,8 +348,8 @@ static void REGION_RegionOp (TWmfRegion *pNewRegion, TWmfRegion *pRegionA, TWm
}
else if ( r2->oTL.fY < r1->oTL.fY )
{
top = max( r2->oTL.fY, ybot );
bot = min( r2->oBR.fY, r1->oTL.fY );
top = std::max( r2->oTL.fY, ybot );
bot = std::min( r2->oBR.fY, r1->oTL.fY );
if ( ( top != bot ) && ( pNonOverlap2Func ) )
{
......@@ -376,7 +376,7 @@ static void REGION_RegionOp (TWmfRegion *pNewRegion, TWmfRegion *pRegionA, TWm
/* Now see if we've hit an intersecting band. The two bands only
* intersect if ybot > ytop
*/
ybot = min( r1->oBR.fY, r2->oBR.fY );
ybot = std::min( r1->oBR.fY, r2->oBR.fY );
curBand = pNewRegion->unNumRects;
if ( ( ybot > ytop ) && ( pOverlapFunc ) )
{
......@@ -411,7 +411,7 @@ static void REGION_RegionOp (TWmfRegion *pNewRegion, TWmfRegion *pRegionA, TWm
while ( ( r1BandEnd < r1End ) && ( r1BandEnd->oTL.fY == r1->oTL.fY ) )
r1BandEnd++;
(*pNonOverlap1Func)( pNewRegion, r1, r1BandEnd, max( r1->oTL.fY, ybot ), r1->oBR.fY );
(*pNonOverlap1Func)( pNewRegion, r1, r1BandEnd, std::max( r1->oTL.fY, ybot ), r1->oBR.fY );
r1 = r1BandEnd;
} while ( r1 != r1End );
......@@ -425,7 +425,7 @@ static void REGION_RegionOp (TWmfRegion *pNewRegion, TWmfRegion *pRegionA, TWm
while ( ( r2BandEnd < r2End ) && ( r2BandEnd->oTL.fY == r2->oTL.fY ) )
r2BandEnd++;
(*pNonOverlap2Func)( pNewRegion, r2, r2BandEnd, max( r2->oTL.fY, ybot ), r2->oBR.fY );
(*pNonOverlap2Func)( pNewRegion, r2, r2BandEnd, std::max( r2->oTL.fY, ybot ), r2->oBR.fY );
r2 = r2BandEnd;
} while ( r2 != r2End );
......@@ -840,8 +840,8 @@ static bool REGION_IntersectO (TWmfRegion *pRegion, TWmfRectF *pRect1, TWmfRectF
while ( ( pRect1 != pRect1End ) && ( pRect2 != pRect2End ) )
{
float fLeft = max( pRect1->oTL.fX, pRect2->oTL.fX );
float fRight = min( pRect1->oBR.fX, pRect2->oBR.fX );
float fLeft = std::max( pRect1->oTL.fX, pRect2->oTL.fX );
float fRight = std::min( pRect1->oBR.fX, pRect2->oBR.fX );
/* If there's any overlap between the two rectangles, add that
* overlap to the new region.
......
ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro.user
View file @ fb822d16
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.1.1, 2014-10-22T20:20:07. -->
<!-- Written by QtCreator 3.1.1, 2014-10-24T12:39:44. -->
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
......@@ -57,7 +57,7 @@
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.3.0 GCC 32bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.3.0 GCC 32bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.53.gcc_kit</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
......
ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/PPTXShape/Formula.h
View file @ fb822d16
......@@ -340,14 +340,14 @@ namespace NSGuidesOOXML
{
//for(long i = 0; i < Adjustments.size(); i++)
// Adjustments[i] = NonDefResult;
for(long i = 0; i < Guides->size(); i++)
for(size_t i = 0; i < Guides->size(); i++)
(*Guides)[i] = dNonDefResult;
}
void ReCalculateGuides()
{
Clear();
for(long i = 0; i < strGuides.size(); i++)
for(size_t i = 0; i < strGuides.size(); i++)
(*Guides)[i] = strGuides[i].Calculate(this);
}
};
......
Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro.user
View file @ fb822d16
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.1.1, 2014-10-22T20:20:07. -->
<!-- Written by QtCreator 3.1.1, 2014-10-24T12:39:44. -->
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
......
DesktopEditor/raster/ImageFileFormatChecker.h
View file @ fb822d16
......@@ -79,4 +79,4 @@ private:
bool isPgxFile(BYTE* pBuffer,DWORD dwBytes);
};
#endif _BUILD_IMAGE_FILE_CHECKER_
\ No newline at end of file
#endif //_BUILD_IMAGE_FILE_CHECKER_
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