OSX and linux build fixes

This commit is contained in:
tamasmeszaros 2018-05-22 10:15:15 +02:00
parent 1f01dbb1ec
commit e36164c76b
2 changed files with 3 additions and 2 deletions

View File

@ -1334,7 +1334,8 @@ public:
} }
inline void beginLayer() { inline void beginLayer() {
layers_rst_.emplace_back(Raster(res_, pxdim_), std::stringstream()); layers_rst_.emplace_back();
layers_rst_.front().first.reset(res_, pxdim_);
} }
inline void finishLayer(unsigned lyr_id) { inline void finishLayer(unsigned lyr_id) {

View File

@ -16,7 +16,7 @@
#include <agg/agg_path_storage.h> #include <agg/agg_path_storage.h>
// For png compression // For png compression
#ifdef WIN32 #if defined(WIN32) || defined(__APPLE__ )
inline char *strerror_r(int errnum, char *buf, size_t buflen) { inline char *strerror_r(int errnum, char *buf, size_t buflen) {
strerror_s(buf, buflen, errnum); strerror_s(buf, buflen, errnum);
return buf; return buf;