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

Hide file format especific savers. Add generic image saver.

Browse Source 
Misc fixes under OSX.
This commit is contained in:
castano
2009-03-15 10:18:54 +00:00
parent 36850f6241
commit 50b8b67185
10 changed files with 418 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvtt/tools/decompress.cpp
View File

@ -179,16 +179,7 @@ int main(int argc, char *argv[])
return 1;
}
#ifdef HAVE_PNG
if (savePNG)
{
nv::ImageIO::savePNG(stream, &mipmap);
}
else
#endif
{
nv::ImageIO::saveTGA(stream, &mipmap);
}
nv::ImageIO::save(name, stream, &mipmap);
}
}

2
src/nvtt/tools/resize.cpp
View File

@ -176,7 +176,7 @@ int main(int argc, char *argv[])
result->setFormat(nv::Image::Format_ARGB);
nv::StdOutputStream stream(output);
nv::ImageIO::saveTGA(stream, result.ptr()); // @@ Add generic save function. Add support for png too.
nv::ImageIO::save(output, stream, result.ptr());
return 0;
}

10
src/nvtt/tools/thumbnailer.cpp
View File

@ -119,9 +119,9 @@ int main(int argc, char *argv[])
nv::Image image;
if (!loadImage(image, input)) return 1;
nv::ImageIO::PngCommentsMap pngComments;
pngComments.add("Thumb::Image::Width", nv::StringBuilder().number (image.width()));
pngComments.add("Thumb::Image::Height", nv::StringBuilder().number (image.height()));
nv::ImageIO::ImageMetaData metaData;
metaData.tagMap.add("Thumb::Image::Width", nv::StringBuilder().number (image.width()));
metaData.tagMap.add("Thumb::Image::Height", nv::StringBuilder().number (image.height()));
if ((image.width() > size) || (image.height() > size))
{
@ -145,12 +145,12 @@ int main(int argc, char *argv[])
result->setFormat(nv::Image::Format_ARGB);
nv::StdOutputStream stream(output);
nv::ImageIO::savePNG(stream, result.ptr(), pngComments);
nv::ImageIO::save(output, stream, result.ptr(), &metaData);
}
else
{
nv::StdOutputStream stream(output);
nv::ImageIO::savePNG(stream, &image, pngComments);
nv::ImageIO::save(output, stream, &image, &metaData);
}
return 0;