Fix FT_Load_Sfnt_Table() return code check in tryExtractDataFromTTC

rc == 0 is success. Also finally tested TTC extraction. Should fix #150
podofo · Apr 6, 2024 · d22584c · d22584c
1 parent 4b6d1a1
commit d22584c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/extern/resources b/extern/resources
diff --git a/src/podofo/private/FreetypePrivate.cpp b/src/podofo/private/FreetypePrivate.cpp
@@ -182,7 +182,7 @@ bool tryExtractDataFromTTC(FT_Face face, charbuff& buffer)
     uint32_t tag;
     size = sizeof(FT_ULong);
     rc = FT_Load_Sfnt_Table(face, 0, 0, (FT_Byte*)&tag, &size);
-    if (rc == 0 || FROM_BIG_ENDIAN(tag) != TTAG_ttcf)
+    if (rc != 0 || FROM_BIG_ENDIAN(tag) != TTAG_ttcf)
         return false;
 
     // First read the TTC font header and then determine the face offset

diff --git a/test/unit/DeviceTest.cpp b/test/unit/DeviceTest.cpp
@@ -41,11 +41,11 @@ TEST_CASE("TestStreamedDocument")
     auto testPath = TestUtils::GetTestOutputFilePath("TestStreamedDocument.pdf");
     PdfStreamedDocument document(testPath);
     auto& page = document.GetPages().CreatePage(PdfPage::CreateStandardPageSize(PdfPageSize::A4));
-    auto font = document.GetFonts().SearchFont("LiberationSans");
-    REQUIRE(font != nullptr);
+    // NOTE: use a TTC version of the LiberationSans format to test TTC extraction
+    auto& font = document.GetFonts().GetOrCreateFont(TestUtils::GetTestInputFilePath("Fonts", "LiberationSans.ttc"), 2);
     PdfPainter painter;
     painter.SetCanvas(page);
-    painter.TextState.SetFont(*font, 18);
+    painter.TextState.SetFont(font, 18);
     painter.DrawText("Hello World!", 56.69, page.GetRect().Height - 56.69);
     painter.FinishDrawing();
 }