[terminal_renderer] TextRenderer: Fixes a problem with oversized glyp…

…hs being wrongly cut off (#821).
contour-terminal · Sep 19, 2022 · e6fd4b3 · e6fd4b3
1 parent c5b4a40
commit e6fd4b3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/metainfo.xml b/metainfo.xml
@@ -102,7 +102,7 @@
     <release version="0.3.5" urgency="medium" type="development">
       <description>
         <ul>
-          <li> ... </li>
+          <li>Fixes a problem with oversized glyphs being wrongly cut off (#821).</li>
         </ul>
       </description>
     </release>

diff --git a/src/terminal_renderer/TextRenderer.cpp b/src/terminal_renderer/TextRenderer.cpp
@@ -368,14 +368,21 @@ void TextRenderer::restrictToTileSize(TextureAtlas::TileCreateData& tileCreateDa
     auto const subSize = ImageSize { subWidth, tileCreateData.bitmapSize.height };
     auto const subPitch = unbox<uintptr_t>(subSize.width) * colorComponentCount;
     auto const xOffset = 0;
+    auto const sourcePitch = unbox<uintptr_t>(tileCreateData.bitmapSize.width) * colorComponentCount;
 
     auto slicedBitmap = vector<uint8_t>(subSize.area() * colorComponentCount);
 
+    if (RasterizerLog)
+        RasterizerLog()("Cutting off oversized {} tile from {} down to {}.",
+                        tileCreateData.bitmapFormat,
+                        tileCreateData.bitmapSize,
+                        _textureAtlas->tileSize());
+
     for (uintptr_t rowIndex = 0; rowIndex < unbox<uintptr_t>(subSize.height); ++rowIndex)
     {
         uint8_t* targetRow = slicedBitmap.data() + rowIndex * subPitch;
         uint8_t const* sourceRow =
-            tileCreateData.bitmap.data() + rowIndex * subPitch + uintptr_t(xOffset) * colorComponentCount;
+            tileCreateData.bitmap.data() + rowIndex * sourcePitch + uintptr_t(xOffset) * colorComponentCount;
         Require(sourceRow + subPitch <= tileCreateData.bitmap.data() + tileCreateData.bitmap.size());
         std::memcpy(targetRow, sourceRow, subPitch);
     }