actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Decouple <cstdint>

Browse Source
This commit is contained in:
Martin Natano
2023-04-20 12:34:12 +02:00
parent bcea05dd67
commit aa87f85eef
167 changed files with 1533 additions and 1307 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RageSurface_Load_BMP.cpp
+7 -4
View File
@@ -4,6 +4,9 @@
#include "RageUtil.h"
#include "RageLog.h"
#include "RageSurface.h"
#include <cstdint>
using namespace FileReading;
/* Tested with http://entropymine.com/jason/bmpsuite/. */
@@ -38,10 +41,10 @@ static RageSurfaceUtils::OpenResult LoadBMP( RageFile &f, RageSurface *&img, RSt
read_u32_le( f, sError ); /* file size */
read_u32_le( f, sError ); /* unused */
uint32_t iDataOffset = read_u32_le( f, sError );
uint32_t iHeaderSize = read_u32_le( f, sError );
std::uint32_t iDataOffset = read_u32_le( f, sError );
std::uint32_t iHeaderSize = read_u32_le( f, sError );
uint32_t iWidth, iHeight, iPlanes, iBPP, iCompression = COMP_BI_RGB, iColors = 0;
std::uint32_t iWidth, iHeight, iPlanes, iBPP, iCompression = COMP_BI_RGB, iColors = 0;
if( iHeaderSize == 12 )
{
/* OS/2 format */
@@ -154,7 +157,7 @@ static RageSurfaceUtils::OpenResult LoadBMP( RageFile &f, RageSurface *&img, RSt
for( int y = (int) iHeight-1; y >= 0; --y )
{
uint8_t *pRow = img->pixels + img->pitch*y;
std::uint8_t *pRow = img->pixels + img->pitch*y;
RString buf;
f.Read( buf, iFilePitch );