diff options
| author | Memphiz <memphis@machzwo.de> | 2014-12-31 18:59:17 +0100 |
|---|---|---|
| committer | Chris "koying" Browet <cbro@semperpax.com> | 2015-02-10 14:54:46 +0100 |
| commit | f8c9cfa756f1e4a3fc0baf5eba1c8cce3e344b7f (patch) | |
| tree | 20037d6eab801960619c055afe149a2faa86e0ac /lib | |
| parent | 8999ff7af8d7d8e9f225c70a811407b729460557 (diff) | |
[xcode/c++11] - add explicit casts where narrowing fails in c++11
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cximage-6.0/CxImage/ximadsp.cpp | 2 | ||||
| -rw-r--r-- | lib/cximage-6.0/CxImage/ximaico.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/cximage-6.0/CxImage/ximadsp.cpp b/lib/cximage-6.0/CxImage/ximadsp.cpp index a21c0661a3..fd13446b0e 100644 --- a/lib/cximage-6.0/CxImage/ximadsp.cpp +++ b/lib/cximage-6.0/CxImage/ximadsp.cpp @@ -3531,7 +3531,7 @@ bool CxImage::FloodFill(const long xStart, const long yStart, const RGBQUAD cFil //------------------------------------- Begin of Flood Fill POINT offset[4] = {{-1,0},{0,-1},{1,0},{0,1}}; std::queue<POINT> q; - POINT point = {xStart,yStart}; + POINT point = {(int)xStart,(int)yStart}; q.push(point); if (IsIndexed()){ //--- Generic indexed image, no tolerance OR Grayscale image with tolerance diff --git a/lib/cximage-6.0/CxImage/ximaico.cpp b/lib/cximage-6.0/CxImage/ximaico.cpp index 1d0c697c6c..752d40c9e6 100644 --- a/lib/cximage-6.0/CxImage/ximaico.cpp +++ b/lib/cximage-6.0/CxImage/ximaico.cpp @@ -322,7 +322,7 @@ bool CxImageICO::Encode(CxFile * hFile, bool bAppend, int nPageCount) int nPages = nPageCount; if (nPages<1) nPages = 1; - ICONHEADER icon_header={0,1,nPages}; + ICONHEADER icon_header={0,1,(WORD)nPages}; if (!bAppend) m_dwImageOffset = sizeof(ICONHEADER) + nPages * sizeof(ICONDIRENTRY); @@ -345,7 +345,7 @@ bool CxImageICO::Encode(CxFile * hFile, bool bAppend, int nPageCount) 2*head.biHeight, 1, (WORD)bitcount, - 0, imagesize, + 0, (DWORD)imagesize, 0, 0, 0, 0 }; |