diff --git a/src/posix_main.cpp b/src/posix_main.cpp index 90da802..ae321bd 100644 --- a/src/posix_main.cpp +++ b/src/posix_main.cpp @@ -137,7 +137,7 @@ int main(int argc, char* argv[]) if (mapnik_dir) { - #ifdef MAPNIK_VERSION >= 702 + #if MAPNIK_VERSION >= 702 face_names = mapnik::freetype_engine::face_names(); freetype_engine::register_fonts(*mapnik_dir + "/fonts",false); if (!mapnik::freetype_engine::face_names().size() > face_names.size()) @@ -253,7 +253,7 @@ int main(int argc, char* argv[]) } // register font faces - #ifdef MAPNIK_VERSION >= 702 + #if MAPNIK_VERSION >= 702 face_names = mapnik::freetype_engine::face_names(); freetype_engine::register_fonts(*fonts,true); if (!mapnik::freetype_engine::face_names().size() > face_names.size()) diff --git a/src/request_handler.cpp b/src/request_handler.cpp index 62fc18d..00828a2 100644 --- a/src/request_handler.cpp +++ b/src/request_handler.cpp @@ -108,6 +108,7 @@ void request_handler::handle_request(const request& req, reply& rep) } // Request path must be absolute and not contain "..". + /* if (request_path.empty() || request_path[0] != '/' || request_path.find("..") != std::string::npos || request_path == "/favicon.ico") @@ -122,6 +123,7 @@ void request_handler::handle_request(const request& req, reply& rep) rep = reply::reply_html(msg); return; } + */ // If path ends in slash (i.e. is a directory) then add "index.html". //if (request_path[request_path.size() - 1] == '/') @@ -194,12 +196,13 @@ void request_handler::handle_request(const request& req, reply& rep) } // check for intersection with max/valid extent - boost::optional > bounds = max_extent(); + //boost::optional > bounds = max_extent(); bool intersects = true; + /* if (bounds){ if (!bounds->intersects(*bbox)) intersects = false; // todo write directly to png/jpeg... - } + }*/ // setup transparent response image image_32 im(*w,*h);