sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

-Fixed issue with VS2017 compiling

Browse source
This commit is contained in:
Joshua Hintze 2021-10-15 19:31:45 -06:00
parent 0edb018465
commit 15798e6ebb
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/mapnik/util/char_array_buffer.hpp
View file

@ -24,6 +24,7 @@
#define MAPNIK_UTIL_CHAR_ARRAY_BUFFER_HPP
#include <streambuf>
#include <algorithm>
namespace mapnik { namespace util {
@ -71,16 +72,16 @@ private:
pos_type seekpos(pos_type off,
std::ios_base::openmode /*which*/)
{
current_ = std::min(begin_ + off, end_);
current_ = (std::min)(begin_ + off, end_);
return pos_type(off_type(current_ - begin_));
}
pos_type seekoff(off_type off, std::ios_base::seekdir dir,
std::ios_base::openmode which = std::ios_base::in | std::ios_base::out )
{
if (dir == std::ios_base::beg) current_ = std::min(begin_ + off, end_);
else if (dir == std::ios_base::cur) current_ = std::min(current_ + off, end_);
else current_ = std::max(end_ - off, begin_); // dir == std::ios_base::end
if (dir == std::ios_base::beg) current_ = (std::min)(begin_ + off, end_);
else if (dir == std::ios_base::cur) current_ = (std::min)(current_ + off, end_);
else current_ = (std::max)(end_ - off, begin_); // dir == std::ios_base::end
return pos_type(off_type(current_ - begin_));
}
char const * const begin_;

1
src/webp_reader.cpp
View file

@ -39,6 +39,7 @@ MAPNIK_DISABLE_WARNING_POP
// stl
#include <fstream>
#include <memory>
#include <algorithm>
namespace mapnik
{