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

Merge changes from p4.

Browse Source
This commit is contained in:
castano 2009-02-03 08:22:35 +00:00
parent 8fa870bf0c
commit 36dd7fb76b
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/nvimage/ImageIO.cpp
View File

@ -106,7 +106,7 @@ Image * nv::ImageIO::load(const char * fileName, Stream & s)
return loadPNG(s); return loadPNG(s);
} }
#endif #endif
if (strCaseCmp(extension, ".psd") == 0) { if (strCaseCmp(extension, ".psd") == 0) {
return loadPSD(s); return loadPSD(s);
} }
@ -212,18 +212,28 @@ bool nv::ImageIO::saveFloat(const char * fileName, const FloatImage * fimage, ui
} }
#endif #endif
/* // @@ Disable Temporarily // @@ Disable Temporarily
if (strCaseCmp(extension, ".pfm") == 0) if (strCaseCmp(extension, ".pfm") == 0)
{ {
// return ImageIO::saveFloatPFM(fileName, fimage, base_component, num_components); // return ImageIO::saveFloatPFM(fileName, fimage, base_component, num_components);
} }
*/
if (num_components == 3 || num_components == 4) //if (num_components == 3 || num_components == 4)
if (num_components <= 4)
{ {
AutoPtr<Image> image(fimage->createImage(base_component, num_components)); AutoPtr<Image> image(fimage->createImage(base_component, num_components));
nvCheck(image != NULL); nvCheck(image != NULL);
if (num_components == 1)
{
Color32 * c = image->pixels();
const uint count = image->width() * image->height();
for (uint i = 0; i < count; i++)
{
c[i].b = c[i].g = c[i].r;
}
}
if (num_components == 4) if (num_components == 4)
{ {
image->setFormat(Image::Format_ARGB); image->setFormat(Image::Format_ARGB);