[core] Run fix_members.sh on clipper code
https://github.com/mapnik/clipper/blob/r496-mapnik/cpp/fix_members.sh
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -93,22 +93,22 @@ typedef CLIPPER_INTPOINT_IMPL IntPoint;
|
||||
#else
|
||||
|
||||
struct IntPoint {
|
||||
cInt X;
|
||||
cInt Y;
|
||||
cInt x;
|
||||
cInt y;
|
||||
#ifdef use_xyz
|
||||
cInt Z;
|
||||
IntPoint(cInt x = 0, cInt y = 0, cInt z = 0): X(x), Y(y), Z(z) {};
|
||||
IntPoint(cInt _x = 0, cInt _y = 0, cInt z = 0): x(_x), y(_y), Z(z) {};
|
||||
#else
|
||||
IntPoint(cInt x = 0, cInt y = 0): X(x), Y(y) {};
|
||||
IntPoint(cInt _x = 0, cInt _y = 0): x(_x), y(_y) {};
|
||||
#endif
|
||||
|
||||
friend inline bool operator== (const IntPoint& a, const IntPoint& b)
|
||||
{
|
||||
return a.X == b.X && a.Y == b.Y;
|
||||
return a.x == b.x && a.y == b.y;
|
||||
}
|
||||
friend inline bool operator!= (const IntPoint& a, const IntPoint& b)
|
||||
{
|
||||
return a.X != b.X || a.Y != b.Y;
|
||||
return a.x != b.x || a.y != b.y;
|
||||
}
|
||||
};
|
||||
#endif
|
||||
@@ -147,10 +147,10 @@ std::ostream& operator <<(std::ostream &s, const Paths &p);
|
||||
|
||||
struct DoublePoint
|
||||
{
|
||||
double X;
|
||||
double Y;
|
||||
DoublePoint(double x = 0, double y = 0) : X(x), Y(y) {}
|
||||
DoublePoint(IntPoint ip) : X((double)ip.X), Y((double)ip.Y) {}
|
||||
double x;
|
||||
double y;
|
||||
DoublePoint(double _x = 0, double _y = 0) : x(_x), y(_y) {}
|
||||
DoublePoint(IntPoint ip) : x((double)ip.x), y((double)ip.y) {}
|
||||
};
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
|
||||
24
src/clipper/fix_members.sh
Executable file
24
src/clipper/fix_members.sh
Executable file
@@ -0,0 +1,24 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
export ROOTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
|
||||
perl -i -p -e "s/\.X/\.x/g;" ${ROOTDIR}/clipper.*
|
||||
perl -i -p -e "s/\->X/\->x/g;" ${ROOTDIR}/clipper.*
|
||||
perl -i -p -e "s/cInt X;/cInt x;/g;" ${ROOTDIR}/clipper.*
|
||||
perl -i -p -e "s/double X;/double x;/g;" ${ROOTDIR}/clipper.*
|
||||
perl -i -p -e "s/X\(x\)/x\(_x\)/g;" ${ROOTDIR}/clipper.*
|
||||
perl -i -p -e "s/X\(\(/x\(\(/g;" ${ROOTDIR}/clipper.*
|
||||
perl -i -p -e "s/double x = 0/double _x = 0/g;" ${ROOTDIR}/clipper.*
|
||||
perl -i -p -e "s/cInt x = 0/cInt _x = 0/g;" ${ROOTDIR}/clipper.*
|
||||
|
||||
perl -i -p -e "s/\.Y/\.y/g;" ${ROOTDIR}/clipper.*
|
||||
perl -i -p -e "s/\->Y/\->y/g;" ${ROOTDIR}/clipper.*
|
||||
perl -i -p -e "s/cInt Y;/cInt y;/g;" ${ROOTDIR}/clipper.*
|
||||
perl -i -p -e "s/double Y;/double y;/g;" ${ROOTDIR}/clipper.*
|
||||
perl -i -p -e "s/Y\(y\)/y\(_y\)/g;" ${ROOTDIR}/clipper.*
|
||||
perl -i -p -e "s/Y\(\(/y\(\(/g;" ${ROOTDIR}/clipper.*
|
||||
perl -i -p -e "s/cInt Y;/cInt y;/g;" ${ROOTDIR}/clipper.*
|
||||
perl -i -p -e "s/double y = 0/double _y = 0/g;" ${ROOTDIR}/clipper.*
|
||||
perl -i -p -e "s/cInt y = 0/cInt _y = 0/g;" ${ROOTDIR}/clipper.*
|
||||
|
||||
|
||||
Reference in New Issue
Block a user