mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-26 01:44:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor surrounding MxBitmap::GetAdjustedStride (#1057)

Browse Source 
* Refactor surrounding MxBitmap::GetAdjustedStride

* Remove this-> from MxDisplaySurface
This commit is contained in:
MS
2024-07-04 12:50:04 -04:00
committed by GitHub
parent 65e3c3dd05
commit 14653070cc
4 changed files with 352 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
LEGO1/omni/include/mxbitmap.h
View File

@@ -94,6 +94,7 @@ public:
// FUNCTION: BETA10 0x1002c690
static MxLong HeightAbs(MxLong p_value) { return p_value > 0 ? p_value : -p_value; }
// FUNCTION: BETA10 0x10142030
inline BITMAPINFOHEADER* GetBmiHeader() const { return m_bmiHeader; }
// FUNCTION: BETA10 0x1002c440
@@ -124,15 +125,9 @@ public:
}
}
inline MxLong GetAdjustedStride()
{
if (m_bmiHeader->biCompression == BI_RGB_TOPDOWN || m_bmiHeader->biHeight < 0) {
return GetBmiStride();
}
else {
return -GetBmiStride();
}
}
#define GetAdjustedStride(p_bitmap) \
(p_bitmap->IsTopDown() ? p_bitmap->AlignToFourByte(p_bitmap->GetBmiWidth()) \
: -p_bitmap->AlignToFourByte(p_bitmap->GetBmiWidth()))
// FUNCTION: BETA10 0x1002c320
inline MxU8* GetStart(MxS32 p_left, MxS32 p_top)

8
LEGO1/omni/include/mxdisplaysurface.h
View File

@@ -95,11 +95,11 @@ public:
static LPDIRECTDRAWSURFACE CreateCursorSurface();
static LPDIRECTDRAWSURFACE CopySurface(LPDIRECTDRAWSURFACE p_src);
inline LPDIRECTDRAWSURFACE GetDirectDrawSurface1() { return this->m_ddSurface1; }
inline LPDIRECTDRAWSURFACE GetDirectDrawSurface2() { return this->m_ddSurface2; }
inline MxVideoParam& GetVideoParam() { return this->m_videoParam; }
inline LPDIRECTDRAWSURFACE GetDirectDrawSurface1() { return m_ddSurface1; }
inline LPDIRECTDRAWSURFACE GetDirectDrawSurface2() { return m_ddSurface2; }
inline MxVideoParam& GetVideoParam() { return m_videoParam; }
static void FUN_100bb500(
void FUN_100bb500(
MxU8** p_bitmapData,
MxU8** p_surfaceData,
MxU32 p_bitmapSize,