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

Fix tabs. Fix leak.

Browse Source
This commit is contained in:
castano 2011-06-20 19:09:29 +00:00
parent 7f046075db
commit a753858b27
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
trunk/src/nvimage/ImageIO.cpp
View File

@ -1789,23 +1789,25 @@ Image * nv::ImageIO::loadSTB(Stream & s)
if (data != NULL) { if (data != NULL) {
Image * img = new Image; Image * img = new Image;
img->allocate(w, h); img->allocate(w, h);
img->setFormat(n == 4 ? Image::Format_ARGB : Image::Format_RGB); img->setFormat(n == 4 ? Image::Format_ARGB : Image::Format_RGB);
for (int y = 0; y < h; ++y) for (int y = 0; y < h; ++y)
{ {
nv::Color32* dest = img->scanline(y); nv::Color32* dest = img->scanline(y);
uint8* src = data + y * w * 4; uint8* src = data + y * w * 4;
for (int x = 0; x < w; ++x) for (int x = 0; x < w; ++x)
{ {
dest[x].r = src[x * 4 + 0]; dest[x].r = src[x * 4 + 0];
dest[x].g = src[x * 4 + 1]; dest[x].g = src[x * 4 + 1];
dest[x].b = src[x * 4 + 2]; dest[x].b = src[x * 4 + 2];
dest[x].a = src[x * 4 + 3]; dest[x].a = src[x * 4 + 3];
} }
} }
free(data);
return img; return img;
} }