OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fixed compile errors.

Browse source
This commit is contained in:
Christoph Oelckers 2016-01-09 11:44:05 +01:00
commit 4b3adf548a
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/GuillotineBinPack.cpp
View file

@ -7,7 +7,7 @@
*/
#include <cassert>
#include "templates.h"
#include "GuillotineBinPack.h"
using namespace std;
@ -395,7 +395,7 @@ int GuillotineBinPack::ScoreBestShortSideFit(int width, int height, const Rect &
{
int leftoverHoriz = abs(freeRect.width - width);
int leftoverVert = abs(freeRect.height - height);
int leftover = min(leftoverHoriz, leftoverVert);
int leftover = MIN(leftoverHoriz, leftoverVert);
return leftover;
}
@ -403,7 +403,7 @@ int GuillotineBinPack::ScoreBestLongSideFit(int width, int height, const Rect &f
{
int leftoverHoriz = abs(freeRect.width - width);
int leftoverVert = abs(freeRect.height - height);
int leftover = max(leftoverHoriz, leftoverVert);
int leftover = MAX(leftoverHoriz, leftoverVert);
return leftover;
}