summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/font/font_dwrite.cpp
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-10-22 13:13:17 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-10-22 13:13:17 +0200
commitddb290d5f615019c33c42b8d94e5a5254cabcf33 (patch)
treea70f688b0df3acd19da7b1151e5902e3c6af3fa5 /src/osd/modules/font/font_dwrite.cpp
parent333bff8de64dfaeb98134000412796b4fdef970b (diff)
NOTICE (TYPE NAME CONSOLIDATION)
Use standard uint64_t, uint32_t, uint16_t or uint8_t instead of UINT64, UINT32, UINT16 or UINT8 also use standard int64_t, int32_t, int16_t or int8_t instead of INT64, INT32, INT16 or INT8
Diffstat (limited to 'src/osd/modules/font/font_dwrite.cpp')
-rw-r--r--src/osd/modules/font/font_dwrite.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/osd/modules/font/font_dwrite.cpp b/src/osd/modules/font/font_dwrite.cpp
index 643c1f9b522..6e66ccf320b 100644
--- a/src/osd/modules/font/font_dwrite.cpp
+++ b/src/osd/modules/font/font_dwrite.cpp
@@ -147,13 +147,13 @@ HRESULT SaveBitmap2(bitmap_argb32 &bitmap, const WCHAR *filename)
HRESULT result;
// Convert the bitmap into a form we understand and save it
- std::unique_ptr<UINT32> pBitmap(new UINT32[bitmap.width() * bitmap.height()]);
+ std::unique_ptr<uint32_t> pBitmap(new uint32_t[bitmap.width() * bitmap.height()]);
for (int y = 0; y < bitmap.height(); y++)
{
- UINT32* pRow = pBitmap.get() + (y * bitmap.width());
+ uint32_t* pRow = pBitmap.get() + (y * bitmap.width());
for (int x = 0; x < bitmap.width(); x++)
{
- UINT32 pixel = bitmap.pix32(y, x);
+ uint32_t pixel = bitmap.pix32(y, x);
pRow[x] = (pixel == 0xFFFFFFFF) ? rgb_t(0xFF, 0x00, 0x00, 0x00) : rgb_t(0xFF, 0xFF, 0xFF, 0xFF);
}
}
@@ -172,8 +172,8 @@ HRESULT SaveBitmap2(bitmap_argb32 &bitmap, const WCHAR *filename)
bitmap.width(),
bitmap.height(),
GUID_WICPixelFormat32bppRGBA,
- bitmap.width() * sizeof(UINT32),
- bitmap.width() * bitmap.height() * sizeof(UINT32),
+ bitmap.width() * sizeof(uint32_t),
+ bitmap.width() * bitmap.height() * sizeof(uint32_t),
(BYTE*)pBitmap.get(),
&bmp2);
@@ -192,19 +192,19 @@ HRESULT SaveBitmap2(bitmap_argb32 &bitmap, const WCHAR *filename)
class FontDimension
{
private:
- UINT16 m_designUnitsPerEm;
+ uint16_t m_designUnitsPerEm;
float m_emSizeInDip;
float m_designUnits;
public:
- FontDimension(UINT16 designUnitsPerEm, float emSizeInDip, float designUnits)
+ FontDimension(uint16_t designUnitsPerEm, float emSizeInDip, float designUnits)
{
m_designUnitsPerEm = designUnitsPerEm;
m_emSizeInDip = emSizeInDip;
m_designUnits = designUnits;
}
- UINT16 DesignUnitsPerEm() const
+ uint16_t DesignUnitsPerEm() const
{
return m_designUnitsPerEm;
}
@@ -286,7 +286,7 @@ public:
class FontDimensionFactory
{
private:
- UINT16 m_designUnitsPerEm;
+ uint16_t m_designUnitsPerEm;
float m_emSizeInDip;
public:
@@ -295,7 +295,7 @@ public:
return m_emSizeInDip;
}
- FontDimensionFactory(UINT16 designUnitsPerEm, float emSizeInDip)
+ FontDimensionFactory(uint16_t designUnitsPerEm, float emSizeInDip)
{
m_designUnitsPerEm = designUnitsPerEm;
m_emSizeInDip = emSizeInDip;
@@ -427,8 +427,8 @@ public:
FontDimensionFactory fdf(gdi_metrics.designUnitsPerEm, m_fontEmHeightInDips);
- UINT32 tempChar = chnum;
- UINT16 glyphIndex;
+ uint32_t tempChar = chnum;
+ uint16_t glyphIndex;
HR_RET0(face->GetGlyphIndicesW(&tempChar, 1, &glyphIndex));
// get the width of this character
@@ -537,7 +537,7 @@ public:
for (actbounds.min_x = 0; actbounds.min_x < bmwidth; actbounds.min_x++)
{
BYTE *offs = pixels + actbounds.min_x;
- UINT8 summary = 0;
+ uint8_t summary = 0;
for (int y = 0; y < bmheight; y++)
summary |= offs[y * bmwidth];
if (summary != 0)
@@ -551,7 +551,7 @@ public:
for (actbounds.max_x = bmwidth - 1; actbounds.max_x >= 0; actbounds.max_x--)
{
BYTE *offs = pixels + actbounds.max_x;
- UINT8 summary = 0;
+ uint8_t summary = 0;
// Go through the entire column and build a summary
for (int y = 0; y < bmheight; y++)
@@ -570,8 +570,8 @@ public:
// copy the bits into it
for (int y = 0; y < bitmap.height(); y++)
{
- UINT32 *dstrow = &bitmap.pix32(y);
- UINT8 *srcrow = &pixels[(y + actbounds.min_y) * bmwidth];
+ uint32_t *dstrow = &bitmap.pix32(y);
+ uint8_t *srcrow = &pixels[(y + actbounds.min_y) * bmwidth];
for (int x = 0; x < bitmap.width(); x++)
{
int effx = x + actbounds.min_x;
@@ -773,7 +773,7 @@ private:
HRESULT get_family_for_locale(ComPtr<IDWriteLocalizedStrings> family_names, const std::wstring &locale, std::unique_ptr<WCHAR[]> &family_name) const
{
HRESULT result;
- UINT32 index;
+ uint32_t index;
BOOL exists = false;
result = family_names->FindLocaleName(locale.c_str(), &index, &exists);
@@ -787,7 +787,7 @@ private:
index = 0;
// Get the length and allocate our buffer
- UINT32 name_length = 0;
+ uint32_t name_length = 0;
HR_RETHR(family_names->GetStringLength(index, &name_length));
auto name_buffer = std::make_unique<WCHAR[]>(name_length + 1);