diff --git a/CMCore b/CMCore
index 676554bc..9376568d 160000
--- a/CMCore
+++ b/CMCore
@@ -1 +1 @@
-Subproject commit 676554bc86ef3bfa70a798e0d52672ab2ae2f034
+Subproject commit 9376568d47e1195a71b67b43d15042765e90cccf
diff --git a/src/SceneGraph/Vulkan/VKTileFont.cpp b/src/SceneGraph/Vulkan/VKTileFont.cpp
index 3fde9601..bfabc10a 100644
--- a/src/SceneGraph/Vulkan/VKTileFont.cpp
+++ b/src/SceneGraph/Vulkan/VKTileFont.cpp
@@ -11,7 +11,7 @@ TileFont *GPUDevice::CreateTileFont(FontSource *fs,int limit_count)
 {
     if(!fs)return(nullptr);
 
-    const uint32_t height=hgl_align2(fs->GetCharHeight()+2,4);  //上下左右各空一个象素，并保证可以被4整除
+    const uint32_t height=hgl_align_pow2(fs->GetCharHeight()+2,4);  //上下左右各空一个象素，并保证可以被4整除
 
     if(limit_count<=0)
     {
diff --git a/src/SceneGraph/font/FontSourceWin.cpp b/src/SceneGraph/font/FontSourceWin.cpp
index 41a63f83..1792f44b 100644
--- a/src/SceneGraph/font/FontSourceWin.cpp
+++ b/src/SceneGraph/font/FontSourceWin.cpp
@@ -118,8 +118,8 @@ namespace hgl
 
             GetGlyphOutlineW(hdc,ch,ggo,&gm,DWORD(buffer.length()),buffer.data(),&mat);
 
-            bmp->metrics_info.w		=((gm.gmBlackBoxX+3)>>2)<<2;
-            bmp->metrics_info.h		=((gm.gmBlackBoxY+3)>>2)<<2;
+            bmp->metrics_info.w		=hgl_align_pow2<uint>(gm.gmBlackBoxX,4);
+            bmp->metrics_info.h		=hgl_align_pow2<uint>(gm.gmBlackBoxY,4);
 
             bmp->metrics_info.x		=gm.gmptGlyphOrigin.x;
             bmp->metrics_info.y		=gm.gmptGlyphOrigin.y;
diff --git a/src/SceneGraph/font/TileFont.cpp b/src/SceneGraph/font/TileFont.cpp
index 0322035e..a8604be0 100644
--- a/src/SceneGraph/font/TileFont.cpp
+++ b/src/SceneGraph/font/TileFont.cpp
@@ -38,7 +38,7 @@ namespace hgl
 
             to_res.Stats(stats,chars_sets.GetData(),chars_sets.GetCount());
 
-            if(stats.non_existent>stats.can_free+tile_data->GetFreeCount())         //不存在的字符数量总量>剩余可释放的闲置项+剩余可用的空余tile
+            if(stats.not_found>stats.can_free+tile_data->GetFreeCount())         //不存在的字符数量总量>剩余可释放的闲置项+剩余可用的空余tile
                 return(false);
 
             uv_map.ClearData();
@@ -46,7 +46,7 @@ namespace hgl
             TileObject *to;
             FontBitmap *bmp;
 
-            if(stats.non_existent>0)
+            if(stats.not_found>0)
             {
                 tile_data->BeginCommit();
                 for(const u32char cp:chars_sets)