diff options
| author | Martijn Kaijser <machine.sanctum@gmail.com> | 2015-02-12 06:42:20 +0100 |
|---|---|---|
| committer | Martijn Kaijser <machine.sanctum@gmail.com> | 2015-02-12 06:42:20 +0100 |
| commit | c096e7eed321a0c90073d73d35cec463cefc5a0e (patch) | |
| tree | ad255d7a7a9236c8b6d70e6b4d160b9c04ae3a8b /lib | |
| parent | fd81a3e29b7f80cabf8f333c3bb867dc80c67d4b (diff) | |
| parent | 57b32cebc1d9af03f06c3c1b29a7c1aeb838b5cc (diff) | |
Merge pull request #6412 from Memphiz/c++11
Move to C++11; use as much std:: instead of boost:: as possible
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 }; |