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

Enable stb libraries for image loading. This was disabled by error.

Browse Source
This commit is contained in:
Ignacio
2018-10-09 18:01:15 -07:00
parent 5c70ffef0b
commit 95f1f60490
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
project/vc12/nvconfig.h
View File

@ -2,21 +2,21 @@
#define NV_CONFIG #define NV_CONFIG
//#cmakedefine HAVE_UNISTD_H //#cmakedefine HAVE_UNISTD_H
#define HAVE_STDARG_H //#define HAVE_STDARG_H
//#cmakedefine HAVE_SIGNAL_H //#cmakedefine HAVE_SIGNAL_H
//#cmakedefine HAVE_EXECINFO_H //#cmakedefine HAVE_EXECINFO_H
#define HAVE_MALLOC_H //#define HAVE_MALLOC_H
#if defined(_OPENMP) #if defined(_OPENMP)
#define HAVE_OPENMP #define HAVE_OPENMP
#endif #endif
#define HAVE_STBIMAGE #define NV_HAVE_STBIMAGE
/*#if !defined(_M_X64) /*#if !defined(_M_X64)
//#define HAVE_FREEIMAGE //#define NV_HAVE_FREEIMAGE
#define HAVE_PNG #define NV_HAVE_PNG
#define HAVE_JPEG #define NV_HAVE_JPEG
#define HAVE_TIFF #define NV_HAVE_TIFF
#endif*/ #endif*/
#endif // NV_CONFIG #endif // NV_CONFIG

2
src/nvtt/Surface.cpp
View File

@ -634,7 +634,7 @@ bool Surface::load(const char * fileName, bool * hasAlpha/*= NULL*/)
} }
// @@ Have loadFloat allocate the image with the desired number of channels. // @@ 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; delete m->image;
m->image = img.release(); m->image = img.release();