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

Removed unrequired MAPNIK_DECL from src/image_util_jpeg added pragma to prevent warning on linux with clang.

Browse source
This commit is contained in:
Blake Thompson 2015-08-12 13:00:04 -05:00
parent da6af4fa11
commit 10ad41d218
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/mapnik/value.hpp
View file

@ -992,6 +992,10 @@ inline bool value::is_null() const
// support for std::unordered_xxx // support for std::unordered_xxx
namespace std namespace std
{ {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wmismatched-tags"
template <> template <>
struct hash<mapnik::value> struct hash<mapnik::value>
{ {
@ -1001,6 +1005,8 @@ struct hash<mapnik::value>
} }
}; };
#pragma clang diagnostic pop
} }
#endif // MAPNIK_VALUE_HPP #endif // MAPNIK_VALUE_HPP

2
src/image_util_jpeg.cpp
View file

@ -43,7 +43,7 @@ jpeg_saver::jpeg_saver(std::ostream & stream, std::string const& t)
namespace detail { namespace detail {
MAPNIK_DECL int parse_jpeg_quality(std::string const& params) int parse_jpeg_quality(std::string const& params)
{ {
int quality = 85; int quality = 85;
if (params != "jpeg") if (params != "jpeg")