Skip to content

Commit

Permalink
Merge f0e3991 into c1ba277
Browse files Browse the repository at this point in the history
  • Loading branch information
jjstickel committed Mar 25, 2015
2 parents c1ba277 + f0e3991 commit 25e41a6
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions kiva/agg/src/affine_matrix.i
Expand Up @@ -157,7 +157,7 @@ namespace agg24
};
};

%pythoncode {
%pythoncode %{
def is_sequence(arg):
try:
len(arg)
Expand All @@ -184,7 +184,7 @@ class AffineMatrix(_AffineMatrix):
"""
self.multiply(other)
return self
}
%}

%extend agg24::trans_affine
{
Expand Down
4 changes: 2 additions & 2 deletions kiva/agg/src/constants.i
Expand Up @@ -44,7 +44,7 @@
unsigned path_cmd(unsigned c);
unsigned path_flags(unsigned c);

%pythoncode {
%pythoncode %{

#----------------------------------------------------------------------------
#
Expand Down Expand Up @@ -141,4 +141,4 @@ interp_enum_map = {}
for key,value in interp_string_map.items():
interp_enum_map[value] = key

}
%}
4 changes: 2 additions & 2 deletions kiva/agg/src/hit_test.i
Expand Up @@ -22,7 +22,7 @@ namespace kiva
}

%pythoncode
{
%{
from numpy import shape, transpose, zeros, rank, reshape, int32

def points_in_polygon(pts, poly_pts, use_winding=False):
Expand Down Expand Up @@ -92,4 +92,4 @@ def points_in_polygon(pts, poly_pts, use_winding=False):
else:
_agg.points_in_polygon(pts, poly_pts, results)
return results
}
%}
4 changes: 2 additions & 2 deletions kiva/agg/src/rgba.i
Expand Up @@ -74,7 +74,7 @@ namespace agg24
}


%pythoncode {
%pythoncode %{
def is_sequence(arg):
try:
len(arg)
Expand All @@ -90,6 +90,6 @@ class Rgba(_Rgba):
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;

0 comments on commit 25e41a6

Please sign in to comment.