Fix #87 - make sure that filename is converted correctly to UTF-8

r-lib · Oct 6, 2021 · 9a6508c · 9a6508c
1 parent add0172
commit 9a6508c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -9,6 +9,7 @@
   to devices that doesn't support alpha (notably jpeg) (#91)
 * ragg now defers symbol font resolving to systemfonts which makes it possible 
   to register alternative symbol fonts using `register_font()` (#90)
+* Filenames in UTF-8 are now treated correctly on Windows (#87)
 
 # ragg 1.1.3
 

diff --git a/src/jpeg_dev.cpp b/src/jpeg_dev.cpp
@@ -14,7 +14,7 @@ SEXP agg_jpeg_c(SEXP file, SEXP width, SEXP height, SEXP pointsize, SEXP bg,
 
   BEGIN_CPP
     AggDeviceJpegNoAlpha* device = new AggDeviceJpegNoAlpha(
-      CHAR(STRING_ELT(file, 0)), 
+      Rf_translateCharUTF8((STRING_ELT(file, 0))), 
       INTEGER(width)[0], 
       INTEGER(height)[0], 
       REAL(pointsize)[0], 

diff --git a/src/png_dev.cpp b/src/png_dev.cpp
@@ -13,7 +13,7 @@ SEXP agg_png_c(SEXP file, SEXP width, SEXP height, SEXP pointsize, SEXP bg,
   if (bit8) {
     if (R_OPAQUE(bgCol)) { // Opaque bg... no need for alpha channel
       AggDevicePngNoAlpha* device = new AggDevicePngNoAlpha(
-        CHAR(STRING_ELT(file, 0)), 
+        Rf_translateCharUTF8((STRING_ELT(file, 0))), 
         INTEGER(width)[0], 
         INTEGER(height)[0], 
         REAL(pointsize)[0], 
@@ -24,7 +24,7 @@ SEXP agg_png_c(SEXP file, SEXP width, SEXP height, SEXP pointsize, SEXP bg,
       makeDevice<AggDevicePngNoAlpha>(device, "agg_png");
     } else {
       AggDevicePngAlpha* device = new AggDevicePngAlpha(
-        CHAR(STRING_ELT(file, 0)), 
+        Rf_translateCharUTF8((STRING_ELT(file, 0))), 
         INTEGER(width)[0], 
         INTEGER(height)[0], 
         REAL(pointsize)[0], 
@@ -37,7 +37,7 @@ SEXP agg_png_c(SEXP file, SEXP width, SEXP height, SEXP pointsize, SEXP bg,
   } else {
     if (R_OPAQUE(bgCol)) { // Opaque bg... no need for alpha channel
       AggDevicePng16NoAlpha* device = new AggDevicePng16NoAlpha(
-        CHAR(STRING_ELT(file, 0)), 
+        Rf_translateCharUTF8((STRING_ELT(file, 0))), 
         INTEGER(width)[0], 
         INTEGER(height)[0], 
         REAL(pointsize)[0], 
@@ -48,7 +48,7 @@ SEXP agg_png_c(SEXP file, SEXP width, SEXP height, SEXP pointsize, SEXP bg,
       makeDevice<AggDevicePng16NoAlpha>(device, "agg_png");
     } else {
       AggDevicePng16Alpha* device = new AggDevicePng16Alpha(
-        CHAR(STRING_ELT(file, 0)), 
+        Rf_translateCharUTF8((STRING_ELT(file, 0))), 
         INTEGER(width)[0], 
         INTEGER(height)[0], 
         REAL(pointsize)[0], 
@@ -71,7 +71,7 @@ SEXP agg_supertransparent_c(SEXP file, SEXP width, SEXP height, SEXP pointsize,
   BEGIN_CPP
   if (R_OPAQUE(bgCol)) { // Opaque bg... no need for alpha channel
     AggDevicePng16NoAlpha* device = new AggDevicePng16NoAlpha(
-      CHAR(STRING_ELT(file, 0)), 
+      Rf_translateCharUTF8((STRING_ELT(file, 0))), 
       INTEGER(width)[0], 
       INTEGER(height)[0], 
       REAL(pointsize)[0], 
@@ -83,7 +83,7 @@ SEXP agg_supertransparent_c(SEXP file, SEXP width, SEXP height, SEXP pointsize,
     makeDevice<AggDevicePng16NoAlpha>(device, "agg_png");
   } else {
     AggDevicePng16Alpha* device = new AggDevicePng16Alpha(
-      CHAR(STRING_ELT(file, 0)), 
+      Rf_translateCharUTF8((STRING_ELT(file, 0))), 
       INTEGER(width)[0], 
       INTEGER(height)[0], 
       REAL(pointsize)[0], 

diff --git a/src/ppm_dev.cpp b/src/ppm_dev.cpp
@@ -13,7 +13,7 @@ SEXP agg_ppm_c(SEXP file, SEXP width, SEXP height, SEXP pointsize, SEXP bg,
 
   BEGIN_CPP
   AggDevicePpmNoAlpha* device = new AggDevicePpmNoAlpha(
-    CHAR(STRING_ELT(file, 0)), 
+    Rf_translateCharUTF8((STRING_ELT(file, 0))), 
     INTEGER(width)[0], 
     INTEGER(height)[0], 
     REAL(pointsize)[0], 

diff --git a/src/tiff_dev.cpp b/src/tiff_dev.cpp
@@ -14,7 +14,7 @@ SEXP agg_tiff_c(SEXP file, SEXP width, SEXP height, SEXP pointsize, SEXP bg,
   if (bit8) {
     if (R_OPAQUE(bgCol)) { // Opaque bg... no need for alpha channel
       AggDeviceTiffNoAlpha* device = new AggDeviceTiffNoAlpha(
-        CHAR(STRING_ELT(file, 0)), 
+        Rf_translateCharUTF8((STRING_ELT(file, 0))), 
         INTEGER(width)[0], 
         INTEGER(height)[0], 
         REAL(pointsize)[0], 
@@ -27,7 +27,7 @@ SEXP agg_tiff_c(SEXP file, SEXP width, SEXP height, SEXP pointsize, SEXP bg,
       makeDevice<AggDeviceTiffNoAlpha>(device, "agg_tiff");
     } else {
       AggDeviceTiffAlpha* device = new AggDeviceTiffAlpha(
-        CHAR(STRING_ELT(file, 0)), 
+        Rf_translateCharUTF8((STRING_ELT(file, 0))), 
         INTEGER(width)[0], 
         INTEGER(height)[0], 
         REAL(pointsize)[0], 
@@ -42,7 +42,7 @@ SEXP agg_tiff_c(SEXP file, SEXP width, SEXP height, SEXP pointsize, SEXP bg,
   } else {
     if (R_OPAQUE(bgCol)) { // Opaque bg... no need for alpha channel
       AggDeviceTiff16NoAlpha* device = new AggDeviceTiff16NoAlpha(
-        CHAR(STRING_ELT(file, 0)), 
+        Rf_translateCharUTF8((STRING_ELT(file, 0))), 
         INTEGER(width)[0], 
         INTEGER(height)[0], 
         REAL(pointsize)[0], 
@@ -55,7 +55,7 @@ SEXP agg_tiff_c(SEXP file, SEXP width, SEXP height, SEXP pointsize, SEXP bg,
       makeDevice<AggDeviceTiff16NoAlpha>(device, "agg_png");
     } else {
       AggDeviceTiff16Alpha* device = new AggDeviceTiff16Alpha(
-        CHAR(STRING_ELT(file, 0)), 
+        Rf_translateCharUTF8((STRING_ELT(file, 0))), 
         INTEGER(width)[0], 
         INTEGER(height)[0], 
         REAL(pointsize)[0],