|
Lines 59-64
Link Here
|
| 59 |
* |
59 |
* |
| 60 |
************************************************************************/ |
60 |
************************************************************************/ |
| 61 |
|
61 |
|
|
|
62 |
#include <algorithm> |
| 62 |
#include <salunx.h> |
63 |
#include <salunx.h> |
| 63 |
|
64 |
|
| 64 |
#ifndef EXTENDED_FONTSTRUCT_HXX |
65 |
#ifndef EXTENDED_FONTSTRUCT_HXX |
|
Lines 382-390
Link Here
|
| 382 |
|
383 |
|
| 383 |
int nIdx = nFrom; |
384 |
int nIdx = nFrom; |
| 384 |
|
385 |
|
| 385 |
for ( ; nIdx < min(nTo, nMinChar); nIdx++, pWidthArray++ ) |
386 |
for ( ; nIdx < std::min((int)nTo, (int)nMinChar); nIdx++, pWidthArray++ ) |
| 386 |
*pWidthArray = mnDefaultWidth; |
387 |
*pWidthArray = mnDefaultWidth; |
| 387 |
for ( ; nIdx <= min(nTo, nMaxChar); nIdx++, pWidthArray++ ) |
388 |
for ( ; nIdx <= std::min((int)nTo, (int)nMaxChar); nIdx++, pWidthArray++ ) |
| 388 |
{ |
389 |
{ |
| 389 |
XCharStruct* pChar = &(pXFontStruct->per_char[nIdx - nMinChar]); |
390 |
XCharStruct* pChar = &(pXFontStruct->per_char[nIdx - nMinChar]); |
| 390 |
*pWidthArray = CharExists(pChar) ? pChar->width : mnDefaultWidth; |
391 |
*pWidthArray = CharExists(pChar) ? pChar->width : mnDefaultWidth; |