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

Fix error in input image transformation.

Browse Source
This commit is contained in:
castano
2008-07-29 05:45:35 +00:00
parent 79529f994f
commit 86ef67bbfa
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/nvtt/Compressor.cpp
View File

@ -176,8 +176,9 @@ namespace nvtt
return m_floatImage.ptr(); return m_floatImage.ptr();
} }
FloatImage * asFloatImage() FloatImage * asMutableFloatImage()
{ {
m_inputImage = NULL;
return m_floatImage.ptr(); return m_floatImage.ptr();
} }
@ -655,7 +656,7 @@ void Compressor::Private::downsampleMipmap(Mipmap & mipmap, const InputOptions::
// Normalize mipmap. // Normalize mipmap.
if ((inputOptions.isNormalMap || inputOptions.convertToNormalMap) && inputOptions.normalizeMipmaps) if ((inputOptions.isNormalMap || inputOptions.convertToNormalMap) && inputOptions.normalizeMipmaps)
{ {
normalizeNormalMap(mipmap.asFloatImage()); normalizeNormalMap(mipmap.asMutableFloatImage());
} }
} }
@ -719,8 +720,8 @@ void Compressor::Private::processInputImage(Mipmap & mipmap, const InputOptions:
} }
else else
{ {
normalizeNormalMap(mipmap.asFloatImage()); normalizeNormalMap(mipmap.asMutableFloatImage());
mipmap.setImage(mipmap.asFloatImage()); mipmap.setImage(mipmap.asMutableFloatImage());
} }
} }
} }
@ -736,7 +737,7 @@ void Compressor::Private::processInputImage(Mipmap & mipmap, const InputOptions:
// Apply linear transforms in linear space. // Apply linear transforms in linear space.
if (inputOptions.colorTransform == ColorTransform_Linear) if (inputOptions.colorTransform == ColorTransform_Linear)
{ {
FloatImage * image = mipmap.asFloatImage(); FloatImage * image = mipmap.asMutableFloatImage();
nvDebugCheck(image != NULL); nvDebugCheck(image != NULL);
Vector4 offset( Vector4 offset(
@ -749,7 +750,7 @@ void Compressor::Private::processInputImage(Mipmap & mipmap, const InputOptions:
} }
else if (inputOptions.colorTransform == ColorTransform_Swizzle) else if (inputOptions.colorTransform == ColorTransform_Swizzle)
{ {
FloatImage * image = mipmap.asFloatImage(); FloatImage * image = mipmap.asMutableFloatImage();
nvDebugCheck(image != NULL); nvDebugCheck(image != NULL);
image->swizzle(0, inputOptions.swizzleTransform[0], inputOptions.swizzleTransform[1], inputOptions.swizzleTransform[2], inputOptions.swizzleTransform[3]); image->swizzle(0, inputOptions.swizzleTransform[0], inputOptions.swizzleTransform[1], inputOptions.swizzleTransform[2], inputOptions.swizzleTransform[3]);