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

Add support for win64.

Browse Source 
Disable PFM.
Disable Tokenizer.
This commit is contained in:
castano
2008-01-16 08:01:24 +00:00
parent 30f8ef09b5
commit 3e702e563b
5 changed files with 35 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvcore/Tokenizer.cpp
View File

@ -8,6 +8,7 @@
#include <stdlib.h> // atof, atoi
#if NV_CC_MSVC
#if 0 // This doesn't work on MSVC for x64
/* vsscanf for Win32
* Written 5/2003 by <mgix@mgix.com>
* This code is in the Public Domain
@ -55,24 +56,7 @@ static int vsscanf(const char * buffer, const char * format, va_list argPtr)
}
return result;
}
/*
int hacky_vsscanf(const char *str, int count, const char *format, va_list ap) {
nvCheck(count < 8)
if (count == 0) {
}
void * arg0 = va_arg(ap, void *);
void * arg1 = va_arg(ap, void *);
void * arg2 = va_arg(ap, void *);
void * arg3 = va_arg(ap, void *);
void * arg4 = va_arg(ap, void *);
void * arg5 = va_arg(ap, void *);
void * arg6 = va_arg(ap, void *);
void * arg7 = va_arg(ap, void *);
return sscanf(str, format, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
}
*/
#endif
#endif
using namespace nv;

8
src/nvimage/ImageIO.cpp
View File

@ -4,7 +4,7 @@
#include <nvcore/Containers.h>
#include <nvcore/StrLib.h>
#include <nvcore/StdStream.h>
#include <nvcore/Tokenizer.h>
//#include <nvcore/Tokenizer.h> // @@ Disable temporarily
#include <nvcore/TextWriter.h>
#include <nvmath/Color.h>
@ -158,9 +158,11 @@ FloatImage * nv::ImageIO::loadFloat(const char * fileName, Stream & s)
}
#endif
/* // @@ Disable temporarily
if (strCaseCmp(extension, ".pfm") == 0) {
return loadFloatPFM(fileName, s);
}
*/
return NULL;
}
@ -184,10 +186,12 @@ bool nv::ImageIO::saveFloat(const char * fileName, const FloatImage * fimage, ui
}
#endif
/* // @@ Disable Temporarily
if (strCaseCmp(extension, ".pfm") == 0)
{
// return ImageIO::saveFloatPFM(fileName, fimage, base_component, num_components);
}
*/
if (num_components == 3 || num_components == 4)
{
@ -1176,6 +1180,7 @@ bool nv::ImageIO::saveFloatEXR(const char * fileName, const FloatImage * fimage,
#endif // defined(HAVE_OPENEXR)
#if 0 // @@ Disable temporarily.
FloatImage * nv::ImageIO::loadFloatPFM(const char * fileName, Stream & s)
{
@ -1293,6 +1298,7 @@ bool nv::ImageIO::saveFloatPFM(const char * fileName, const FloatImage * fimage,
return true;
}
#endif
#if 0

4
src/nvimage/ImageIO.h
View File

@ -48,8 +48,8 @@ namespace nv
NVIMAGE_API bool saveFloatEXR(const char * fileName, const FloatImage * fimage, uint base_component, uint num_components);
#endif
NVIMAGE_API FloatImage * loadFloatPFM(const char * fileName, Stream & s);
NVIMAGE_API bool saveFloatPFM(const char * fileName, const FloatImage * fimage, uint base_component, uint num_components);
// NVIMAGE_API FloatImage * loadFloatPFM(const char * fileName, Stream & s);
// NVIMAGE_API bool saveFloatPFM(const char * fileName, const FloatImage * fimage, uint base_component, uint num_components);
} // ImageIO namespace