Merge pull request #2730 from macd/fix-2729

Undo change to dbtypes.i and add %clear directive to PdnGen-py.i

Author: maliberty

src/odb/src/swig/python/dbtypes.i

@@ -217,6 +217,7 @@
 
 // Handle return by ref.
 %apply int &OUTPUT { int & overhang1, int & overhang2 };
+%apply int &OUTPUT { int & x, int & y };
 %apply int &OUTPUT { int & x_spacing, int & y_spacing };
 WRAP_OBJECT_RETURN_REF(odb::Rect, r)
 WRAP_OBJECT_RETURN_REF(odb::Rect, rect)

src/pdn/src/PdnGen-py.i

@@ -66,7 +66,7 @@ using namespace pdn;
 %apply unsigned long { ExtensionMode };
 
 %import "odb.i"
-%import "dbtypes.i"
+%clear int & x, int & y; // defined in dbtypes.i, must be cleared here.
 %include <std_string.i>
 
 // These are needed to coax swig into sending or returning Python