drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix win32 buid errors and warnings due to FreeImage.

Browse Source
This commit is contained in:
castano 2008-05-22 21:31:15 +00:00
parent 7d3d0ede9d
commit c38c3dc584
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvimage/ImageIO.cpp
View File

@ -626,14 +626,14 @@ Image * nv::ImageIO::loadPSD(Stream & s)
#if defined(HAVE_FREEIMAGE) #if defined(HAVE_FREEIMAGE)
unsigned ReadProc(void *buffer, unsigned size, unsigned count, fi_handle handle) unsigned DLL_CALLCONV ReadProc(void *buffer, unsigned size, unsigned count, fi_handle handle)
{ {
Stream * s = (Stream *) handle; Stream * s = (Stream *) handle;
s->serialize(buffer, size * count); s->serialize(buffer, size * count);
return count; return count;
} }
int SeekProc(fi_handle handle, long offset, int origin) int DLL_CALLCONV SeekProc(fi_handle handle, long offset, int origin)
{ {
Stream * s = (Stream *) handle; Stream * s = (Stream *) handle;
@ -651,7 +651,7 @@ int SeekProc(fi_handle handle, long offset, int origin)
return 0; return 0;
} }
long TellProc(fi_handle handle) long DLL_CALLCONV TellProc(fi_handle handle)
{ {
Stream * s = (Stream *) handle; Stream * s = (Stream *) handle;
return s->tell(); return s->tell();
@ -765,8 +765,8 @@ FloatImage * loadFloatFreeImage(FREE_IMAGE_FORMAT fif, Stream & s)
for (int x=0; x < w; x++) for (int x=0; x < w; x++)
{ {
dst_real[x] = src[x].r; dst_real[x] = (float)src[x].r;
dst_imag[x] = src[x].i; dst_imag[x] = (float)src[x].i;
} }
} }
break; break;