TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-25 14:25:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1016 from Azaezel/alpha41/mangledMath

Browse source 
clean up math varsize complaints
This commit is contained in:
Brian Roberts 2023-05-08 21:28:49 -05:00 • committed by GitHub
commit a6f03897ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 73 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/gfx/bitmap/gBitmap.h
View file

@ -323,7 +323,7 @@ inline U8* GBitmap::getWritableBits(const U32 in_mipLevel)
inline U8* GBitmap::getAddress(const S32 in_x, const S32 in_y, const U32 mipLevel)
{
return (getWritableBits(mipLevel) + ((in_y * getWidth(mipLevel)) + in_x) * mBytesPerPixel);
return (getWritableBits(mipLevel) + (U64)(((in_y * getWidth(mipLevel)) + in_x) * mBytesPerPixel));
}
inline const U8* GBitmap::getAddress(const S32 in_x, const S32 in_y, const U32 mipLevel) const

10
Engine/source/gfx/bitmap/loaders/bitmapPng.cpp
View file

@ -75,7 +75,7 @@ static void pngReadDataFn(png_structp png_ptr,
AssertFatal(png_get_io_ptr(png_ptr) != NULL, "No stream?");
Stream *strm = (Stream*)png_get_io_ptr(png_ptr);
bool success = strm->read(length, data);
bool success = strm->read((U32)length, data);
AssertFatal(success, "pngReadDataFn - failed to read from stream!");
}
@ -88,7 +88,7 @@ static void pngWriteDataFn(png_structp png_ptr,
AssertFatal(png_get_io_ptr(png_ptr) != NULL, "No stream?");
Stream *strm = (Stream*)png_get_io_ptr(png_ptr);
bool success = strm->write(length, data);
bool success = strm->write((U32)length, data);
AssertFatal(success, "pngWriteDataFn - failed to write to stream!");
}
@ -101,7 +101,7 @@ static void pngFlushDataFn(png_structp /*png_ptr*/)
static png_voidp pngMallocFn(png_structp /*png_ptr*/, png_size_t size)
{
return FrameAllocator::alloc(size);
return FrameAllocator::alloc((U32)size);
}
static void pngFreeFn(png_structp /*png_ptr*/, png_voidp /*mem*/)
@ -265,7 +265,7 @@ static bool sReadPNG(Stream &stream, GBitmap *bitmap)
// above...
png_read_update_info(png_ptr, info_ptr);
png_uint_32 rowBytes = png_get_rowbytes(png_ptr, info_ptr);
png_uint_32 rowBytes = (png_uint_32)png_get_rowbytes(png_ptr, info_ptr);
if (format == GFXFormatR8G8B8)
{
AssertFatal(rowBytes == width * 3,
@ -642,4 +642,4 @@ void DeferredPNGWriter::end()
png_destroy_write_struct(&mData->png_ptr, (png_infopp)NULL);
mActive = false;
}
}