diff --git a/project/vc12/nvconfig.h b/project/vc12/nvconfig.h index 863a1d3..18c31fa 100644 --- a/project/vc12/nvconfig.h +++ b/project/vc12/nvconfig.h @@ -2,21 +2,21 @@ #define NV_CONFIG //#cmakedefine HAVE_UNISTD_H -#define HAVE_STDARG_H +//#define HAVE_STDARG_H //#cmakedefine HAVE_SIGNAL_H //#cmakedefine HAVE_EXECINFO_H -#define HAVE_MALLOC_H +//#define HAVE_MALLOC_H #if defined(_OPENMP) #define HAVE_OPENMP #endif -#define HAVE_STBIMAGE +#define NV_HAVE_STBIMAGE /*#if !defined(_M_X64) -//#define HAVE_FREEIMAGE -#define HAVE_PNG -#define HAVE_JPEG -#define HAVE_TIFF +//#define NV_HAVE_FREEIMAGE +#define NV_HAVE_PNG +#define NV_HAVE_JPEG +#define NV_HAVE_TIFF #endif*/ #endif // NV_CONFIG diff --git a/src/nvtt/Surface.cpp b/src/nvtt/Surface.cpp index 41421ca..eac61ba 100644 --- a/src/nvtt/Surface.cpp +++ b/src/nvtt/Surface.cpp @@ -634,7 +634,7 @@ bool Surface::load(const char * fileName, bool * hasAlpha/*= NULL*/) } // @@ Have loadFloat allocate the image with the desired number of channels. - //img->resizeChannelCount(4); + img->resizeChannelCount(4); // Block compressors expect a 4 channel texture. delete m->image; m->image = img.release();