Fix inline usage. Fix shipped agg copy.

5 files changed, 88 insertions, 1 deletions

diff --git a/geography/mapserver/distinfo b/geography/mapserver/distinfo
index 848707bee3f..21c426c6eac 100644
--- a/geography/mapserver/distinfo
+++ b/geography/mapserver/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.7 2012/06/02 11:16:58 obache Exp $
+$NetBSD: distinfo,v 1.8 2012/12/24 21:09:47 joerg Exp $
 
 SHA1 (mapserver-5.6.8.tar.gz) = 44b813f888c8c950f5e2ba20ae4d7ef08d002bc4
 RMD160 (mapserver-5.6.8.tar.gz) = dd00c7e6ed57b3522f47a7fede8299bd8ef12566
 Size (mapserver-5.6.8.tar.gz) = 2332277 bytes
 SHA1 (patch-aa) = d842afeab3455304236bebbf4ea576c974cafbdd
 SHA1 (patch-ab) = f1521546905034304bc5f1556625d6171421d93d
+SHA1 (patch-mapserver.h) = 82e9f4f90495959190962286f9fae0e4be649d20
+SHA1 (patch-maputil.c) = 4d50919a24af34a74d0e14684e3fab4269582639
+SHA1 (patch-renderers_agg_include_agg__renderer__outline__aa.h) = 84145a73bed1b016c6c13b5c2656b8957da9c71d
+SHA1 (patch-renderers_agg_include_agg__scanline__u.h) = 13a83ce884c47b7f7aebcb4ad81f486725962010
diff --git a/geography/mapserver/patches/patch-mapserver.h b/geography/mapserver/patches/patch-mapserver.h
new file mode 100644
index 00000000000..cab08e78064
--- /dev/null
+++ b/geography/mapserver/patches/patch-mapserver.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-mapserver.h,v 1.1 2012/12/24 21:09:47 joerg Exp $
+
+--- mapserver.h.orig	2012-12-23 17:16:27.000000000 +0000
++++ mapserver.h
+@@ -2614,10 +2614,10 @@ int msSaveRasterBuffer(rasterBufferObj *
+ int msSaveRasterBufferToBuffer(rasterBufferObj *data, bufferObj *buffer,
+         outputFormatObj *format);
+ 
+-inline void msBufferInit(bufferObj *buffer);
+-inline void msBufferResize(bufferObj *buffer, size_t target_size);
+-MS_DLL_EXPORT  inline void msBufferFree(bufferObj *buffer);
+-MS_DLL_EXPORT  inline void msBufferAppend(bufferObj *buffer, void *data, size_t length);
++void msBufferInit(bufferObj *buffer);
++void msBufferResize(bufferObj *buffer, size_t target_size);
++MS_DLL_EXPORT  void msBufferFree(bufferObj *buffer);
++MS_DLL_EXPORT  void msBufferAppend(bufferObj *buffer, void *data, size_t length);
+ 
+ struct rendererVTable {
+ 	int supports_transparent_layers;
diff --git a/geography/mapserver/patches/patch-maputil.c b/geography/mapserver/patches/patch-maputil.c
new file mode 100644
index 00000000000..408ae38d562
--- /dev/null
+++ b/geography/mapserver/patches/patch-maputil.c
@@ -0,0 +1,39 @@
+$NetBSD: patch-maputil.c,v 1.1 2012/12/24 21:09:47 joerg Exp $
+
+--- maputil.c.orig	2012-12-23 17:18:02.000000000 +0000
++++ maputil.c
+@@ -1876,14 +1876,14 @@ int msCheckParentPointer(void* p, char *
+     return MS_SUCCESS;
+ }
+ 
+-inline void msBufferInit(bufferObj *buffer) {
++void msBufferInit(bufferObj *buffer) {
+     buffer->data=NULL;
+     buffer->size=0;
+     buffer->available=0;
+     buffer->_next_allocation_size = MS_DEFAULT_BUFFER_ALLOC;
+ }
+ 
+-inline void msBufferResize(bufferObj *buffer, size_t target_size){
++void msBufferResize(bufferObj *buffer, size_t target_size){
+     while(buffer->available <= target_size) {
+         buffer->data = realloc(buffer->data,buffer->available+buffer->_next_allocation_size);
+         buffer->available += buffer->_next_allocation_size;
+@@ -1891,7 +1891,7 @@ inline void msBufferResize(bufferObj *bu
+     }
+ }
+ 
+-inline void msBufferAppend(bufferObj *buffer, void *data, size_t length) {
++void msBufferAppend(bufferObj *buffer, void *data, size_t length) {
+     if(buffer->available < buffer->size+length) {
+         msBufferResize(buffer,buffer->size+length);
+     }
+@@ -1899,7 +1899,7 @@ inline void msBufferAppend(bufferObj *bu
+     buffer->size += length;
+ }
+ 
+-inline void msBufferFree(bufferObj *buffer) {
++void msBufferFree(bufferObj *buffer) {
+     if(buffer->available>0)
+         free(buffer->data);
+ }
diff --git a/geography/mapserver/patches/patch-renderers_agg_include_agg__renderer__outline__aa.h b/geography/mapserver/patches/patch-renderers_agg_include_agg__renderer__outline__aa.h
new file mode 100644
index 00000000000..8f9b43d2f86
--- /dev/null
+++ b/geography/mapserver/patches/patch-renderers_agg_include_agg__renderer__outline__aa.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-renderers_agg_include_agg__renderer__outline__aa.h,v 1.1 2012/12/24 21:09:47 joerg Exp $
+
+--- renderers/agg/include/agg_renderer_outline_aa.h.orig	2009-05-01 07:06:05.000000000 +0000
++++ renderers/agg/include/agg_renderer_outline_aa.h
+@@ -1365,7 +1365,6 @@ namespace mapserver
+         //---------------------------------------------------------------------
+         void profile(const line_profile_aa& prof) { m_profile = &prof; }
+         const line_profile_aa& profile() const { return *m_profile; }
+-        line_profile_aa& profile() { return *m_profile; }
+ 
+         //---------------------------------------------------------------------
+         int subpixel_width() const { return m_profile->subpixel_width(); }
diff --git a/geography/mapserver/patches/patch-renderers_agg_include_agg__scanline__u.h b/geography/mapserver/patches/patch-renderers_agg_include_agg__scanline__u.h
new file mode 100644
index 00000000000..4d9566ad514
--- /dev/null
+++ b/geography/mapserver/patches/patch-renderers_agg_include_agg__scanline__u.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-renderers_agg_include_agg__scanline__u.h,v 1.1 2012/12/24 21:09:47 joerg Exp $
+
+--- renderers/agg/include/agg_scanline_u.h.orig	2012-12-23 17:09:02.000000000 +0000
++++ renderers/agg/include/agg_scanline_u.h
+@@ -458,7 +458,7 @@ namespace mapserver
+     class scanline32_u8_am : public scanline32_u8
+     {
+     public:
+-        typedef scanline_u8           base_type;
++        typedef scanline32_u8         base_type;
+         typedef AlphaMask             alpha_mask_type;
+         typedef base_type::cover_type cover_type;
+         typedef base_type::coord_type coord_type;