X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fdfedfc07701a1db96b8217321b09bd19808ac24..87f0b1323b7ac77f02133b836c8dfee63b0fd387:/src/common/imagtga.cpp?ds=sidebyside diff --git a/src/common/imagtga.cpp b/src/common/imagtga.cpp index 3d412ddeed..9a5c4ccd87 100644 --- a/src/common/imagtga.cpp +++ b/src/common/imagtga.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: imagtga.cpp +// Name: src/common/imagtga.cpp // Purpose: wxImage TGA handler // Author: Seth Jackson // CVS-ID: $Id$ @@ -227,7 +227,7 @@ int ReadTGA(wxImage* image, wxInputStream& stream) image->Create(width, height); - if (!image->Ok()) + if (!image->IsOk()) { return wxTGA_MEMERR; } @@ -292,9 +292,9 @@ int ReadTGA(wxImage* image, wxInputStream& stream) case 1: { - unsigned char r; - unsigned char g; - unsigned char b; + unsigned char r = 0; + unsigned char g = 0; + unsigned char b = 0; // No compression read the data directly to imageData. @@ -486,9 +486,9 @@ int ReadTGA(wxImage* image, wxInputStream& stream) case 9: { - unsigned char r; - unsigned char g; - unsigned char b; + unsigned char r = 0; + unsigned char g = 0; + unsigned char b = 0; // Decode the RLE data. @@ -846,7 +846,7 @@ bool wxTGAHandler::DoCanRead(wxInputStream& stream) unsigned char hdr[HDR_SIZE]; stream.Read(hdr, HDR_SIZE); // it's ok to modify the stream position here - // Check wether we can read the file or not. + // Check whether we can read the file or not. short colorType = hdr[HDR_COLORTYPE]; if ( colorType != wxTGA_UNMAPPED && colorType != wxTGA_MAPPED )