add some typedefs; some little changes

Signed-off-by: anti-freak <antifreak2011@gmail.com>
remove merge errors

Signed-off-by: anti-freak <antifreak2011@gmail.com>
rewrite GEOMETRY namespace

Signed-off-by: anti-freak <antifreak2011@gmail.com>