diff --git a/project/vc8/nvcore/nvcore.vcproj b/project/vc8/nvcore/nvcore.vcproj
index 33bb42c..df317bf 100644
--- a/project/vc8/nvcore/nvcore.vcproj
+++ b/project/vc8/nvcore/nvcore.vcproj
@@ -297,10 +297,6 @@
RelativePath="..\..\..\src\nvcore\TextWriter.cpp"
>
-
-
@@ -741,7 +745,7 @@
>
@@ -861,6 +865,10 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
+
+
@@ -873,10 +881,6 @@
RelativePath="..\..\..\src\nvtt\CompressRGB.h"
>
-
-
diff --git a/src/nvcore/Tokenizer.cpp b/src/nvcore/Tokenizer.cpp
index 077a9d7..b67e00f 100644
--- a/src/nvcore/Tokenizer.cpp
+++ b/src/nvcore/Tokenizer.cpp
@@ -8,6 +8,7 @@
#include // atof, atoi
#if NV_CC_MSVC
+#if 0 // This doesn't work on MSVC for x64
/* vsscanf for Win32
* Written 5/2003 by
* 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;
diff --git a/src/nvimage/ImageIO.cpp b/src/nvimage/ImageIO.cpp
index 545076c..0b24600 100644
--- a/src/nvimage/ImageIO.cpp
+++ b/src/nvimage/ImageIO.cpp
@@ -4,7 +4,7 @@
#include
#include
#include
-#include
+//#include // @@ Disable temporarily
#include
#include
@@ -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
diff --git a/src/nvimage/ImageIO.h b/src/nvimage/ImageIO.h
index 014d292..0902a5d 100644
--- a/src/nvimage/ImageIO.h
+++ b/src/nvimage/ImageIO.h
@@ -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