Skip to content

Commit

Permalink
Fix mismatched class/struct declarations in pdf2htmlEX
Browse files Browse the repository at this point in the history
  • Loading branch information
ViliusSutkus89 committed Dec 27, 2023
1 parent 1c0b960 commit 2480313
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 1 deletion.
1 change: 1 addition & 0 deletions pdf2htmlEX/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ tasks.extractSrc {
.patch("cflags.patch")
.patch("missing-tests.patch")
srcDir.patch("make-a-library.patch")
srcDir.patch("mismatched-tags.patch")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion pdf2htmlEX/patches/0.18.8.rc2/make-a-library.patch
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ new file mode 100644
+
+namespace pdf2htmlEX {
+
+ class Param;
+ struct Param;
+
+ class pdf2htmlEX {
+ private:
Expand Down
35 changes: 35 additions & 0 deletions pdf2htmlEX/patches/0.18.8.rc2/mismatched-tags.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
From d8e418bb090e0a11698970107fe5741fc4b2c5f1 Mon Sep 17 00:00:00 2001
From: Vilius Sutkus '89 <Vilius@ViliusSutkus89.com>
Date: Wed, 27 Dec 2023 04:58:42 +0200
Subject: Fix mismatched tags in forward declarations

Param, HTMLRenderer and GuardedPointer are structs, not classes

diff --git a/pdf2htmlEX/src/BackgroundRenderer/BackgroundRenderer.h b/pdf2htmlEX/src/BackgroundRenderer/BackgroundRenderer.h
index 2927484..787785e 100644
--- pdf2htmlEX/src/BackgroundRenderer/BackgroundRenderer.h
+++ pdf2htmlEX/src/BackgroundRenderer/BackgroundRenderer.h
@@ -18,8 +18,8 @@ class OutputDev;

namespace pdf2htmlEX {

-class Param;
-class HTMLRenderer;
+struct Param;
+struct HTMLRenderer;
class BackgroundRenderer
{
public:
diff --git a/pdf2htmlEX/src/StringFormatter.h b/pdf2htmlEX/src/StringFormatter.h
index dd3f3c1..67cd3b5 100644
--- pdf2htmlEX/src/StringFormatter.h
+++ pdf2htmlEX/src/StringFormatter.h
@@ -34,7 +34,7 @@ public:
GuardedPointer operator () (const char * format, ...);

private:
- friend class GuardedPointer;
+ friend struct GuardedPointer;
std::vector<char> buf;
int buf_cnt;
};

0 comments on commit 2480313

Please sign in to comment.