diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2020-10-15 11:22:07 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2020-10-18 21:21:18 +0200 |
| commit | 560d3b95840221fe9661d46682af7c4ce897193b (patch) | |
| tree | 48b8e741d128d33d43148fb4668084140b5a2cc3 | |
| parent | fb3965470a79d5b45bd211e9f95775c75e793cc8 (diff) | |
sd: support ink PDF annot. as custom marker
Ink PDF annotation is similar to a set of polylines (or freehand
drawing), so we can again just reuse the polygon code paths. The
difference to the polygon is that the polygon is closed.
Change-Id: I99641dccc0b2f9f2d3ebf2c71d3e20f8b1d0a485
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104367
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
| -rw-r--r-- | include/vcl/pdf/PDFAnnotationMarker.hxx | 5 | ||||
| -rw-r--r-- | sd/source/filter/pdf/sdpdffilter.cxx | 9 | ||||
| -rw-r--r-- | vcl/source/filter/ipdf/pdfread.cxx | 27 |
3 files changed, 40 insertions, 1 deletions
diff --git a/include/vcl/pdf/PDFAnnotationMarker.hxx b/include/vcl/pdf/PDFAnnotationMarker.hxx index 4cf088dc1b8e..f2841b09db6c 100644 --- a/include/vcl/pdf/PDFAnnotationMarker.hxx +++ b/include/vcl/pdf/PDFAnnotationMarker.hxx @@ -35,6 +35,11 @@ struct VCL_DLLPUBLIC PDFAnnotationMarkerSquare : public PDFAnnotationMarker { }; +struct VCL_DLLPUBLIC PDFAnnotationMarkerInk : public PDFAnnotationMarker +{ + std::vector<basegfx::B2DPolygon> maStrokes; +}; + struct VCL_DLLPUBLIC PDFAnnotationMarkerPolygon : public PDFAnnotationMarker { basegfx::B2DPolygon maPolygon; diff --git a/sd/source/filter/pdf/sdpdffilter.cxx b/sd/source/filter/pdf/sdpdffilter.cxx index 28cf7b6902dd..b2866dd1701d 100644 --- a/sd/source/filter/pdf/sdpdffilter.cxx +++ b/sd/source/filter/pdf/sdpdffilter.cxx @@ -145,6 +145,15 @@ bool SdPdfFilter::Import() rCustomAnnotationMarker.maFillColor = pMarker->maFillColor; rCustomAnnotationMarker.maPolygons.push_back(aPoly); } + else if (rPDFAnnotation.meSubType == vcl::pdf::PDFAnnotationSubType::Ink) + { + auto* pMarker = static_cast<vcl::pdf::PDFAnnotationMarkerInk*>( + rPDFAnnotation.mpMarker.get()); + for (auto const& rPolygon : pMarker->maStrokes) + rCustomAnnotationMarker.maPolygons.push_back(rPolygon); + rCustomAnnotationMarker.mnLineWidth = pMarker->mnWidth; + rCustomAnnotationMarker.maFillColor = pMarker->maFillColor; + } } } } diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx index 001303194259..a0e9b51e28a8 100644 --- a/vcl/source/filter/ipdf/pdfread.cxx +++ b/vcl/source/filter/ipdf/pdfread.cxx @@ -257,7 +257,8 @@ findAnnotations(const std::unique_ptr<vcl::pdf::PDFiumPage>& pPage, basegfx::B2D if (eSubtype == vcl::pdf::PDFAnnotationSubType::Text || eSubtype == vcl::pdf::PDFAnnotationSubType::Polygon || eSubtype == vcl::pdf::PDFAnnotationSubType::Circle - || eSubtype == vcl::pdf::PDFAnnotationSubType::Square) + || eSubtype == vcl::pdf::PDFAnnotationSubType::Square + || eSubtype == vcl::pdf::PDFAnnotationSubType::Ink) { OUString sAuthor = pAnnotation->getString(vcl::pdf::constDictionaryKeyTitle); OUString sText = pAnnotation->getString(vcl::pdf::constDictionaryKeyContents); @@ -326,6 +327,30 @@ findAnnotations(const std::unique_ptr<vcl::pdf::PDFiumPage>& pPage, basegfx::B2D if (pAnnotation->hasKey(vcl::pdf::constDictionaryKeyInteriorColor)) pMarker->maFillColor = pAnnotation->getInteriorColor(); } + else if (eSubtype == vcl::pdf::PDFAnnotationSubType::Ink) + { + auto const& rStrokesList = pAnnotation->getInkStrokes(); + if (!rStrokesList.empty()) + { + auto pMarker = std::make_shared<vcl::pdf::PDFAnnotationMarkerInk>(); + rPDFGraphicAnnotation.mpMarker = pMarker; + for (auto const& rStrokes : rStrokesList) + { + basegfx::B2DPolygon aPolygon; + for (auto const& rVertex : rStrokes) + { + double x = convertPointToMm100(rVertex.getX()); + double y = convertPointToMm100(aPageSize.getY() - rVertex.getY()); + aPolygon.append({ x, y }); + } + pMarker->maStrokes.push_back(aPolygon); + } + float fWidth = pAnnotation->getBorderWidth(); + pMarker->mnWidth = convertPointToMm100(fWidth); + if (pAnnotation->hasKey(vcl::pdf::constDictionaryKeyInteriorColor)) + pMarker->maFillColor = pAnnotation->getInteriorColor(); + } + } } } } |