swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-10-19 09:02:53 -04:00
Code Issues Projects Releases Wiki Activity

this is a more "clean" conversion to 64 bit than the type-fixups branch, which does borrow some elements from it but has far less find and replace...it is about 98-99% done, notes to follow later

Browse Source
This commit is contained in:
DarthArgus
2017-01-24 03:35:59 +00:00
parent 42b949c3dc
commit 36686348e9
458 changed files with 2282 additions and 2367 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/shared/library/sharedImage/src/shared/TargaFormat.cpp
+3 -3
View File
@@ -955,7 +955,7 @@ void TargaFormatNamespace::_readRleColorMapped(
uint8 *lineIter=line;
while (rle)
{
index = (fileBytesPerPixel==1) ? unsigned(*lineIter) : unsigned(*(unsigned short *)lineIter);
index = (fileBytesPerPixel==1) ? unsigned(*lineIter) : unsigned(*(uint16_t *)lineIter);
lookup = cmap + index*bytesPerColorEntry;
switch (bytesPerColorEntry)
{
@@ -1180,8 +1180,8 @@ bool TargaFormat::saveImage(const Image &image, const char *filename)
header.m_colorMapDepth = 0; // number of bits per palette entry
header.m_xOriginOffset = 0; // horiz pixel coordinate of lower left of image
header.m_yOriginOffset = 0; // vert pixel coordinate of lower left of image
header.m_width = static_cast<unsigned short>(width); // image width in pixels
header.m_height = static_cast<unsigned short>(height); // image height in pixels
header.m_width = static_cast<uint16_t>(width); // image width in pixels
header.m_height = static_cast<uint16_t>(height); // image height in pixels
header.m_pixelDepth = static_cast<unsigned char>(bitDepth); // image color depth (bits per pixel)
header.m_imageDescriptor = 0; // image attribute flags (lower-left origin)
//------------------------------------------