From a14229aa7163d66ab7b6947f1920a2a01342c1f0 Mon Sep 17 00:00:00 2001 From: Anakin Date: Wed, 1 Feb 2017 17:53:42 +0100 Subject: [PATCH] further improvement on tga import --- QtMeshViewer/Header/tga.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/QtMeshViewer/Header/tga.h b/QtMeshViewer/Header/tga.h index 9edf68f..f111448 100644 --- a/QtMeshViewer/Header/tga.h +++ b/QtMeshViewer/Header/tga.h @@ -61,20 +61,17 @@ QImage loadTga(QString filePath, bool &success) for (unsigned int y = 0; y < ui32Height; y++) { - //QRgb* imgLine = (QRgb*)img.scanLine(y); + QRgb* imgLine = reinterpret_cast(img.scanLine(ui32Height - y - 1)); for (unsigned int x = 0; x < ui32Width; x++) { - int valr = vui8Pixels.at(y * ui32Width * ui32BpP / 8 + x * ui32BpP / 8 + 2); + int valr = vui8Pixels.at(y * ui32Width * ui32BpP / 8 + x * ui32BpP / 8); int valg = vui8Pixels.at(y * ui32Width * ui32BpP / 8 + x * ui32BpP / 8 + 1); - int valb = vui8Pixels.at(y * ui32Width * ui32BpP / 8 + x * ui32BpP / 8); + int valb = vui8Pixels.at(y * ui32Width * ui32BpP / 8 + x * ui32BpP / 8 + 2); int vala = 255; if (ui32BpP == 32) vala = vui8Pixels.at(y * ui32Width * ui32BpP / 8 + x * ui32BpP / 8 + 3); - QColor value(valr, valg, valb, vala); - - //imgLine[x] = value.rgba(); - img.setPixel(x, ui32Width - 1 - y, value.rgba()); + imgLine[x] = QColor(valr, valg, valb, vala).rgba(); } } }