Skip to content

Commit 94236a2

Browse files
committed
Install CRAN's patch
From @pmur002 Closes #89
1 parent bd7f9cb commit 94236a2

File tree

3 files changed

+32
-3
lines changed

3 files changed

+32
-3
lines changed

R/utils.R

+3
Original file line numberDiff line numberDiff line change
@@ -203,3 +203,6 @@ next_element <- function(element, group, direction = 1) {
203203

204204
group[next_position]
205205
}
206+
207+
# Silence R CMD check NOTE
208+
freetypeharfbuzz::font_info

src/.gitignore

-3
This file was deleted.

src/devSVG.cpp

+29
Original file line numberDiff line numberDiff line change
@@ -673,6 +673,23 @@ void svg_raster(unsigned int *raster, int w, int h,
673673
stream->flush();
674674
}
675675

676+
SEXP svg_set_pattern(SEXP pattern, pDevDesc dd) {
677+
return R_NilValue;
678+
}
679+
680+
void svg_release_pattern(SEXP ref, pDevDesc dd) {}
681+
682+
SEXP svg_set_clip_path(SEXP path, SEXP ref, pDevDesc dd) {
683+
return R_NilValue;
684+
}
685+
686+
void svg_release_clip_path(SEXP ref, pDevDesc dd) {}
687+
688+
SEXP svg_set_mask(SEXP path, SEXP ref, pDevDesc dd) {
689+
return R_NilValue;
690+
}
691+
692+
void svg_release_mask(SEXP ref, pDevDesc dd) {}
676693

677694
pDevDesc svg_driver_new(SvgStreamPtr stream, int bg, double width,
678695
double height, double pointsize,
@@ -708,6 +725,14 @@ pDevDesc svg_driver_new(SvgStreamPtr stream, int bg, double width,
708725
dd->metricInfo = svg_metric_info;
709726
dd->cap = NULL;
710727
dd->raster = svg_raster;
728+
#if R_GE_version >= 13
729+
dd->setPattern = svg_set_pattern;
730+
dd->releasePattern = svg_release_pattern;
731+
dd->setClipPath = svg_set_clip_path;
732+
dd->releaseClipPath = svg_release_clip_path;
733+
dd->setMask = svg_set_mask;
734+
dd->releaseMask = svg_release_mask;
735+
#endif
711736

712737
// UTF-8 support
713738
dd->wantSymbolUTF8 = (Rboolean) 1;
@@ -741,6 +766,10 @@ pDevDesc svg_driver_new(SvgStreamPtr stream, int bg, double width,
741766
dd->haveTransparency = 2;
742767
dd->haveTransparentBg = 2;
743768

769+
#if R_GE_version >= 13
770+
dd->deviceVersion = R_GE_definitions;
771+
#endif
772+
744773
dd->deviceSpecific = new SVGDesc(stream, standalone, aliases);
745774
return dd;
746775
}

0 commit comments

Comments
 (0)