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

Fix bug reported by Noel Llopis.

Browse Source 
Make sure FreeImage declarations are not used when FreeImage is not available.
This commit is contained in:
castano
2008-05-19 18:23:42 +00:00
parent c01566cd2f
commit fb2b0cb38c
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvimage/FloatImage.cpp
View File

@ -423,7 +423,7 @@ FloatImage * FloatImage::fastDownSample() const
{ {
const uint n = w * h; const uint n = w * h;
if (n & 1) if ((m_width * m_height) & 1)
{ {
const float scale = 1.0f / (2 * n + 1); const float scale = 1.0f / (2 * n + 1);

3
src/nvimage/ImageIO.cpp
View File

@ -62,9 +62,10 @@ namespace {
} // namespace } // namespace
#if defined(HAVE_FREEIMAGE)
static Image * loadFreeImage(FREE_IMAGE_FORMAT fif, Stream & s); static Image * loadFreeImage(FREE_IMAGE_FORMAT fif, Stream & s);
static FloatImage * loadFloatFreeImage(FREE_IMAGE_FORMAT fif, Stream & s); static FloatImage * loadFloatFreeImage(FREE_IMAGE_FORMAT fif, Stream & s);
#endif
Image * nv::ImageIO::load(const char * fileName) Image * nv::ImageIO::load(const char * fileName)
{ {