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

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

@ -40,118 +40,126 @@
static bool loadImage(nv::Image & image, const char * fileName) static bool loadImage(nv::Image & image, const char * fileName)
{ {
if (nv::strCaseCmp(nv::Path::extension(fileName), ".dds") == 0) if (nv::strCaseCmp(nv::Path::extension(fileName), ".dds") == 0)
{ {
nv::DirectDrawSurface dds(fileName); nv::DirectDrawSurface dds(fileName);
if (!dds.isValid()) if (!dds.isValid())
{ {
fprintf(stderr, "The file '%s' is not a valid DDS file.\n", fileName); fprintf(stderr, "The file '%s' is not a valid DDS file.\n", fileName);
return false; return false;
} }
dds.mipmap(&image, 0, 0); // get first image dds.mipmap(&image, 0, 0); // get first image
} }
else else
{ {
// Regular image. // Regular image.
if (!image.load(fileName)) if (!image.load(fileName))
{ {
fprintf(stderr, "The file '%s' is not a supported image type.\n", fileName); fprintf(stderr, "The file '%s' is not a supported image type.\n", fileName);
return false; return false;
} }
} }
return true; return true;
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
//MyAssertHandler assertHandler; //MyAssertHandler assertHandler;
MyMessageHandler messageHandler; MyMessageHandler messageHandler;
float gamma = 2.2f; float gamma = 2.2f;
nv::Path input; nv::Path input;
nv::Path output; nv::Path output;
uint size = 128; uint size = 128;
// Parse arguments. // Parse arguments.
for (int i = 1; i < argc; i++) for (int i = 1; i < argc; i++)
{ {
// Input options. // Input options.
if (strcmp("-s", argv[i]) == 0) if (strcmp("-s", argv[i]) == 0)
{ {
if (i+1 < argc && argv[i+1][0] != '-') { if (i+1 < argc && argv[i+1][0] != '-') {
size = (uint)atoi(argv[i+1]); size = (uint)atoi(argv[i+1]);
i++; i++;
} }
} }
else if (argv[i][0] != '-') else if (argv[i][0] != '-')
{ {
input = argv[i]; input = argv[i];
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; }
}
break; break;
}
} }
}
if (input.isNull() || output.isNull()) if (input.isNull() || output.isNull())
{ {
printf("NVIDIA Texture Tools - Copyright NVIDIA Corporation 2007\n\n"); printf("NVIDIA Texture Tools - Copyright NVIDIA Corporation 2007\n\n");
printf("usage: nv-gnome-thumbnailer [options] input output\n\n"); printf("usage: nv-gnome-thumbnailer [options] input output\n\n");
printf("Options:\n"); printf("Options:\n");
printf(" -s size\tThumbnail size (default = 128)\n"); printf(" -s size\tThumbnail size (default = 128)\n");
return 1; return 1;
} }
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());
if ((image.width() > size) || (image.height() > size)) 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))
{
nv::FloatImage fimage(&image);
fimage.toLinear(0, 3, gamma);
uint thumbW, thumbH;
if (image.width() > image.height())
{ {
nv::FloatImage fimage(&image); thumbW = size;
fimage.toLinear(0, 3, gamma); thumbH = uint ((float (image.height()) / float (image.width())) * size);
uint thumbW, thumbH;
if (image.width() > image.height())
{
thumbW = size;
thumbH = uint ((float (image.height()) / float (image.width())) * size);
}
else
{
thumbW = uint ((float (image.width()) / float (image.height())) * size);
thumbH = size;
}
nv::AutoPtr<nv::FloatImage> fresult(fimage.resize(nv::BoxFilter(), thumbW, thumbH, nv::FloatImage::WrapMode_Clamp));
nv::AutoPtr<nv::Image> result(fresult->createImageGammaCorrect(gamma));
result->setFormat(nv::Image::Format_ARGB);
nv::StdOutputStream stream(output.str());
nv::ImageIO::save(output.str(), stream, result.ptr(), &metaData);
} }
else else
{ {
nv::StdOutputStream stream(output.str()); thumbW = uint ((float (image.width()) / float (image.height())) * size);
nv::ImageIO::save(output.str(), stream, &image, &metaData); thumbH = size;
} }
nv::AutoPtr<nv::FloatImage> fresult(fimage.resize(nv::BoxFilter(), thumbW, thumbH, nv::FloatImage::WrapMode_Clamp));
return 0; nv::AutoPtr<nv::Image> result(fresult->createImageGammaCorrect(gamma));
result->setFormat(nv::Image::Format_ARGB);
nv::StdOutputStream stream(output.str());
nv::ImageIO::save(output.str(), stream, result.ptr(), metaData.buffer());
}
else
{
nv::StdOutputStream stream(output.str());
nv::ImageIO::save(output.str(), stream, &image, metaData.buffer());
}
return 0;
} }