Rf_isNA is FALSE for NaN.

Fixes tidyverse/ggplot2#1482.
r-lib · Jan 25, 2016 · ae775b2 · ae775b2
1 parent 7fc502c
commit ae775b2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -1,6 +1,9 @@
 Version 0.3.0.9000
 ------------------------------------------------------------------------------
 
+* NaN is correctly recognised as a missing value by the gradient palettes
+  (ggplot2#1482).
+
 Version 0.3.0
 ------------------------------------------------------------------------------
 

diff --git a/src/colors.cpp b/src/colors.cpp
@@ -143,7 +143,7 @@ StringVector doColorRampSerial(NumericMatrix colors, NumericVector x, bool alpha
   StringVector result(x.length());
   for (R_len_t i = 0; i < x.length(); i++) {
     double xval = x[i];
-    if (xval < 0 || xval > 1 || R_IsNA(xval)) {
+    if (xval < 0 || xval > 1 || !R_finite(xval)) {
       // Illegal or NA value for this x value.
       result[i] = NA_STRING;
     } else {

diff --git a/tests/testthat/test-colour-ramp.R b/tests/testthat/test-colour-ramp.R
@@ -0,0 +1,10 @@
+context("Colour ramp")
+
+test_that("Special values yield NAs", {
+  pal <- seq_gradient_pal()
+
+  expect_equal(pal(NA), NA_character_)
+  expect_equal(pal(NaN), NA_character_)
+  expect_equal(pal(Inf), NA_character_)
+  expect_equal(pal(-Inf), NA_character_)
+})