docker issue

engine/CMakeLists.txt

@@ -5,32 +5,18 @@ configure_file(
 
 find_package(PNG REQUIRED)
 
-add_library(pdfengine STATIC
+add_library(pdfengine OBJECT
     src/core/engine_info.cpp
     src/core/graphics_state.cpp
     src/core/display_list.cpp
     src/core/path_interpreter.cpp
     src/core/skia_renderer.cpp
-    src/parser/pdfium_loader.cpp
-    src/parser/pdfium_document.cpp
-    src/parser/pdfium_internal.cpp
-    src/parser/pdfium_reflow.cpp
-    src/parser/pdfium_page.cpp
-    src/parser/pdfium_page_model.cpp
-    src/parser/pdfium_fonts.cpp
-    src/parser/pdfium_edit.cpp
-    src/parser/pdfium_edit_replace.cpp
-    src/parser/pdfium_edit_reflow.cpp
-    src/parser/pdfium_edit_annotations.cpp
-    src/parser/pdfium_edit_pages.cpp
-    src/parser/pdfium_edit_images.cpp
     src/parser/content_stream_parser.cpp
     src/parser/decoration_builder.cpp
     src/text/selection.cpp
     src/fonts/face/font_face.cpp
     src/fonts/face/free_type_manager.cpp
     src/fonts/loader/font_resolver.cpp
-    src/fonts/pdf_fonts/font_loader.cpp
     src/fonts/shaping/hb_shaper.cpp
     src/fonts/cache/glyph_bitmap.cpp
     src/fonts/cache/glyph_cache.cpp
@@ -48,6 +34,7 @@ add_library(pdfengine STATIC
     src/fonts/pdf_fonts/encoding/cjk_collection_db.cpp
 )
 add_library(pdfengine::pdfengine ALIAS pdfengine)
+set_target_properties(pdfengine PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 target_include_directories(pdfengine
     PUBLIC
@@ -69,8 +56,26 @@ target_link_libraries(pdfengine
 )
 
 if(PDFENGINE_WITH_PDFIUM)
+    target_sources(pdfengine PRIVATE
+        src/parser/pdfium_loader.cpp
+        src/parser/pdfium_document.cpp
+        src/parser/pdfium_internal.cpp
+        src/parser/pdfium_reflow.cpp
+        src/parser/pdfium_page.cpp
+        src/parser/pdfium_page_model.cpp
+        src/parser/pdfium_fonts.cpp
+        src/parser/pdfium_edit.cpp
+        src/parser/pdfium_edit_replace.cpp
+        src/parser/pdfium_edit_reflow.cpp
+        src/parser/pdfium_edit_annotations.cpp
+        src/parser/pdfium_edit_pages.cpp
+        src/parser/pdfium_edit_images.cpp
+    )
     target_link_libraries(pdfengine PRIVATE pdfium::pdfium)
-    target_compile_definitions(pdfengine PRIVATE PDFENGINE_WITH_PDFIUM)
+    target_compile_definitions(pdfengine PUBLIC PDFENGINE_WITH_PDFIUM)
+    # PDFium statically bundles its own libjpeg, zlib, etc. which conflicts with vcpkg.
+    # We use LLD, so we can safely allow multiple definitions to pick the first one.
+    target_link_options(pdfengine PUBLIC "-Wl,--allow-multiple-definition")
 endif()
 
 if(EMSCRIPTEN)

engine/include/pdfengine/display_list.hpp

@@ -32,34 +32,34 @@ struct SetTransformCommand : public Command {
 
 struct FillRectCommand : public Command {
     float x, y, width, height;
-    FillRectCommand(float x, float y, float w, float h) : x(x), y(y), width(w), height(h) {}
+    FillRectCommand(float _x, float _y, float w, float h) : x(_x), y(_y), width(w), height(h) {}
     void accept(CommandVisitor& visitor) const override;
 };
 
 struct DrawTextCommand : public Command {
     std::string text;
     float x, y;
-    DrawTextCommand(std::string text, float x, float y) : text(std::move(text)), x(x), y(y) {}
+    DrawTextCommand(std::string _text, float _x, float _y) : text(std::move(_text)), x(_x), y(_y) {}
     void accept(CommandVisitor& visitor) const override;
 };
 
 struct FillPathCommand : public Command {
     Path path;
     FillRule rule;
-    explicit FillPathCommand(Path path, FillRule rule = FillRule::NonZero) : path(std::move(path)), rule(rule) {}
+    explicit FillPathCommand(Path _path, FillRule _rule = FillRule::NonZero) : path(std::move(_path)), rule(_rule) {}
     void accept(CommandVisitor& visitor) const override;
 };
 
 struct StrokePathCommand : public Command {
     Path path;
-    explicit StrokePathCommand(Path path) : path(std::move(path)) {}
+    explicit StrokePathCommand(Path _path) : path(std::move(_path)) {}
     void accept(CommandVisitor& visitor) const override;
 };
 
 struct FillStrokePathCommand : public Command {
     Path path;
     FillRule rule;
-    explicit FillStrokePathCommand(Path path, FillRule rule = FillRule::NonZero) : path(std::move(path)), rule(rule) {}
+    explicit FillStrokePathCommand(Path _path, FillRule _rule = FillRule::NonZero) : path(std::move(_path)), rule(_rule) {}
     void accept(CommandVisitor& visitor) const override;
 };
 

engine/include/pdfengine/graphics_state.hpp

@@ -11,8 +11,8 @@ struct Matrix {
     float e = 0.0f, f = 0.0f;
 
     Matrix() = default;
-    Matrix(float a, float b, float c, float d, float e, float f)
-        : a(a), b(b), c(c), d(d), e(e), f(f) {}
+    Matrix(float _a, float _b, float _c, float _d, float _e, float _f)
+        : a(_a), b(_b), c(_c), d(_d), e(_e), f(_f) {}
 
     [[nodiscard]] Matrix multiply(const Matrix& other) const noexcept;
 

engine/tests/CMakeLists.txt

@@ -38,6 +38,10 @@ if(PDFENGINE_WITH_SKIA)
     target_link_libraries(pdfengine_smoke PRIVATE skia::skia)
 endif()
 
+if(PDFENGINE_WITH_PDFIUM)
+    target_link_libraries(pdfengine_smoke PRIVATE pdfium::pdfium)
+endif()
+
 if(PDFENGINE_WITH_QPDF)
     target_link_libraries(pdfengine_smoke PRIVATE qpdf::libqpdf ZLIB::ZLIB JPEG::JPEG)
 endif()