fix fonts release

Signed-off-by: Sergey Isakov <[email protected]>
CloverHackyColor · Mar 20, 2020 · 3c9332b · 3c9332b
1 parent 4d07a73
commit 3c9332b
Show file tree

Hide file tree

Showing 78 changed files with 15 additions and 85 deletions.
diff --git a/CloverPackage/CloverV2/themespkg/newyear/arrow-144.png b/CloverPackage/CloverV2/themespkg/newyear/arrow-144.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/arrow-64.png b/CloverPackage/CloverV2/themespkg/newyear/arrow-64.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/dark-wide.png b/CloverPackage/CloverV2/themespkg/newyear/dark-wide.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_000.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_000.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_001.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_001.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_002.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_002.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_003.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_003.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_004.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_004.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_005.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_005.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_006.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_006.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_007.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_007.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_008.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_008.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_009.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_009.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_010.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_010.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_011.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_011.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_012.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_012.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_013.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_013.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_014.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_014.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_015.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_015.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_016.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_016.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_017.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_017.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_018.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_018.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_019.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_019.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_020.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_020.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_021.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_021.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_022.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_022.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_023.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_023.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_024.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_024.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_025.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_025.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_026.png b/CloverPackage/CloverV2/themespkg/newyear/elka_1/elka_1_026.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/happy.png b/CloverPackage/CloverV2/themespkg/newyear/happy.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/func_about.png b/CloverPackage/CloverV2/themespkg/newyear/icons/func_about.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/func_clover.png b/CloverPackage/CloverV2/themespkg/newyear/icons/func_clover.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/func_help.png b/CloverPackage/CloverV2/themespkg/newyear/icons/func_help.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/func_options.png b/CloverPackage/CloverV2/themespkg/newyear/icons/func_options.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/func_reset.png b/CloverPackage/CloverV2/themespkg/newyear/icons/func_reset.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/func_shutdown.png b/CloverPackage/CloverV2/themespkg/newyear/icons/func_shutdown.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/os_cap.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/os_cap.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/os_clover.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/os_clover.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/os_cougar.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/os_cougar.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/os_freebsd.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/os_freebsd.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/os_freedos.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/os_freedos.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/os_hsierra.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/os_hsierra.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/os_legacy.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/os_legacy.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/os_leo.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/os_leo.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/os_linux.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/os_linux.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/os_lion.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/os_lion.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/os_mac.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/os_mac.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/os_mav.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/os_mav.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/os_moja.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/os_moja.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/os_sierra.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/os_sierra.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/os_snow.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/os_snow.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/os_tiger.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/os_tiger.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/os_vista.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/os_vista.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/os_win.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/os_win.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/os_yos.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/os_yos.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/pointer.png b/CloverPackage/CloverV2/themespkg/newyear/icons/pointer.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/tool_shell.png b/CloverPackage/CloverV2/themespkg/newyear/icons/tool_shell.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/vol_clover.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/vol_clover.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/vol_external.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/vol_external.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/vol_firewire.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/vol_firewire.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/vol_internal.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/vol_internal.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/vol_internal_hfs.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/vol_internal_hfs.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/vol_optical.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/vol_optical.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/icons/vol_recovery.icns b/CloverPackage/CloverV2/themespkg/newyear/icons/vol_recovery.icns
diff --git a/CloverPackage/CloverV2/themespkg/newyear/screenshot.png b/CloverPackage/CloverV2/themespkg/newyear/screenshot.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/scrollbar/bar_end.png b/CloverPackage/CloverV2/themespkg/newyear/scrollbar/bar_end.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/scrollbar/bar_fill.png b/CloverPackage/CloverV2/themespkg/newyear/scrollbar/bar_fill.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/scrollbar/bar_start.png b/CloverPackage/CloverV2/themespkg/newyear/scrollbar/bar_start.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/scrollbar/down_button.png b/CloverPackage/CloverV2/themespkg/newyear/scrollbar/down_button.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/scrollbar/scroll_end.png b/CloverPackage/CloverV2/themespkg/newyear/scrollbar/scroll_end.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/scrollbar/scroll_fill.png b/CloverPackage/CloverV2/themespkg/newyear/scrollbar/scroll_fill.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/scrollbar/scroll_start.png b/CloverPackage/CloverV2/themespkg/newyear/scrollbar/scroll_start.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/scrollbar/up_button.png b/CloverPackage/CloverV2/themespkg/newyear/scrollbar/up_button.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/snow.png b/CloverPackage/CloverV2/themespkg/newyear/snow.png
diff --git a/CloverPackage/CloverV2/themespkg/newyear/theme.plist b/CloverPackage/CloverV2/themespkg/newyear/theme.plist
diff --git a/CloverPackage/CloverV2/themespkg/public.generic-pc.icns b/CloverPackage/CloverV2/themespkg/public.generic-pc.icns
diff --git a/rEFIt_UEFI/Platform/Settings.cpp b/rEFIt_UEFI/Platform/Settings.cpp
@@ -4234,20 +4234,21 @@ InitTheme(
   }
 
   for (i = 0; i < 3; i++) {
- //   DBG("validate %d face\n", i);
+    DBG("validate %d face\n", i);
     textFace[i].valid = FALSE;
   }
