casa-mp-base

diff -ur enable-4.5.0/kiva/agg/src/affine_matrix.i enable-4.5.0_swig_fix/kiva/agg/src/affine_matrix.i

--- enable-4.5.0/kiva/agg/src/affine_matrix.i   2015-03-23 11:27:31.000000000 -0600

+++ enable-4.5.0_swig_fix/kiva/agg/src/affine_matrix.i  2015-03-25 12:00:40.000000000 -0600

@@ -157,7 +157,7 @@

     };

 };

-%pythoncode {

+%pythoncode %{

 def is_sequence(arg):

     try:

         len(arg)

@@ -184,7 +184,7 @@

         """

         self.multiply(other)

         return self

-}

+%}

 %extend agg24::trans_affine

 {

diff -ur enable-4.5.0/kiva/agg/src/constants.i enable-4.5.0_swig_fix/kiva/agg/src/constants.i

--- enable-4.5.0/kiva/agg/src/constants.i   2015-03-23 11:27:31.000000000 -0600

+++ enable-4.5.0_swig_fix/kiva/agg/src/constants.i  2015-03-25 11:58:24.000000000 -0600

@@ -44,7 +44,7 @@

 unsigned path_cmd(unsigned c);

 unsigned path_flags(unsigned c);

-%pythoncode {

+%pythoncode %{

 #----------------------------------------------------------------------------

 #

@@ -141,4 +141,4 @@

 for key,value in interp_string_map.items():

     interp_enum_map[value] = key

-}

+%}

diff -ur enable-4.5.0/kiva/agg/src/hit_test.i enable-4.5.0_swig_fix/kiva/agg/src/hit_test.i

--- enable-4.5.0/kiva/agg/src/hit_test.i    2015-03-23 11:27:31.000000000 -0600

+++ enable-4.5.0_swig_fix/kiva/agg/src/hit_test.i   2015-03-25 12:01:02.000000000 -0600

@@ -22,7 +22,7 @@

 }

 %pythoncode

-{

+%{

 from numpy import shape, transpose, zeros, rank, reshape, int32

 def points_in_polygon(pts, poly_pts, use_winding=False):

@@ -92,4 +92,4 @@

     else:

         _agg.points_in_polygon(pts, poly_pts, results)

     return results    

-}

+%}

diff -ur enable-4.5.0/kiva/agg/src/rgba.i enable-4.5.0_swig_fix/kiva/agg/src/rgba.i

--- enable-4.5.0/kiva/agg/src/rgba.i    2015-03-23 11:27:31.000000000 -0600

+++ enable-4.5.0_swig_fix/kiva/agg/src/rgba.i   2015-03-25 11:59:59.000000000 -0600

@@ -74,7 +74,7 @@

 }

-%pythoncode {

+%pythoncode %{

 def is_sequence(arg):

     try:

         len(arg)

@@ -90,6 +90,6 @@

             if len(args) not in [3,4]:

                 raise ValueError, "array argument must be 1x3 or 1x4"

         _Rgba.__init__(self,*args)

-}

+%}

 %clear double r, double g, double b, double a;