Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ATL] Fix CImage members (#5702)

Browse source 
- Delete m_ds and m_bm members from CImage.
- Add m_nWidth, m_nHeight, m_nPitch, m_nBPP,
  and m_pBits members.
CORE-19008
This commit is contained in:
Katayama Hirofumi MZ 2023-09-19 22:19:03 +09:00 committed by GitHub
parent 6911fab69a
commit 5da3ed638b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 56 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

123
sdk/lib/atl/atlimage.h
View file

@ -39,16 +39,6 @@ public:
CImage() noexcept CImage() noexcept
{ {
m_hBitmap = NULL;
m_hOldBitmap = NULL;
m_hDC = NULL;
m_eOrientation = DIBOR_DEFAULT;
m_bHasAlphaChannel = false;
m_bIsDIBSection = false;
m_clrTransparentColor = CLR_INVALID;
ZeroMemory(&m_ds, sizeof(m_ds));
s_gdiplus.IncreaseCImageCount(); s_gdiplus.IncreaseCImageCount();
} }
@ -75,10 +65,12 @@ public:
HBITMAP Detach() noexcept HBITMAP Detach() noexcept
{ {
m_eOrientation = DIBOR_DEFAULT; m_hOldBitmap = m_hBitmap = NULL;
m_bHasAlphaChannel = false; m_nWidth = m_nHeight = m_nPitch = m_nBPP = 0;
m_pBits = NULL;
m_bHasAlphaChannel = m_bIsDIBSection = FALSE;
m_clrTransparentColor = CLR_INVALID; m_clrTransparentColor = CLR_INVALID;
ZeroMemory(&m_ds, sizeof(m_ds));
HBITMAP hBitmap = m_hBitmap; HBITMAP hBitmap = m_hBitmap;
m_hBitmap = NULL; m_hBitmap = NULL;
@ -275,12 +267,7 @@ public:
void *GetBits() noexcept void *GetBits() noexcept
{ {
ATLASSERT(IsDIBSection()); ATLASSERT(IsDIBSection());
BYTE *pb = (BYTE *)m_bm.bmBits; return m_pBits;
if (m_eOrientation == DIBOR_BOTTOMUP)
{
pb += m_bm.bmWidthBytes * (m_bm.bmHeight - 1);
}
return pb;
} }
const void *GetBits() const noexcept const void *GetBits() const noexcept
@ -291,7 +278,7 @@ public:
int GetBPP() const noexcept int GetBPP() const noexcept
{ {
ATLASSERT(m_hBitmap); ATLASSERT(m_hBitmap);
return m_bm.bmBitsPixel; return m_nBPP;
} }
void GetColorTable(UINT iFirstColor, UINT nColors, void GetColorTable(UINT iFirstColor, UINT nColors,
@ -306,24 +293,18 @@ public:
int GetHeight() const noexcept int GetHeight() const noexcept
{ {
ATLASSERT(m_hBitmap); ATLASSERT(m_hBitmap);
return m_bm.bmHeight; return m_nHeight;
} }
int GetMaxColorTableEntries() const noexcept int GetMaxColorTableEntries() const noexcept
{ {
ATLASSERT(IsDIBSection()); ATLASSERT(IsDIBSection());
if (m_ds.dsBmih.biClrUsed && m_ds.dsBmih.biBitCount < 16) switch (m_nBPP)
return m_ds.dsBmih.biClrUsed;
switch (m_bm.bmBitsPixel)
{ {
case 1: return 2; case 1: case 4: case 8:
case 4: return 16; return (1 << m_nBPP);
case 8: return 256;
case 16: case 32: case 16: case 24: case 32:
if (m_ds.dsBmih.biCompression == BI_BITFIELDS)
return 3;
return 0;
case 24:
default: default:
return 0; return 0;
} }
@ -332,10 +313,7 @@ public:
int GetPitch() const noexcept int GetPitch() const noexcept
{ {
ATLASSERT(IsDIBSection()); ATLASSERT(IsDIBSection());
if (m_eOrientation == DIBOR_BOTTOMUP) return m_nPitch;
return -m_bm.bmWidthBytes;
else
return m_bm.bmWidthBytes;
} }
COLORREF GetPixel(int x, int y) const noexcept COLORREF GetPixel(int x, int y) const noexcept
@ -368,7 +346,7 @@ public:
int GetWidth() const noexcept int GetWidth() const noexcept
{ {
ATLASSERT(m_hBitmap); ATLASSERT(m_hBitmap);
return m_bm.bmWidth; return m_nWidth;
} }
bool IsDIBSection() const noexcept bool IsDIBSection() const noexcept
@ -1030,21 +1008,18 @@ private:
} }
private: private:
// FIXME: MS ATL CImage has m_nWidth, m_nHeight, m_nPitch, m_nBPP, and m_pBits. HBITMAP m_hBitmap = NULL;
// FIXME: MS ATL CImage hasn't m_eOrientation, m_bm, and m_ds. mutable HBITMAP m_hOldBitmap = NULL;
HBITMAP m_hBitmap; INT m_nWidth = 0;
mutable HBITMAP m_hOldBitmap; INT m_nHeight = 0;
mutable HDC m_hDC; INT m_nPitch = 0;
mutable LONG m_nDCRefCount = 0; INT m_nBPP = 0;
DIBOrientation m_eOrientation; LPVOID m_pBits = NULL;
bool m_bHasAlphaChannel; BOOL m_bHasAlphaChannel = FALSE;
bool m_bIsDIBSection; BOOL m_bIsDIBSection = FALSE;
COLORREF m_clrTransparentColor; COLORREF m_clrTransparentColor = CLR_INVALID;
union mutable HDC m_hDC = NULL;
{ mutable LONG m_nDCRefCount = 0;
BITMAP m_bm;
DIBSECTION m_ds;
};
LPCWSTR GetFileExtension(LPCWSTR pszFileName) const LPCWSTR GetFileExtension(LPCWSTR pszFileName) const
{ {
@ -1150,26 +1125,40 @@ private:
{ {
Destroy(); Destroy();
const int size = sizeof(DIBSECTION); DIBSECTION ds;
m_bIsDIBSection = (::GetObject(hBitmap, size, &m_ds) == size); BITMAP& bm = ds.dsBm;
bool bOK = (::GetObject(hBitmap, sizeof(BITMAP), &m_bm) != 0); m_bIsDIBSection = (::GetObjectW(hBitmap, sizeof(ds), &ds) == sizeof(ds));
if (!bOK)
if (!m_bIsDIBSection && !::GetObjectW(hBitmap, sizeof(bm), &bm))
return; return;
m_hBitmap = hBitmap; m_hBitmap = hBitmap;
m_nWidth = bm.bmWidth;
if (m_bIsDIBSection && eOrientation == DIBOR_DEFAULT) m_nHeight = bm.bmHeight;
{ m_nBPP = bm.bmBitsPixel;
if (m_ds.dsBmih.biHeight < 0) m_bHasAlphaChannel = (bm.bmBitsPixel == 32);
eOrientation = DIBOR_TOPDOWN;
else
eOrientation = DIBOR_BOTTOMUP;
}
m_eOrientation = eOrientation;
m_bHasAlphaChannel = (m_bm.bmBitsPixel == 32);
m_clrTransparentColor = CLR_INVALID; m_clrTransparentColor = CLR_INVALID;
m_nPitch = 0;
m_pBits = NULL;
if (m_bIsDIBSection)
{
if (eOrientation == DIBOR_DEFAULT)
eOrientation = ((ds.dsBmih.biHeight < 0) ? DIBOR_TOPDOWN : DIBOR_BOTTOMUP);
LPBYTE pb = (LPBYTE)bm.bmBits;
if (eOrientation == DIBOR_BOTTOMUP)
{
m_nPitch = -bm.bmWidthBytes;
m_pBits = pb + bm.bmWidthBytes * (m_nHeight - 1);
}
else
{
m_nPitch = bm.bmWidthBytes;
m_pBits = pb;
}
}
} }
BOOL CreateInternal(int nWidth, int nHeight, int nBPP, BOOL CreateInternal(int nWidth, int nHeight, int nBPP,