-
Notifications
You must be signed in to change notification settings - Fork 6.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[poppler] Fix poppler/paraview name clash (#35472)
Cherry-picked from #35437: Add a test port which covers non-default features of `gdal`. Fix duplicate symbol definition in poppler and paraview found by the test-port. (#35437 (comment). paraview using vtk using gdal using poppler.) Disallow cascaded failure of gdal. --------- Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
- Loading branch information
1 parent
5bf6c06
commit 187b695
Showing
6 changed files
with
61 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
diff --git a/poppler/Gfx.h b/poppler/Gfx.h | ||
index 81a620b..ecfb449 100644 | ||
--- a/poppler/Gfx.h | ||
+++ b/poppler/Gfx.h | ||
@@ -48,7 +48,10 @@ class PDFDoc; | ||
class XRef; | ||
class Array; | ||
class Stream; | ||
+namespace poppler_private { | ||
class Parser; | ||
+} | ||
+using namespace poppler_private; | ||
class Dict; | ||
class Function; | ||
class OutputDev; | ||
diff --git a/poppler/Parser.h b/poppler/Parser.h | ||
index b379b67..c3d85bd 100644 | ||
--- a/poppler/Parser.h | ||
+++ b/poppler/Parser.h | ||
@@ -33,6 +33,7 @@ | ||
// Parser | ||
//------------------------------------------------------------------------ | ||
|
||
+namespace poppler_private { | ||
class POPPLER_PRIVATE_EXPORT Parser | ||
{ | ||
public: | ||
@@ -72,5 +73,7 @@ private: | ||
void shift(int objNum = -1); | ||
void shift(const char *cmdA, int objNum); | ||
}; | ||
+} | ||
+using namespace poppler_private; | ||
|
||
#endif | ||
diff --git a/poppler/XRef.h b/poppler/XRef.h | ||
index e2b2ca8..7d6acbb 100644 | ||
--- a/poppler/XRef.h | ||
+++ b/poppler/XRef.h | ||
@@ -46,7 +46,10 @@ | ||
|
||
class Dict; | ||
class Stream; | ||
+namespace poppler_private { | ||
class Parser; | ||
+} | ||
+using namespace poppler_private; | ||
class ObjectStream; | ||
|
||
//------------------------------------------------------------------------ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters