Changeset 685

Timestamp:

03/31/08 11:53:54 (5 months ago)

Author:

artem

Message:

minor tweaks to keep win32 build happy

Location:

branches/stable/0.5

Files:

• include/mapnik/agg_renderer.hpp (modified) (1 diff)
• include/mapnik/octree.hpp (modified) (1 diff)
• include/mapnik/unicode.hpp (modified) (1 diff)
• src/unicode.cpp (modified) (3 diffs)

branches/stable/0.5/include/mapnik/agg_renderer.hpp

@@ -40 +40 @@
 namespace mapnik {
    
-   class rasterizer;
+   struct rasterizer;
    
    template <typename T>

branches/stable/0.5/include/mapnik/octree.hpp

@@ -25 +25 @@
 #define _OCTREE_HPP_
 
+#include <mapnik/global.hpp>
 #include <boost/format.hpp>
 #include <boost/utility.hpp>

branches/stable/0.5/include/mapnik/unicode.hpp

@@ -29 +29 @@
 }
 
+#include <mapnik/config.hpp>
 #include <boost/utility.hpp>
+#include <string>
 
 namespace mapnik {
-   class transcoder : private boost::noncopyable
+   class MAPNIK_DECL transcoder : private boost::noncopyable
    {
       public:

branches/stable/0.5/src/unicode.cpp

@@ -166 +166 @@
       std::cerr << "ENCODING = " << encoding << "\n"; 
 #endif
-      
+
+#ifdef _WIN32
+      desc_ = iconv_open("UTF-16LE",encoding.c_str());
+#else
 #ifndef WORDS_BIGENDIAN
       desc_ = iconv_open("UCS-4LE",encoding.c_str());
@@ -172 +175 @@
       desc_ = iconv_open("UCS-4BE",encoding.c_str());
 #endif
+#endif
    }
    
@@ -180 +184 @@
       std::wstring output(inleft,0);
       size_t outleft = inleft * sizeof(wchar_t);
-#if (!defined(OSX_LEOPARD) && defined(DARWIN)) || defined(SUNOS) || defined(FREEBSD)
+#if (!defined(OSX_LEOPARD) && defined(DARWIN)) || defined(SUNOS) || defined(FREEBSD) || defined(_WIN32)
       const char * in = input.c_str();
 #else