From cd12c420d1fbd790d6b2e77d3b2463a1386f26f3 Mon Sep 17 00:00:00 2001 From: Simon Barthelme Date: Sat, 8 Aug 2015 09:28:15 +0200 Subject: [PATCH] Fixed bug in sRGBtoRGB --- NAMESPACE | 1 + inst/include/CImg.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NAMESPACE b/NAMESPACE index eeb84fad..431e7b1c 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -129,4 +129,5 @@ importFrom(plyr,rename) importFrom(png,readPNG) importFrom(png,writePNG) importFrom(stringr,str_match) +importFrom(stringr,str_split) useDynLib(imager) diff --git a/inst/include/CImg.h b/inst/include/CImg.h index 9e2f0440..e3f5131d 100644 --- a/inst/include/CImg.h +++ b/inst/include/CImg.h @@ -19830,7 +19830,7 @@ namespace cimg_library_suffixed { const Tfloat sval = (Tfloat)*ptr, nsval = (sval<0?0:sval>255?255:sval)/255, - val = (Tfloat)(nsval<=0.04045f?nsval/12.92f:std::pow((nsval + 0.055f)/(1.055f),2.4f)); + val = (Tfloat)(nsval<=0.04045f?nsval/12.92f:std::pow((float) (nsval + 0.055f)/(1.055f),2.4f)); *ptr = (T)(val*255); } return *this;