From a753858b27407a3faaba60d9510aa908fdec505e Mon Sep 17 00:00:00 2001 From: castano Date: Mon, 20 Jun 2011 19:09:29 +0000 Subject: [PATCH] Fix tabs. Fix leak. --- trunk/src/nvimage/ImageIO.cpp | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/trunk/src/nvimage/ImageIO.cpp b/trunk/src/nvimage/ImageIO.cpp index 3f936e1..f73aa84 100644 --- a/trunk/src/nvimage/ImageIO.cpp +++ b/trunk/src/nvimage/ImageIO.cpp @@ -1789,23 +1789,25 @@ Image * nv::ImageIO::loadSTB(Stream & s) if (data != NULL) { Image * img = new Image; - img->allocate(w, h); - img->setFormat(n == 4 ? Image::Format_ARGB : Image::Format_RGB); + img->allocate(w, h); + img->setFormat(n == 4 ? Image::Format_ARGB : Image::Format_RGB); - for (int y = 0; y < h; ++y) - { - nv::Color32* dest = img->scanline(y); - uint8* src = data + y * w * 4; + for (int y = 0; y < h; ++y) + { + nv::Color32* dest = img->scanline(y); + uint8* src = data + y * w * 4; - for (int x = 0; x < w; ++x) - { - dest[x].r = src[x * 4 + 0]; - dest[x].g = src[x * 4 + 1]; - dest[x].b = src[x * 4 + 2]; - dest[x].a = src[x * 4 + 3]; - } - } + for (int x = 0; x < w; ++x) + { + dest[x].r = src[x * 4 + 0]; + dest[x].g = src[x * 4 + 1]; + dest[x].b = src[x * 4 + 2]; + dest[x].a = src[x * 4 + 3]; + } + } + free(data); + return img; }