Merged revisions 6927-6928 via svnmerge from

mdboom · mdboom · commit 6f18cf880659 · 2009-02-23T17:43:26.000Z
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint ........ r6927 | mdboom | 2009-02-23 12:30:07 -0500 (Mon, 23 Feb 2009) | 2 lines Add credit to Allen Haldane in comments. ........ r6928 | mdboom | 2009-02-23 12:38:35 -0500 (Mon, 23 Feb 2009) | 2 lines C++ standards compliance for use with Sun C++ compiler. These should be equivalent to what was there before on gcc. ........ svn path=/trunk/matplotlib/; revision=6929
diff --git a/CXX/Extensions.hxx b/CXX/Extensions.hxx
@@ -203,7 +203,7 @@ namespace Py
     {
         typedef PyObject *(*method_varargs_call_handler_t)( PyObject *_self, PyObject *_args );
         typedef PyObject *(*method_keyword_call_handler_t)( PyObject *_self, PyObject *_args, PyObject *_dict );
-    };
+    }
 
     template<class T>
     class MethodDefExt : public PyMethodDef
diff --git a/agg24/include/agg_alpha_mask_u8.h b/agg24/include/agg_alpha_mask_u8.h
@@ -2,8 +2,8 @@
 // Anti-Grain Geometry - Version 2.4
 // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
 //
-// Permission to copy, use, modify, sell and distribute this software 
-// is granted provided this copyright notice appears in all copies. 
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
 // This software is provided "as is" without express or implied
 // warranty, and with no claim as to its suitability for any purpose.
 //
@@ -30,15 +30,15 @@ namespace agg
     {
         static unsigned calculate(const int8u* p) { return *p; }
     };
