libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-11 19:54:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRAPHICS: Fix clash with Amiga #define

Browse Source
This commit is contained in:
Eugene Sandulenko 2020-04-29 00:01:30 +02:00
parent 1c4b895b54
commit a7f73321d5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/fonts/macfont.cpp
View File

@ -611,7 +611,7 @@ MacFONTFont *MacFONTFont::scaleFont(const MacFONTFont *src, int newSize, bool bo
return new MacFONTFont(data); return new MacFONTFont(data);
} }
#define howmany(x, y) (((x)+((y)-1))/(y)) #define wholedivide(x, y) (((x)+((y)-1))/(y))
static void countupScore(int *dstGray, int x, int y, int bbw, int bbh, float scale) { static void countupScore(int *dstGray, int x, int y, int bbw, int bbh, float scale) {
int newbbw = bbw * scale; int newbbw = bbw * scale;
@ -623,8 +623,8 @@ static void countupScore(int *dstGray, int x, int y, int bbw, int bbh, float sca
int newxbegin = x_ / bbw; int newxbegin = x_ / bbw;
int newybegin = y_ / bbh; int newybegin = y_ / bbh;
int newxend = howmany(x1, bbw); int newxend = wholedivide(x1, bbw);
int newyend = howmany(y1, bbh); int newyend = wholedivide(y1, bbh);
for (int newy = newybegin; newy < newyend; newy++) { for (int newy = newybegin; newy < newyend; newy++) {
for (int newx = newxbegin; newx < newxend; newx++) { for (int newx = newxbegin; newx < newxend; newx++) {