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

Fix errors.

Browse Source
This commit is contained in:
castano
2011-04-06 06:42:10 +00:00
parent 76a7adf83e
commit 11d04287c9
1 changed files with 100 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,8 +93,7 @@ int main(int argc, char *argv[])
if (i+1 < argc && argv[i+1][0] != '-') { if (i+1 < argc && argv[i+1][0] != '-') {
output = argv[i+1]; output = argv[i+1];
} }
else else {
{
fprintf(stderr, "No output filename.\n"); fprintf(stderr, "No output filename.\n");
return 1; return 1;
} }
@ -118,9 +117,18 @@ int main(int argc, char *argv[])
nv::Image image; nv::Image image;
if (!loadImage(image, input.str())) return 1; if (!loadImage(image, input.str())) return 1;
nv::ImageIO::ImageMetaData metaData; nv::StringBuilder widthString;
metaData.tagMap.add("Thumb::Image::Width", nv::StringBuilder().number (image.width())); widthString.number(image.width());
metaData.tagMap.add("Thumb::Image::Height", nv::StringBuilder().number (image.height())); nv::StringBuilder heightString;
heightString.number(image.height());
nv::Array<const char *> metaData;
metaData.append("Thumb::Image::Width");
metaData.append(widthString.str());
metaData.append("Thumb::Image::Height");
metaData.append(heightString.str());
metaData.append(NULL);
metaData.append(NULL);
if ((image.width() > size) || (image.height() > size)) if ((image.width() > size) || (image.height() > size))
{ {
@ -144,12 +152,12 @@ int main(int argc, char *argv[])
result->setFormat(nv::Image::Format_ARGB); result->setFormat(nv::Image::Format_ARGB);
nv::StdOutputStream stream(output.str()); nv::StdOutputStream stream(output.str());
nv::ImageIO::save(output.str(), stream, result.ptr(), &metaData); nv::ImageIO::save(output.str(), stream, result.ptr(), metaData.buffer());
} }
else else
{ {
nv::StdOutputStream stream(output.str()); nv::StdOutputStream stream(output.str());
nv::ImageIO::save(output.str(), stream, &image, &metaData); nv::ImageIO::save(output.str(), stream, &image, metaData.buffer());
} }
return 0; return 0;