-    
+
 
     //=====================================================rgb_to_gray_mask_u8
     template<unsigned R, unsigned G, unsigned B>
     struct rgb_to_gray_mask_u8
     {
-        static unsigned calculate(const int8u* p) 
-        { 
-            return (p[R]*77 + p[G]*150 + p[B]*29) >> 8; 
+        static unsigned calculate(const int8u* p)
+        {
+            return (p[R]*77 + p[G]*150 + p[B]*29) >> 8;
         }
     };
 
@@ -50,7 +50,7 @@ namespace agg
         typedef int8u cover_type;
         typedef alpha_mask_u8<Step, Offset, MaskF> self_type;
         enum cover_scale_e
-        { 
+        {
             cover_shift = 8,
             cover_none  = 0,
             cover_full  = 255
@@ -64,12 +64,12 @@ namespace agg
         MaskF& mask_function() { return m_mask_function; }
         const MaskF& mask_function() const { return m_mask_function; }
 
-        
+
         //--------------------------------------------------------------------
         cover_type pixel(int x, int y) const
         {
-            if(x >= 0 && y >= 0 && 
-               x < (int)m_rbuf->width() && 
+            if(x >= 0 && y >= 0 &&
+               x < (int)m_rbuf->width() &&
                y < (int)m_rbuf->height())
             {
                 return (cover_type)m_mask_function.calculate(
@@ -81,13 +81,13 @@ namespace agg
         //--------------------------------------------------------------------
         cover_type combine_pixel(int x, int y, cover_type val) const
         {
-            if(x >= 0 && y >= 0 && 
-               x < (int)m_rbuf->width() && 
+            if(x >= 0 && y >= 0 &&
+               x < (int)m_rbuf->width() &&
                y < (int)m_rbuf->height())
             {
-                return (cover_type)((cover_full + val * 
+                return (cover_type)((cover_full + val *
                                      m_mask_function.calculate(
-                                        m_rbuf->row_ptr(y) + x * Step + Offset)) >> 
+                                        m_rbuf->row_ptr(y) + x * Step + Offset)) >>
                                      cover_shift);
             }
             return 0;
@@ -112,7 +112,7 @@ namespace agg
             if(x < 0)
             {
                 count += x;
-                if(count <= 0) 
+                if(count <= 0)
                 {
                     memset(dst, 0, num_pix * sizeof(cover_type));
                     return;
@@ -126,7 +126,7 @@ namespace agg
             {
                 int rest = x + count - xmax - 1;
                 count -= rest;
-                if(count <= 0) 
+                if(count <= 0)
                 {
                     memset(dst, 0, num_pix * sizeof(cover_type));
                     return;
@@ -162,7 +162,7 @@ namespace agg
             if(x < 0)
             {
                 count += x;
-                if(count <= 0) 
+                if(count <= 0)
                 {
                     memset(dst, 0, num_pix * sizeof(cover_type));
                     return;
@@ -176,7 +176,7 @@ namespace agg
             {
                 int rest = x + count - xmax - 1;
                 count -= rest;
-                if(count <= 0) 
+                if(count <= 0)
                 {
                     memset(dst, 0, num_pix * sizeof(cover_type));
                     return;
@@ -187,8 +187,8 @@ namespace agg
             const int8u* mask = m_rbuf->row_ptr(y) + x * Step + Offset;
             do
             {
-                *covers = (cover_type)((cover_full + (*covers) * 
-                                       m_mask_function.calculate(mask)) >> 
+                *covers = (cover_type)((cover_full + (*covers) *
+                                       m_mask_function.calculate(mask)) >>
                                        cover_shift);
                 ++covers;
                 mask += Step;
@@ -214,7 +214,7 @@ namespace agg
             if(y < 0)
             {
                 count += y;
-                if(count <= 0) 
+                if(count <= 0)
                 {
                     memset(dst, 0, num_pix * sizeof(cover_type));
                     return;
@@ -228,7 +228,7 @@ namespace agg
             {
                 int rest = y + count - ymax - 1;
                 count -= rest;
-                if(count <= 0) 
+                if(count <= 0)
                 {
                     memset(dst, 0, num_pix * sizeof(cover_type));
                     return;
@@ -263,7 +263,7 @@ namespace agg
             if(y < 0)
             {
                 count += y;
-                if(count <= 0) 
+                if(count <= 0)
                 {
                     memset(dst, 0, num_pix * sizeof(cover_type));
                     return;
@@ -277,7 +277,7 @@ namespace agg
             {
                 int rest = y + count - ymax - 1;
                 count -= rest;
-                if(count <= 0) 
+                if(count <= 0)
                 {
                     memset(dst, 0, num_pix * sizeof(cover_type));
                     return;
@@ -288,8 +288,8 @@ namespace agg
             const int8u* mask = m_rbuf->row_ptr(y) + x * Step + Offset;
             do
             {
-                *covers = (cover_type)((cover_full + (*covers) * 
-                                       m_mask_function.calculate(mask)) >> 
+                *covers = (cover_type)((cover_full + (*covers) *
+                                       m_mask_function.calculate(mask)) >>
                                        cover_shift);
                 ++covers;
                 mask += m_rbuf->stride();
@@ -302,10 +302,10 @@ namespace agg
         alpha_mask_u8(const self_type&);
         const self_type& operator = (const self_type&);
 
-        rendering_buffer* m_rbuf;
+        agg::rendering_buffer* m_rbuf;
         MaskF             m_mask_function;
     };
-    
+
 
     typedef alpha_mask_u8<1, 0> alpha_mask_gray8;   //----alpha_mask_gray8
 
@@ -354,7 +354,7 @@ namespace agg
         typedef int8u cover_type;
         typedef amask_no_clip_u8<Step, Offset, MaskF> self_type;
         enum cover_scale_e
-        { 
+        {
             cover_shift = 8,
             cover_none  = 0,
             cover_full  = 255
@@ -376,13 +376,13 @@ namespace agg
                                    m_rbuf->row_ptr(y) + x * Step + Offset);
         }
 
-        
+
         //--------------------------------------------------------------------
         cover_type combine_pixel(int x, int y, cover_type val) const
         {
-            return (cover_type)((cover_full + val * 
+            return (cover_type)((cover_full + val *
                                  m_mask_function.calculate(
-                                    m_rbuf->row_ptr(y) + x * Step + Offset)) >> 
+                                    m_rbuf->row_ptr(y) + x * Step + Offset)) >>
                                  cover_shift);
         }
 
@@ -407,8 +407,8 @@ namespace agg
             const int8u* mask = m_rbuf->row_ptr(y) + x * Step + Offset;
             do
             {
-                *dst = (cover_type)((cover_full + (*dst) * 
-                                    m_mask_function.calculate(mask)) >> 
+                *dst = (cover_type)((cover_full + (*dst) *
+                                    m_mask_function.calculate(mask)) >>
                                     cover_shift);
                 ++dst;
                 mask += Step;
@@ -436,8 +436,8 @@ namespace agg
             const int8u* mask = m_rbuf->row_ptr(y) + x * Step + Offset;
             do
             {
-                *dst = (cover_type)((cover_full + (*dst) * 
-                                    m_mask_function.calculate(mask)) >> 
+                *dst = (cover_type)((cover_full + (*dst) *
+                                    m_mask_function.calculate(mask)) >>
                                     cover_shift);
                 ++dst;
                 mask += m_rbuf->stride();
@@ -449,10 +449,10 @@ namespace agg
         amask_no_clip_u8(const self_type&);
         const self_type& operator = (const self_type&);
 
-        rendering_buffer* m_rbuf;
+        agg::rendering_buffer* m_rbuf;
         MaskF             m_mask_function;
     };
-    
+
 
     typedef amask_no_clip_u8<1, 0> amask_no_clip_gray8;   //----amask_no_clip_gray8
 
diff --git a/src/path_converters.h b/src/path_converters.h
@@ -515,15 +515,15 @@ class PathSimplifier : protected EmbeddedQueue<9>
            the last line. Once it gets too big, the lines cannot be
            combined. */
 
-        /* This code was originally written by someone else (John
-           Hunter?) and I have modified to work in-place -- meaning
-           not creating an entirely new path list each time.  In order
-           to do that without too much additional code complexity, it
-           keeps a small queue around so that multiple points can be
-           emitted in a single call, and those points will be popped
-           from the queue in subsequent calls.  The following block
-           will empty the queue before proceeding to the main loop
-           below.  -- Michael Droettboom */
+        /* This code was originally written by Allan Haldane and I
+           have modified to work in-place -- meaning not creating an
+           entirely new path list each time.  In order to do that
+           without too much additional code complexity, it keeps a
+           small queue around so that multiple points can be emitted
+           in a single call, and those points will be popped from the
+           queue in subsequent calls.  The following block will empty
+           the queue before proceeding to the main loop below.
+           -- Michael Droettboom */
 
         if (queue_flush(&cmd, x, y)) {
             return cmd;

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ namespace Py`
`203`	`203`	`{`
`204`	`204`	`typedef PyObject (method_varargs_call_handler_t)( PyObject _self, PyObject _args );`
`205`	`205`	`typedef PyObject (method_keyword_call_handler_t)( PyObject _self, PyObject _args, PyObject *_dict );`
`206`		`- };`
	`206`	`+ }`
`207`	`207`
`208`	`208`	`template<class T>`
`209`	`209`	`class MethodDefExt : public PyMethodDef`