Adapt to new poppler API


(martin)

$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.cpp,v 1.19 2022/09/04 07:55:02 martin Exp $

Adapt to new poppler API

--- src/extension/internal/pdfinput/pdf-parser.cpp.orig	2022-05-07 15:43:15.000000000 +0200
+++ src/extension/internal/pdfinput/pdf-parser.cpp	2022-09-04 09:43:47.958399506 +0200
@@ -685,19 +685,18 @@ void PdfParser::opConcat(Object args[], 
 // TODO not good that numArgs is ignored but args[] is used:
 void PdfParser::opSetDash(Object args[], int /*numArgs*/)
 {
-  double *dash = nullptr;
+  std::vector<double> dash;
 
   Array *a = args[0].getArray();
   int length = a->getLength();
   if (length != 0) {
-    dash = (double *)gmallocn(length, sizeof(double));
     for (int i = 0; i < length; ++i) {
       Object obj;
-      dash[i] = _POPPLER_CALL_ARGS_DEREF(obj, a->get, i).getNum();
+      dash.push_back(_POPPLER_CALL_ARGS_DEREF(obj, a->get, i).getNum());
       _POPPLER_FREE(obj);
     }
   }
-  state->setLineDash(dash, length, args[1].getNum());
+  state->setLineDash(std::move(dash), args[1].getNum());
   builder->updateStyle(state);
 }
 

$NetBSD: patch-src_extension_internal_pdfinput_svg-builder.cpp,v 1.8 2022/09/04 07:55:02 martin Exp $

Adapt to new poppler API

--- src/extension/internal/pdfinput/svg-builder.cpp.orig	2022-05-07 15:43:15.000000000 +0200
+++ src/extension/internal/pdfinput/svg-builder.cpp	2022-09-04 09:46:02.599786816 +0200
@@ -388,15 +388,13 @@ void SvgBuilder::_setStrokeStyle(SPCSSAt
     sp_repr_css_set_property(css, "stroke-miterlimit", os_ml.str().c_str());
 
     // Line dash
-    double *dash_pattern;
-    int dash_length;
     double dash_start;
-    state->getLineDash(&dash_pattern, &dash_length, &dash_start);
-    if ( dash_length > 0 ) {
+    auto dash_pattern = state->getLineDash(&dash_start);
+    if ( !dash_pattern.empty() ) {
         Inkscape::CSSOStringStream os_array;
-        for ( int i = 0 ; i < dash_length ; i++ ) {
+        for ( size_t i = 0; i < dash_pattern.size(); i++ ) {
             os_array << dash_pattern[i];
-            if (i < (dash_length - 1)) {
+            if (i < (dash_pattern.size() - 1)) {
                 os_array << ",";
             }
         }