rmlui: Add fixes to compile under the PNaCL toolchain.

Unvanquished · Aug 3, 2022 · cf67dbd · cf67dbd
1 parent ac6bc8e
commit cf67dbd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Source/Core/FontEngineDefault/FreeTypeInterface.cpp b/Source/Core/FontEngineDefault/FreeTypeInterface.cpp
@@ -184,7 +184,7 @@ void FreeType::GetFaceStyle(FontFaceHandleFreetype in_face, String* font_family,
 
 	if (weight)
 	{
-		TT_OS2* font_table = (TT_OS2*)FT_Get_Sfnt_Table(face, FT_SFNT_OS2);
+		TT_OS2* font_table = (TT_OS2*)FT_Get_Sfnt_Table(face, ft_sfnt_os2);
 		if (font_table && font_table->usWeightClass != 0)
 			*weight = (Style::FontWeight)font_table->usWeightClass;
 		else

diff --git a/Source/Core/StyleSheetFactory.cpp b/Source/Core/StyleSheetFactory.cpp
@@ -226,7 +226,7 @@ UniquePtr<const StyleSheetContainer> StyleSheetFactory::LoadStyleSheetContainer(
 		}
 	}
 
-	return new_style_sheet;
+	return UniquePtr<const StyleSheetContainer>(new_style_sheet.release());
 }
 
 } // namespace Rml