Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 14:47:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix warning about TGAOrientation

Browse source
This commit is contained in:
Ryan Huffman 2019-03-08 13:01:56 -08:00
parent 2af9dc886a
commit 1f0a8b18c8
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/image/src/image/TGAReader.cpp
View file

@ -26,10 +26,6 @@ QImage image::readTGA(QIODevice& content) {
RunLengthEncodedTrueColor = 10, RunLengthEncodedTrueColor = 10,
RunLengthEncodedBlackWhite = 11, RunLengthEncodedBlackWhite = 11,
}; };
enum class TGAOrientation : uint8_t {
BottomLeft = 0,
TopLeft = 1,
};
struct TGAHeader { struct TGAHeader {
uint8_t idLength; uint8_t idLength;
@ -48,13 +44,15 @@ QImage image::readTGA(QIODevice& content) {
struct { struct {
uint8_t attributeBitsPerPixel : 4; uint8_t attributeBitsPerPixel : 4;
uint8_t reserved : 1; uint8_t reserved : 1;
TGAOrientation orientation : 1; uint8_t orientation : 1;
uint8_t padding : 2; uint8_t padding : 2;
} imageDescriptor; } imageDescriptor;
}; };
constexpr bool WANT_DEBUG { false }; constexpr bool WANT_DEBUG { false };
constexpr size_t TGA_HEADER_SIZE_BYTES { 18 }; constexpr size_t TGA_HEADER_SIZE_BYTES { 18 };
constexpr uint8_t ORIENTATION_BOTTOM_LEFT { 0 };
constexpr uint8_t ORIENTATION_TOP_LEFT { 1 };
TGAHeader header; TGAHeader header;
@ -119,7 +117,7 @@ QImage image::readTGA(QIODevice& content) {
QImage image{ header.width, header.height, QImage::Format_ARGB32 }; QImage image{ header.width, header.height, QImage::Format_ARGB32 };
char* line; char* line;
for (int y = 0; y < header.height; ++y) { for (int y = 0; y < header.height; ++y) {
if (header.imageDescriptor.orientation == TGAOrientation::BottomLeft) { if (header.imageDescriptor.orientation == ORIENTATION_BOTTOM_LEFT) {
line = (char*)image.scanLine(header.height - y - 1); line = (char*)image.scanLine(header.height - y - 1);
} else { } else {
line = (char*)image.scanLine(y); line = (char*)image.scanLine(y);
@ -137,7 +135,7 @@ QImage image::readTGA(QIODevice& content) {
for (int y = 0; y < header.height; ++y) { for (int y = 0; y < header.height; ++y) {
char* line; char* line;
if (header.imageDescriptor.orientation == TGAOrientation::BottomLeft) { if (header.imageDescriptor.orientation == ORIENTATION_BOTTOM_LEFT) {
line = (char*)image.scanLine(header.height - y - 1); line = (char*)image.scanLine(header.height - y - 1);
} else { } else {
line = (char*)image.scanLine(y); line = (char*)image.scanLine(y);