vcpkg/ports/vtk/fix-libharu2.4-compat.patch
Roel Standaert 65521f7dc3
[libharu,wt] Update libharu to 2.4.2 and Wt to 4.8.1 (#26945)
* [libharu] Update to 2.4.2

I updated the patches for libharu so they apply to 2.4.2 properly.
The target name changed from haru to hpdf, the haru imported
library is included for backwards compatibility. I added a usage
file that only mentions hpdf.

I added a patch for VTK so that it compiles with libharu 2.4.x,
since the type of one the HPDF_Page_SetDash arguments changed
from HPDF_UINT16 to HPDF_REAL.

POCO also has an optional libharu dependency when the 'pdf'
feature is enabled, but at the moment the PocoPDF library
doesn't seem to be built even when enabled.

* [wt] Update to 4.8.1

This release fixes compatibility with libharu 2.4.x
2022-09-30 14:52:19 -07:00

33 lines
1.3 KiB
Diff

diff --git a/IO/ExportPDF/vtkPDFContextDevice2D.cxx b/IO/ExportPDF/vtkPDFContextDevice2D.cxx
index a51945dc9b..1cbc3945af 100644
--- a/IO/ExportPDF/vtkPDFContextDevice2D.cxx
+++ b/IO/ExportPDF/vtkPDFContextDevice2D.cxx
@@ -1631,21 +1631,21 @@ void vtkPDFContextDevice2D::ApplyLineWidth(float width)
void vtkPDFContextDevice2D::ApplyLineType(int type)
{
// These match the OpenGL2 implementation:
- static const HPDF_UINT16 noPen[] = { 0, 10 };
+ static const HPDF_REAL noPen[] = { 0, 10 };
static const HPDF_UINT noPenLen = 2;
- static const HPDF_UINT16 dash[] = { 8 };
+ static const HPDF_REAL dash[] = { 8 };
static const HPDF_UINT dashLen = 1;
- static const HPDF_UINT16 dot[] = { 1, 7 };
- static const HPDF_UINT16 denseDot[] = { 1, 3 };
+ static const HPDF_REAL dot[] = { 1, 7 };
+ static const HPDF_REAL denseDot[] = { 1, 3 };
static const HPDF_UINT dotLen = 2;
- static const HPDF_UINT16 dashDot[] = { 4, 6, 2, 4 };
+ static const HPDF_REAL dashDot[] = { 4, 6, 2, 4 };
static const HPDF_UINT dashDotLen = 4;
// This is dash-dot-dash, but eh. It matches the OpenGL2 0x1C47 pattern.
- static const HPDF_UINT16 dashDotDot[] = { 3, 3, 1, 3, 3, 3 };
+ static const HPDF_REAL dashDotDot[] = { 3, 3, 1, 3, 3, 3 };
static const HPDF_UINT dashDotDotLen = 6;
switch (type)