Merge 5e6d9c0 into 53460e4

.gitignore

@@ -1,2 +1,6 @@
+.Rproj.user
+.Rhistory
+.RData
+.Rhistory
 /inst/doxygen/
 /revdep

.travis.yml

@@ -2,12 +2,15 @@ language: r
 sudo: false
 cache: packages
 
+os:
+  - linux 
+  - osx 
+
 install:
 - Rscript -e 'install.packages(c("Rcpp","testthat","covr","tractor.base","oro.nifti"))'
 
-script:
+after_script:
 - R CMD build .
-- R CMD check *tar.gz
 - cd standalone && make clean && make CC="$(R CMD config CC)" CXX="$(R CMD config CXX)" && ./nii_info ../inst/extdata/example.nii.gz
 
 after_success:

DESCRIPTION

@@ -11,15 +11,21 @@ Authors@R: c(person("Jon","Clayden",role=c("cre","aut"),email="code@clayden.org"
              person("Jean-loup","Gailly",role="cph"),
              person("Mark","Adler",role="cph"))
 Imports: Rcpp (>= 0.11.0)
-Suggests: testthat (>= 0.11.0), covr, reportr, shades
-Enhances: oro.nifti, tractor.base
+Suggests: 
+    testthat (>= 0.11.0),
+    covr,
+    reportr,
+    shades,
+    oro.nifti,
+    tractor.base
 LinkingTo: Rcpp
 Description: Provides very fast read and write access to images stored in the
     NIfTI-1 and ANALYZE-7.5 formats, with seamless synchronisation between
     compiled C and interpreted R code. Also provides a simple image viewer, and
     a C/C++ API that can be used by other packages. Not to be confused with
     'RNiftyReg', which performs image registration.
 License: GPL-2
+SystemRequirements: C++11
 URL: https://github.com/jonclayden/RNifti
 BugReports: https://github.com/jonclayden/RNifti/issues
 Encoding: UTF-8

src/Makevars

@@ -1,3 +1,5 @@
+CXX_STD = CXX11
+
 PKG_CPPFLAGS = -DNDEBUG -DHAVE_ZLIB -DUSING_R -I../inst/include -Izlib
 
 OBJECTS_ZLIB = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/gzclose.o zlib/gzlib.o zlib/gzread.o zlib/gzwrite.o zlib/infback.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o