diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-10 12:37:45 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-10 12:37:45 +0000 |
| commit | e41e220ad343d419a796fa9c75884358f94430c4 (patch) | |
| tree | 162b1b968d92cb9bf45f36c8d1ec3f999c3ceba1 /basegfx | |
| parent | 5234974d84b0fc18d8c967ebe766ab78b705a429 (diff) | |
INTEGRATION: CWS presfixes01 (1.12.12); FILE MERGED
2005/02/16 17:01:01 thb 1.12.12.2: #i10000# No forward declaration of enums possible, extracted vector enums to separate header
2005/02/15 23:52:18 thb 1.12.12.1: #i42440# Unified B2I->B2I conversion, by adding an appropriate copy constructor also to B2DVector
Diffstat (limited to 'basegfx')
| -rw-r--r-- | basegfx/inc/basegfx/vector/b2dvector.hxx | 49 |
1 files changed, 19 insertions, 30 deletions
diff --git a/basegfx/inc/basegfx/vector/b2dvector.hxx b/basegfx/inc/basegfx/vector/b2dvector.hxx index 696dec56e2d7..076c04207687 100644 --- a/basegfx/inc/basegfx/vector/b2dvector.hxx +++ b/basegfx/inc/basegfx/vector/b2dvector.hxx @@ -2,9 +2,9 @@ * * $RCSfile: b2dvector.hxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: pjunck $ $Date: 2004-11-03 08:36:55 $ + * last change: $Author: vg $ $Date: 2005-03-10 13:37:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,39 +66,19 @@ #include <basegfx/tuple/b2dtuple.hxx> #endif +#ifndef _BGFX_VECTOR_B2IVECTOR_HXX +#include <basegfx/vector/b2ivector.hxx> +#endif + +#ifndef _BGFX_VECTOR_B2ENUMS_HXX +#include <basegfx/vector/b2enums.hxx> +#endif + namespace basegfx { // predeclaration class B2DHomMatrix; - /** Descriptor for the mathematical orientations of two 2D Vectors - */ - enum B2VectorOrientation - { - /// mathematically positive oriented - ORIENTATION_POSITIVE = 0, - - /// mathematically negative oriented - ORIENTATION_NEGATIVE, - - /// mathematically neutral, thus parallel - ORIENTATION_NEUTRAL - }; - - /** Descriptor for the mathematical continuity of two 2D Vectors - */ - enum B2VectorContinuity - { - /// none - CONTINUITY_NONE = 0, - - /// mathematically negative oriented - CONTINUITY_C1, - - /// mathematically neutral, thus parallel - CONTINUITY_C2 - }; - /** Base Point class with two double values This class derives all operators and common handling for @@ -141,6 +121,15 @@ namespace basegfx : B2DTuple(rVec) {} + /** Create a copy of a 2D Vector + + @param rVec + The 2D Vector which will be copied. + */ + B2DVector(const ::basegfx::B2IVector& rVec) + : B2DTuple(rVec) + {} + /** constructor with tuple to allow copy-constructing from B2DTuple-based classes */ |