-//  DBG("...done\n");
+  DBG("...done\n");
   NSVGfontChain *fontChain = fontsDB;
   while (fontChain) {
     NSVGfont *font = fontChain->font;
+    DBG("free font %a\n", font->fontFamily);
     NSVGfontChain *nextChain = fontChain->next;
     if (font) {
       nsvg__deleteFont(font);
       fontChain->font = NULL;
     }
     FreePool(fontChain);
-    fontChain = nextChain->next;
+    fontChain = nextChain;
   }
   //as all font freed then free the chain
   fontsDB = NULL;
@@ -4262,7 +4263,7 @@ InitTheme(
   row0TileSize = 144;
   row1TileSize = 64;
   if (FontImage != NULL) {
-//    DBG("free font image\n");  //raster font
+    DBG("free font image\n");  //raster font
     egFreeImage (FontImage);
     FontImage = NULL;
   }
@@ -4271,7 +4272,7 @@ InitTheme(
 
   // Free selection images which are not builtin icons
   for (i = 0; i < 6; i++) {
-//    DBG("free selection %d\n", i);
+    DBG("free selection %d\n", i);
     if (SelectionImages[i] != NULL) {
       if ((SelectionImages[i] != BuiltinIconTable[BUILTIN_SELECTION_SMALL].Image) &&
           (SelectionImages[i] != BuiltinIconTable[BUILTIN_SELECTION_BIG].Image)) {
@@ -4280,20 +4281,20 @@ InitTheme(
       SelectionImages[i] = NULL;
     }
   }
-//  DBG("...done\n");
+  DBG("...done\n");
   // Free banner which is not builtin icon
   if (Banner != NULL) {
     if (Banner != BuiltinIconTable[BUILTIN_ICON_BANNER].Image) {
-//      DBG("free banner\n");
+      DBG("free banner\n");
       egFreeImage (Banner);
     }
     Banner  = NULL;
   }
-//  DBG("...done\n");
+  DBG("...done\n");
   //Free buttons images
   for (i = 0; i < 4; i++) {
     if (Buttons[i] != NULL) {
-//      DBG("free button %d\n", i);
+      DBG("free button %d\n", i);
       egFreeImage(Buttons[i]);
       Buttons[i] = NULL;
     }
@@ -4304,22 +4305,22 @@ InitTheme(
   //here we have no access to Mouse
 
   // Invalidate BuiltinIcons
-//    DBG ("Invalidating BuiltinIcons...\n");
+    DBG ("Invalidating BuiltinIcons...\n");
   for (i = 0; i < BUILTIN_ICON_COUNT; i++) {
     if (BuiltinIconTable[i].Image != NULL) {
-//      DBG("free builtin image %d\n", i);
+      DBG("free builtin image %d\n", i);
       egFreeImage (BuiltinIconTable[i].Image);
       BuiltinIconTable[i].Image = NULL;
     }
   }
-//  DBG("...done\n");
+  DBG("...done\n");
   while (GuiAnime != NULL) {
     GUI_ANIME *NextAnime = GuiAnime->Next;
-//    DBG("free anime %d\n", GuiAnime->ID);
+    DBG("free anime %d\n", GuiAnime->ID);
     FreeAnime (GuiAnime);
     GuiAnime             = NextAnime;
   }
-//  DBG("...done\n");
+  DBG("...done\n");
   GetThemeTagSettings(NULL);
 
   if (ThemesNum > 0 &&