From 7302b3b65492e0b9e7106f9887bbbefe101f4728 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Fri, 24 May 2013 16:45:02 -0700
Subject: [PATCH] fix #1865

---
 INSTALL.md                                 | 2 +-
 include/mapnik/filter_factory.hpp          | 6 ++++++
 include/mapnik/palette.hpp                 | 1 -
 plugins/input/sqlite/sqlite_connection.hpp | 2 --
 src/cairo_context.cpp                      | 1 -
 src/cairo_renderer.cpp                     | 5 -----
 src/projection.cpp                         | 4 ++++
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index fd5300cbf..156f9b3dc 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -65,7 +65,7 @@ Note: Python3k is supported, see: https://github.com/mapnik/mapnik/wiki/Python3k
 
 Optional dependencies:
 
- * Cairo - Graphics library for output formats like PDF, PS, and SVG
+ * Cairo >= 1.6.0 - Graphics library for output formats like PDF, PS, and SVG
     - pkg-config - Required for building with cairo support
     - pycairo - Python bindings for cairo
  * libpq - PostgreSQL libraries (For PostGIS plugin support)
diff --git a/include/mapnik/filter_factory.hpp b/include/mapnik/filter_factory.hpp
index 1150ece5d..68d729a6c 100644
--- a/include/mapnik/filter_factory.hpp
+++ b/include/mapnik/filter_factory.hpp
@@ -1,2 +1,8 @@
+// TODO - remove this file at mapnik 3.x
+#ifdef _MSC_VER
+#pragma NOTE("filter_factory.hpp" is now called "expression.hpp")
+#else
 #warning "filter_factory.hpp" is now called "expression.hpp"
+#endif
+
 #include <mapnik/expression.hpp>
diff --git a/include/mapnik/palette.hpp b/include/mapnik/palette.hpp
index 3598a2b08..972cf56e3 100644
--- a/include/mapnik/palette.hpp
+++ b/include/mapnik/palette.hpp
@@ -34,7 +34,6 @@
     #include <mapnik/sparsehash/dense_hash_map>
     typedef google::dense_hash_map<unsigned int, unsigned char> rgba_hash_table;
 #else
-    #warning compiling without dense_hash_map
     #include <boost/unordered_map.hpp>
     typedef boost::unordered_map<unsigned int, unsigned char> rgba_hash_table;
 #endif
diff --git a/plugins/input/sqlite/sqlite_connection.hpp b/plugins/input/sqlite/sqlite_connection.hpp
index 7518f816b..54908434b 100644
--- a/plugins/input/sqlite/sqlite_connection.hpp
+++ b/plugins/input/sqlite/sqlite_connection.hpp
@@ -62,7 +62,6 @@ public:
 #endif
         const int rc = sqlite3_open_v2 (file_.c_str(), &db_, mode, 0);
 #else
-#warning "Mapnik's sqlite plugin is compiling against a version of sqlite older than 3.5.x which may make rendering slow..."
         const int rc = sqlite3_open (file_.c_str(), &db_);
 #endif
         if (rc != SQLITE_OK)
@@ -83,7 +82,6 @@ public:
 #if SQLITE_VERSION_NUMBER >= 3005000
         const int rc = sqlite3_open_v2 (file_.c_str(), &db_, flags, 0);
 #else
-#warning "Mapnik's sqlite plugin is compiling against a version of sqlite older than 3.5.x which may make rendering slow..."
         const int rc = sqlite3_open (file_.c_str(), &db_);
 #endif
         if (rc != SQLITE_OK)
diff --git a/src/cairo_context.cpp b/src/cairo_context.cpp
index a85473b94..cf04116f3 100644
--- a/src/cairo_context.cpp
+++ b/src/cairo_context.cpp
@@ -155,7 +155,6 @@ void cairo_context::set_operator(composite_mode_e comp_op)
         cairo_set_operator(cairo_.get(), CAIRO_OPERATOR_EXCLUSION);
         break;
 #else
-#warning building against cairo older that 1.10.0, some compositing options are disabled
     case multiply:
     case screen:
     case overlay:
diff --git a/src/cairo_renderer.cpp b/src/cairo_renderer.cpp
index 6dcd628b8..d0305b5d7 100644
--- a/src/cairo_renderer.cpp
+++ b/src/cairo_renderer.cpp
@@ -258,14 +258,9 @@ void cairo_renderer_base::setup(Map const& map)
 void cairo_renderer_base::start_map_processing(Map const& map)
 {
     MAPNIK_LOG_DEBUG(cairo_renderer) << "cairo_renderer_base: Start map processing bbox=" << map.get_current_extent();
-
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0)
     box2d<double> bounds = t_.forward(t_.extent());
     context_.rectangle(bounds.minx(), bounds.miny(), bounds.maxx(), bounds.maxy());
     context_.clip();
-#else
-#warning building against cairo older that 1.6.0, map clipping is disabled
-#endif
 }
 
 template <>
diff --git a/src/projection.cpp b/src/projection.cpp
index 53ffce126..57dcdb243 100644
--- a/src/projection.cpp
+++ b/src/projection.cpp
@@ -31,7 +31,11 @@
 #include <proj_api.h>
 #if defined(MAPNIK_THREADSAFE) && PJ_VERSION < 480
 #include <boost/thread/mutex.hpp>
+#ifdef _MSC_VER
+#pragma NOTE(mapnik is building against < proj 4.8, reprojection will be faster if you use >= 4.8)
+#else
 #warning mapnik is building against < proj 4.8, reprojection will be faster if you use >= 4.8
+#endif
 static boost::mutex mutex_;
 #endif