Fix the FontGlyphFace::makeScale() method when the scale factor < 0.

Tencent · Dec 10, 2024 · 09d3c05 · 09d3c05
1 parent 413e3d8
commit 09d3c05
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/core/FontGlyphFace.cpp b/src/core/FontGlyphFace.cpp
@@ -36,7 +36,7 @@ bool FontGlyphFace::hasOutlines() const {
 }
 
 std::shared_ptr<GlyphFace> FontGlyphFace::makeScaled(float scale) {
-  if (FloatNearlyZero(scale)) {
+  if (scale <= 0) {
     return nullptr;
   }
   auto size = _font.getSize() * scale;

diff --git a/src/core/GlyphRunList.cpp b/src/core/GlyphRunList.cpp
@@ -58,9 +58,7 @@ Rect GlyphRunList::getBounds(float resolutionScale) const {
     if (hasScale) {
       // Scale the glyphs before measuring to prevent precision loss with small font sizes.
       glyphFace = glyphFace->makeScaled(resolutionScale);
-      if (glyphFace == nullptr) {
-        return Rect::MakeEmpty();
-      }
+      DEBUG_ASSERT(glyphFace != nullptr);
     }
     size_t index = 0;
     auto& positions = run.positions;
@@ -89,9 +87,7 @@ bool GlyphRunList::getPath(Path* path, float resolutionScale) const {
     if (hasScale) {
       // Scale the glyphs before measuring to prevent precision loss with small font sizes.
       glyphFace = glyphFace->makeScaled(resolutionScale);
-      if (glyphFace == nullptr) {
-        return false;
-      }
+      DEBUG_ASSERT(glyphFace != nullptr);
     }
     size_t index = 0;
     auto& positions = run.positions;