diff options
Diffstat (limited to 'DevIL/src-IL')
| -rw-r--r-- | DevIL/src-IL/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | DevIL/src-IL/src/il_tiff.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt index df863c03..ac710905 100644 --- a/DevIL/src-IL/CMakeLists.txt +++ b/DevIL/src-IL/CMakeLists.txt @@ -80,7 +80,7 @@ find_package(NVTT) # NVidia texture tools find_package(OpenEXR) #find_package(LCMS) find_package(LCMS2) - +find_package(MNG) # TODO: check for libmng, others? # TODO: WDP requires Microsoft HD Photo Device Porting Kit 1.0 @@ -195,7 +195,7 @@ if(NOT IL_NO_JP2) endif(NOT IL_NO_JP2) if(NOT IL_NO_MNG) - list(APPEND incs ${MNG_INCLUDE_DIRS} ) + list(APPEND incs ${MNG_INCLUDE_DIR} ) list(APPEND libs ${MNG_LIBRARIES} ) endif(NOT IL_NO_MNG) diff --git a/DevIL/src-IL/src/il_tiff.cpp b/DevIL/src-IL/src/il_tiff.cpp index df516d99..4d9d117b 100644 --- a/DevIL/src-IL/src/il_tiff.cpp +++ b/DevIL/src-IL/src/il_tiff.cpp @@ -325,7 +325,7 @@ ILboolean iLoadTiffInternal() TIFFGetFieldDefaulted(tif, TIFFTAG_EXTRASAMPLES, &extrasamples, &sampleinfo); TIFFGetFieldDefaulted(tif, TIFFTAG_ORIENTATION, &orientation); - linesize = TIFFScanlineSize(tif); + linesize = (uint32)TIFFScanlineSize(tif); //added 2003-08-31 //1 bpp tiffs are not neccessarily greyscale, they can @@ -727,7 +727,7 @@ static tsize_t _tiffFileReadProc(thandle_t fd, tdata_t pData, tsize_t tSize) { fd; - return iread(pData, 1, tSize); + return iread(pData, 1, (ILuint)tSize); } /*----------------------------------------------------------------------------*/ @@ -749,7 +749,7 @@ static tsize_t _tiffFileWriteProc(thandle_t fd, tdata_t pData, tsize_t tSize) { fd; - return iwrite(pData, 1, tSize); + return iwrite(pData, 1, (ILuint)tSize); } /*----------------------------------------------------------------------------*/ |