OpenCanopy: Rename Font.* to Font_1x.* to avoid name conflicts

dimaoc2012 · May 5, 2020 · 5b0925a · 5b0925a
1 parent b4e2820
commit 5b0925a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Platform/OpenCanopy/BitmapFont.c b/Platform/OpenCanopy/BitmapFont.c
@@ -780,8 +780,10 @@ GuiFontDestruct (
   ASSERT (Context != NULL);
   if (Context->FontImage.Buffer != NULL) {
     FreePool (Context->FontImage.Buffer);
+    Context->FontImage.Buffer = NULL;
   }
   if (Context->KerningData != NULL) {
     FreePool (Context->KerningData);
+    Context->KerningData = NULL;
   }
 }
diff --git a/Platform/OpenCanopy/GuiApp.c b/Platform/OpenCanopy/GuiApp.c
@@ -397,8 +397,8 @@ InternalContextConstruct (
     FontImage = OcStorageReadFileUnicode (Storage, OPEN_CORE_FONT_PATH L"Font_2x.png", &FontImageSize);
     FontData  = OcStorageReadFileUnicode (Storage, OPEN_CORE_FONT_PATH L"Font_2x.bin", &FontDataSize);
   } else {
-    FontImage = OcStorageReadFileUnicode (Storage, OPEN_CORE_FONT_PATH L"Font.png", &FontImageSize);
-    FontData  = OcStorageReadFileUnicode (Storage, OPEN_CORE_FONT_PATH L"Font.bin", &FontDataSize);
+    FontImage = OcStorageReadFileUnicode (Storage, OPEN_CORE_FONT_PATH L"Font_1x.png", &FontImageSize);
+    FontData  = OcStorageReadFileUnicode (Storage, OPEN_CORE_FONT_PATH L"Font_1x.bin", &FontDataSize);
   }
 
   if (FontImage != NULL && FontData != NULL) {