Author: damjan
Date: Sun Mar 6 18:42:24 2016
New Revision: 1733821
URL: http://svn.apache.org/viewvc?rev=1733821&view=rev
Log:
Merge r1409501, r1409504, and r1409507 from branches/gbuild:
convert basebmp to new build system
convert basegfx to new build system
CWS gnumake4: some more changes for basebmp and basegfx
Extensive build updates were still necessary.
BUILDS
Build updates by: me
Added:
openoffice/branches/gbuild-reintegration/main/basebmp/Library_basebmp.mk
- copied unchanged from r1409504,
incubator/ooo/branches/gbuild/main/basebmp/Library_basebmp.mk
openoffice/branches/gbuild-reintegration/main/basebmp/Makefile
- copied unchanged from r1409504,
incubator/ooo/branches/gbuild/main/basebmp/Makefile
openoffice/branches/gbuild-reintegration/main/basebmp/Module_basebmp.mk
- copied unchanged from r1409504,
incubator/ooo/branches/gbuild/main/basebmp/Module_basebmp.mk
openoffice/branches/gbuild-reintegration/main/basebmp/Package_inc.mk
- copied unchanged from r1409504,
incubator/ooo/branches/gbuild/main/basebmp/Package_inc.mk
openoffice/branches/gbuild-reintegration/main/basebmp/prj/makefile.mk
- copied unchanged from r1409504,
incubator/ooo/branches/gbuild/main/basebmp/prj/makefile.mk
openoffice/branches/gbuild-reintegration/main/basegfx/CppunitTest_basegfx.mk
- copied unchanged from r1409504,
incubator/ooo/branches/gbuild/main/basegfx/CppunitTest_basegfx.mk
openoffice/branches/gbuild-reintegration/main/basegfx/Library_basegfx.mk
- copied, changed from r1409504,
incubator/ooo/branches/gbuild/main/basegfx/Library_basegfx.mk
openoffice/branches/gbuild-reintegration/main/basegfx/Makefile
- copied unchanged from r1409504,
incubator/ooo/branches/gbuild/main/basegfx/Makefile
openoffice/branches/gbuild-reintegration/main/basegfx/Module_basegfx.mk
- copied unchanged from r1409504,
incubator/ooo/branches/gbuild/main/basegfx/Module_basegfx.mk
openoffice/branches/gbuild-reintegration/main/basegfx/Package_inc.mk
- copied unchanged from r1409504,
incubator/ooo/branches/gbuild/main/basegfx/Package_inc.mk
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/basegfxdllapi.h
- copied unchanged from r1409504,
incubator/ooo/branches/gbuild/main/basegfx/inc/basegfx/basegfxdllapi.h
openoffice/branches/gbuild-reintegration/main/basegfx/prj/makefile.mk
- copied unchanged from r1409507,
incubator/ooo/branches/gbuild/main/basegfx/prj/makefile.mk
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/Module_ooo.mk
openoffice/branches/gbuild-reintegration/main/basebmp/inc/basebmp/bitmapdevice.hxx
openoffice/branches/gbuild-reintegration/main/basebmp/prj/build.lst
openoffice/branches/gbuild-reintegration/main/basebmp/prj/d.lst
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/color/bcolor.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/color/bcolormodifier.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/color/bcolortools.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/numeric/ftools.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/pixel/bpixel.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b2dhompoint.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b2dpoint.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b2ipoint.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b3dhompoint.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b3dpoint.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b3ipoint.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolygontriangulator.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolypolygonrasterconverter.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dtrapezoid.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b3dpolygon.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b3dpolypolygontools.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/range/b1drange.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/range/b1ibox.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/range/b1irange.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/range/b2dpolyrange.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/range/b2drange.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/range/b2drangeclipper.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/range/b2ibox.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/range/b2irange.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/range/b3drange.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/range/b3ibox.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/range/b3irange.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/range/basicbox.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/raster/bpixelraster.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/raster/bzpixelraster.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/raster/rasterconvert3d.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/tools/b2dclipstate.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/tools/canvastools.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/tools/debugplotter.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/tools/gradienttools.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/tools/keystoplerp.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/tools/tools.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/tools/unopolypolygon.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/tuple/b2dtuple.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/tuple/b2i64tuple.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/tuple/b2ituple.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/tuple/b3dtuple.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/tuple/b3i64tuple.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/tuple/b3ituple.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/vector/b2dvector.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/vector/b2ivector.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/vector/b3dvector.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/vector/b3ivector.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/prj/build.lst
openoffice/branches/gbuild-reintegration/main/basegfx/prj/d.lst
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 6 18:42:24 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409495,1409499-1409500
+/incubator/ooo/branches/gbuild:1409313-1409495,1409499-1409504,1409507
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified: openoffice/branches/gbuild-reintegration/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/Module_ooo.mk?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/Module_ooo.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/Module_ooo.mk Sun Mar 6
18:42:24 2016
@@ -24,6 +24,8 @@
$(eval $(call gb_Module_Module,ooo))
$(eval $(call gb_Module_add_moduledirs,ooo,\
+ basebmp \
+ basegfx \
comphelper \
cppcanvas \
drawinglayer \
Modified:
openoffice/branches/gbuild-reintegration/main/basebmp/inc/basebmp/bitmapdevice.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basebmp/inc/basebmp/bitmapdevice.hxx?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basebmp/inc/basebmp/bitmapdevice.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basebmp/inc/basebmp/bitmapdevice.hxx
Sun Mar 6 18:42:24 2016
@@ -34,6 +34,13 @@
#include <boost/noncopyable.hpp>
#include <vector>
+#if defined BASEBMP_DLLIMPLEMENTATION
+#define BASEBMP_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define BASEBMP_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define BASEBMP_DLLPRIVATE SAL_DLLPRIVATE
+
namespace basegfx
{
class B2IPoint;
@@ -67,7 +74,7 @@ struct ImplBitmapDevice;
works best when given as an eight bit grey bitmap. Everything else
is accepted, but potentially slow.
*/
-class BitmapDevice : public boost::enable_shared_from_this<BitmapDevice>,
+class BASEBMP_DLLPUBLIC BitmapDevice : public
boost::enable_shared_from_this<BitmapDevice>,
private boost::noncopyable
{
public:
@@ -634,7 +641,7 @@ private:
/** Factory method to create a BitmapDevice for given scanline format
*/
-BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize,
+BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const
basegfx::B2IVector& rSize,
bool bTopDown,
sal_Int32
nScanlineFormat );
@@ -645,7 +652,7 @@ BitmapDeviceSharedPtr createBitmapDevice
lookups for the whole range of pixel values from the specified
format.
*/
-BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector&
rSize,
+BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const
basegfx::B2IVector& rSize,
bool
bTopDown,
sal_Int32
nScanlineFormat,
const PaletteMemorySharedVector&
rPalette );
@@ -656,7 +663,7 @@ BitmapDeviceSharedPtr createBitmapDevice
Note: the provided memory must have sufficient size, to store the
image of the specified area and format.
*/
-BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector&
rSize,
+BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const
basegfx::B2IVector& rSize,
bool
bTopDown,
sal_Int32
nScanlineFormat,
const RawMemorySharedArray&
rMem,
@@ -671,7 +678,7 @@ BitmapDeviceSharedPtr createBitmapDevice
area. Useful to implement rectangular clips (usually faster than
setting up a 1bpp clip mask).
*/
-BitmapDeviceSharedPtr subsetBitmapDevice( const BitmapDeviceSharedPtr&
rProto,
+BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr subsetBitmapDevice( const
BitmapDeviceSharedPtr& rProto,
const basegfx::B2IRange&
rSubset );
/** Factory method to clone a BitmapDevice from a given prototype.
@@ -680,7 +687,7 @@ BitmapDeviceSharedPtr subsetBitmapDevice
copied, only the size can be varied. Note that the prototype's
bitmap content is <em>not</em> copied, only a palette (if any).
*/
-BitmapDeviceSharedPtr cloneBitmapDevice( const basegfx::B2IVector&
rSize,
+BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr cloneBitmapDevice( const
basegfx::B2IVector& rSize,
const BitmapDeviceSharedPtr&
rProto );
}
Modified: openoffice/branches/gbuild-reintegration/main/basebmp/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basebmp/prj/build.lst?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/basebmp/prj/build.lst
(original)
+++ openoffice/branches/gbuild-reintegration/main/basebmp/prj/build.lst Sun Mar
6 18:42:24 2016
@@ -1,5 +1,2 @@
bx basebmp : sal VIGRA:vigra basegfx BOOST:boost NULL
-bx basebmp
usr1 - all bx_mkout NULL
-bx basebmp\source nmake
- all bx_source NULL
-bx basebmp\util nmake
- all bx_util bx_source NULL
-bx basebmp\test nmake
- all bx_test bx_util NULL
+bx basebmp\prj nmake
- all bx_prj NULL
Modified: openoffice/branches/gbuild-reintegration/main/basebmp/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basebmp/prj/d.lst?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/basebmp/prj/d.lst (original)
+++ openoffice/branches/gbuild-reintegration/main/basebmp/prj/d.lst Sun Mar 6
18:42:24 2016
@@ -1,9 +0,0 @@
-..\%__SRC%\lib\ibasebmp.lib %_DEST%\lib%_EXT%\ibasebmp.lib
-
-..\%__SRC%\bin\basebmp?????.dll %_DEST%\bin%_EXT%\basebmp?????.dll
-
-..\%__SRC%\lib\libbasebmp*.* %_DEST%\lib%_EXT%\libbasebmp*.*
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
-
-mkdir: %_DEST%\inc%_EXT%\basebmp
-..\inc\basebmp\*.hxx %_DEST%\inc%_EXT%\basebmp\*.hxx
Copied:
openoffice/branches/gbuild-reintegration/main/basegfx/Library_basegfx.mk (from
r1409504, incubator/ooo/branches/gbuild/main/basegfx/Library_basegfx.mk)
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/Library_basegfx.mk?p2=openoffice/branches/gbuild-reintegration/main/basegfx/Library_basegfx.mk&p1=incubator/ooo/branches/gbuild/main/basegfx/Library_basegfx.mk&r1=1409504&r2=1733821&rev=1733821&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/basegfx/Library_basegfx.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/basegfx/Library_basegfx.mk
Sun Mar 6 18:42:24 2016
@@ -64,6 +64,7 @@ $(eval $(call gb_Library_add_exception_o
basegfx/source/tools/unopolypolygon \
basegfx/source/tools/tools \
basegfx/source/tools/b2dclipstate \
+ basegfx/source/tools/stringconversiontools \
basegfx/source/numeric/ftools \
basegfx/source/tuple/b3ituple \
basegfx/source/tuple/b3dtuple \
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/color/bcolor.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/color/bcolor.hxx?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/color/bcolor.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/color/bcolor.hxx
Sun Mar 6 18:42:24 2016
@@ -28,6 +28,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <vector>
+#include <basegfx/basegfxdllapi.h>
//////////////////////////////////////////////////////////////////////////////
// predeclarations
@@ -48,7 +49,7 @@ namespace basegfx
@see B3DTuple
*/
- class BColor : public B3DTuple
+ class BASEGFX_DLLPUBLIC BColor : public B3DTuple
{
public:
/** Create a Color with red, green and blue components from
[0.0 to 1.0]
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/color/bcolormodifier.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/color/bcolormodifier.hxx?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/color/bcolormodifier.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/color/bcolormodifier.hxx
Sun Mar 6 18:42:24 2016
@@ -26,6 +26,7 @@
#include <boost/utility.hpp>
#include <boost/shared_ptr.hpp>
#include <vector>
+#include <basegfx/basegfxdllapi.h>
//////////////////////////////////////////////////////////////////////////////
@@ -57,7 +58,7 @@ namespace basegfx
All usages should handle instances of BColorModifier encapsulated
into these shared pointers.
*/
- class BColorModifier : private boost::noncopyable
+ class BASEGFX_DLLPUBLIC BColorModifier : private boost::noncopyable
{
private:
protected:
@@ -92,7 +93,7 @@ namespace basegfx
luminance value calculated based on the source color by using
the following weights: r * 0.30, g * 0.59, b * 0.11
*/
- class BColorModifier_gray : public BColorModifier
+ class BASEGFX_DLLPUBLIC BColorModifier_gray : public BColorModifier
{
private:
protected:
@@ -120,7 +121,7 @@ namespace basegfx
returns a color where red green and blue are inverted using 1.0 - n
*/
- class BColorModifier_invert : public BColorModifier
+ class BASEGFX_DLLPUBLIC BColorModifier_invert : public BColorModifier
{
private:
protected:
@@ -152,7 +153,7 @@ namespace basegfx
This derivation is used for the svg importer and does exactly what SVG
defines for this needed case.
*/
- class BColorModifier_luminance_to_alpha : public BColorModifier
+ class BASEGFX_DLLPUBLIC BColorModifier_luminance_to_alpha : public
BColorModifier
{
private:
protected:
@@ -182,7 +183,7 @@ namespace basegfx
given color, replacing everything. Useful e.g. for unified shadow
creation
*/
- class BColorModifier_replace : public BColorModifier
+ class BASEGFX_DLLPUBLIC BColorModifier_replace : public BColorModifier
{
private:
::basegfx::BColor maBColor;
@@ -219,7 +220,7 @@ namespace basegfx
col * (1 - f) + aSourceColor * f
*/
- class BColorModifier_interpolate : public BColorModifier
+ class BASEGFX_DLLPUBLIC BColorModifier_interpolate : public BColorModifier
{
private:
::basegfx::BColor maBColor;
@@ -257,7 +258,7 @@ namespace basegfx
returns black when the luminance of the given color is less than
the given treshhold value in the range [0.0 .. 1.0], else white
*/
- class BColorModifier_black_and_white : public BColorModifier
+ class BASEGFX_DLLPUBLIC BColorModifier_black_and_white : public
BColorModifier
{
private:
double mfValue;
@@ -294,7 +295,7 @@ namespace basegfx
col(r,g,b) = clamp(pow(col(r,g,b), 1.0 / gamma), 0.0, 1.0)
*/
- class BColorModifier_gamma : public BColorModifier
+ class BASEGFX_DLLPUBLIC BColorModifier_gamma : public BColorModifier
{
private:
double mfValue;
@@ -332,7 +333,7 @@ namespace basegfx
- be able to cover a bigger change range utilizing the cmobination
- allow execution by a small, common, precalculated table
*/
- class BColorModifier_RGBLuminanceContrast : public BColorModifier
+ class BASEGFX_DLLPUBLIC BColorModifier_RGBLuminanceContrast : public
BColorModifier
{
private:
double mfRed;
@@ -385,7 +386,7 @@ namespace basegfx
All references to BColorModifier members use shared pointers, thus
instances of
BColorModifierStack can be copied by the default mechanisms if needed.
*/
- class BColorModifierStack
+ class BASEGFX_DLLPUBLIC BColorModifierStack
{
protected:
::std::vector< BColorModifierSharedPtr > maBColorModifiers;
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/color/bcolortools.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/color/bcolortools.hxx?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/color/bcolortools.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/color/bcolortools.hxx
Sun Mar 6 18:42:24 2016
@@ -25,6 +25,7 @@
#define _BGFX_COLOR_BCOLORTOOLS_HXX
#include <sal/types.h>
+#include <basegfx/basegfxdllapi.h>
//////////////////////////////////////////////////////////////////////////////
@@ -35,29 +36,29 @@ namespace basegfx
namespace tools
{
/// Transform from RGB to HSL
- BColor rgb2hsl(const BColor& rRGBColor);
+ BASEGFX_DLLPUBLIC BColor rgb2hsl(const BColor& rRGBColor);
/// Transform from HSL to RGB
- BColor hsl2rgb(const BColor& rHSLColor);
+ BASEGFX_DLLPUBLIC BColor hsl2rgb(const BColor& rHSLColor);
/// Transform from RGB to HSV
- BColor rgb2hsv(const BColor& rRGBColor);
+ BASEGFX_DLLPUBLIC BColor rgb2hsv(const BColor& rRGBColor);
/// Transform from HSV to RGB
- BColor hsv2rgb(const BColor& rHSVColor);
+ BASEGFX_DLLPUBLIC BColor hsv2rgb(const BColor& rHSVColor);
/// Transform from R'G'B' to YIQ (NTSC color model - Y is used in
monochrome mode)
- BColor rgb2yiq(const BColor& rRGBColor);
+ BASEGFX_DLLPUBLIC BColor rgb2yiq(const BColor& rRGBColor);
/// Transform from YIQ to R'G'B' (NTSC color model - Y is used in
monochrome mode)
- BColor yiq2rgb(const BColor& rYIQColor);
+ BASEGFX_DLLPUBLIC BColor yiq2rgb(const BColor& rYIQColor);
/// Transform from R'G'B' to Y'PbPr (the [0,1]x[-.5,.5]x[-.5,.5]
equivalent of Y'CbCr (which is scaled into 8bit))
- BColor rgb2ypbpr(const BColor& rRGBColor);
+ BASEGFX_DLLPUBLIC BColor rgb2ypbpr(const BColor& rRGBColor);
/// Transform from Y'PbPr (the [0,1]x[-.5,.5]x[-.5,.5] equivalent of
Y'CbCr (which is scaled into 8bit)) into R'G'B'
- BColor ypbpr2rgb(const BColor& rYPbPrColor);
+ BASEGFX_DLLPUBLIC BColor ypbpr2rgb(const BColor& rYPbPrColor);
/// Transform from CIE XYZ into Rec. 709 RGB (D65 white point)
- BColor ciexyz2rgb( const BColor& rXYZColor );
+ BASEGFX_DLLPUBLIC BColor ciexyz2rgb( const BColor& rXYZColor );
/// Transform from Rec. 709 RGB (D65 white point) into CIE XYZ
- BColor rgb2ciexyz( const BColor& rRGBColor );
+ BASEGFX_DLLPUBLIC BColor rgb2ciexyz( const BColor& rRGBColor );
}
} // end of namespace basegfx
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/curve/b2dbeziertools.hxx?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
Sun Mar 6 18:42:24 2016
@@ -26,6 +26,7 @@
#include <sal/types.h>
#include <vector>
+#include <basegfx/basegfxdllapi.h>
//////////////////////////////////////////////////////////////////////////////
// predefines
@@ -39,7 +40,7 @@ namespace basegfx
namespace basegfx
{
- class B2DCubicBezierHelper
+ class BASEGFX_DLLPUBLIC B2DCubicBezierHelper
{
private:
::std::vector< double > maLengthArray;
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx
Sun Mar 6 18:42:24 2016
@@ -26,6 +26,7 @@
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/range/b2drange.hxx>
+#include <basegfx/basegfxdllapi.h>
//////////////////////////////////////////////////////////////////////////////
// predeclarations
@@ -39,7 +40,7 @@ namespace basegfx
namespace basegfx
{
- class B2DCubicBezier
+ class BASEGFX_DLLPUBLIC B2DCubicBezier
{
B2DPoint
maStartPoint;
B2DPoint
maEndPoint;
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx
Sun Mar 6 18:42:24 2016
@@ -25,12 +25,13 @@
#define _BGFX_CURVE_B2DQUADRATICBEZIER_HXX
#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/basegfxdllapi.h>
//////////////////////////////////////////////////////////////////////////////
namespace basegfx
{
- class B2DQuadraticBezier
+ class BASEGFX_DLLPUBLIC B2DQuadraticBezier
{
::basegfx::B2DPoint
maStartPoint;
::basegfx::B2DPoint
maEndPoint;
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx
Sun Mar 6 18:42:24 2016
@@ -26,13 +26,14 @@
#include <sal/types.h>
#include <o3tl/cow_wrapper.hxx>
+#include <basegfx/basegfxdllapi.h>
namespace basegfx
{
class B2DTuple;
class Impl2DHomMatrix;
- class B2DHomMatrix
+ class BASEGFX_DLLPUBLIC B2DHomMatrix
{
public:
typedef o3tl::cow_wrapper< Impl2DHomMatrix > ImplType;
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
Sun Mar 6 18:42:24 2016
@@ -28,6 +28,7 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/vector/b2dvector.hxx>
#include <basegfx/range/b2drange.hxx>
+#include <basegfx/basegfxdllapi.h>
namespace rtl { class OUString; }
@@ -45,16 +46,16 @@ namespace basegfx
would introduce slight roundoff errors, instead of
exactly
mirroring the coordinate system)
*/
- void createSinCosOrthogonal(double& o_rSin, double& rCos,
double fRadiant);
+ BASEGFX_DLLPUBLIC void createSinCosOrthogonal(double& o_rSin,
double& rCos, double fRadiant);
/** Tooling methods for on-the-fly matrix generation e.g. for
inline
multiplications
*/
- B2DHomMatrix createScaleB2DHomMatrix(double fScaleX, double
fScaleY);
- B2DHomMatrix createShearXB2DHomMatrix(double fShearX);
- B2DHomMatrix createShearYB2DHomMatrix(double fShearY);
- B2DHomMatrix createRotateB2DHomMatrix(double fRadiant);
- B2DHomMatrix createTranslateB2DHomMatrix(double fTranslateX,
double fTranslateY);
+ BASEGFX_DLLPUBLIC B2DHomMatrix createScaleB2DHomMatrix(double
fScaleX, double fScaleY);
+ BASEGFX_DLLPUBLIC B2DHomMatrix createShearXB2DHomMatrix(double
fShearX);
+ BASEGFX_DLLPUBLIC B2DHomMatrix createShearYB2DHomMatrix(double
fShearY);
+ BASEGFX_DLLPUBLIC B2DHomMatrix createRotateB2DHomMatrix(double
fRadiant);
+ BASEGFX_DLLPUBLIC B2DHomMatrix
createTranslateB2DHomMatrix(double fTranslateX, double fTranslateY);
/// inline versions for parameters as tuples
inline B2DHomMatrix createScaleB2DHomMatrix(const B2DTuple&
rScale)
@@ -74,7 +75,7 @@ namespace basegfx
matrix multiplications.
Inline versions for parameters as tuples added, too.
*/
- B2DHomMatrix createScaleShearXRotateTranslateB2DHomMatrix(
+ BASEGFX_DLLPUBLIC B2DHomMatrix
createScaleShearXRotateTranslateB2DHomMatrix(
double fScaleX, double fScaleY,
double fShearX,
double fRadiant,
@@ -92,7 +93,7 @@ namespace basegfx
rTranslate.getX(), rTranslate.getY());
}
- B2DHomMatrix createShearXRotateTranslateB2DHomMatrix(
+ BASEGFX_DLLPUBLIC B2DHomMatrix
createShearXRotateTranslateB2DHomMatrix(
double fShearX,
double fRadiant,
double fTranslateX, double fTranslateY);
@@ -107,7 +108,7 @@ namespace basegfx
rTranslate.getX(), rTranslate.getY());
}
- B2DHomMatrix createScaleTranslateB2DHomMatrix(
+ BASEGFX_DLLPUBLIC B2DHomMatrix createScaleTranslateB2DHomMatrix(
double fScaleX, double fScaleY,
double fTranslateX, double fTranslateY);
inline B2DHomMatrix createScaleTranslateB2DHomMatrix(
@@ -120,7 +121,7 @@ namespace basegfx
}
/// special for the often used case of rotation around a point
- B2DHomMatrix createRotateAroundPoint(
+ BASEGFX_DLLPUBLIC B2DHomMatrix createRotateAroundPoint(
double fPointX, double fPointY,
double fRadiant);
inline B2DHomMatrix createRotateAroundPoint(
@@ -133,7 +134,7 @@ namespace basegfx
}
/// special for the case to map from source range to target range
- B2DHomMatrix createSourceRangeTargetRangeTransform(
+ BASEGFX_DLLPUBLIC B2DHomMatrix createSourceRangeTargetRangeTransform(
const B2DRange& rSourceRange,
const B2DRange& rTargetRange);
@@ -146,7 +147,7 @@ namespace basegfx
{
namespace tools
{
- class B2DHomMatrixBufferedDecompose
+ class BASEGFX_DLLPUBLIC B2DHomMatrixBufferedDecompose
{
private:
B2DVector maScale;
@@ -185,7 +186,7 @@ namespace basegfx
{
namespace tools
{
- class B2DHomMatrixBufferedOnDemandDecompose
+ class BASEGFX_DLLPUBLIC B2DHomMatrixBufferedOnDemandDecompose
{
private:
B2DHomMatrix maB2DHomMatrix;
@@ -227,7 +228,7 @@ namespace basegfx
} // end of namespace tools
/// Returns a string with svg's "matrix(m00,m10,m01,m11,m02,m12)"
representation
- ::rtl::OUString exportToSvg( const B2DHomMatrix& rMatrix );
+ BASEGFX_DLLPUBLIC ::rtl::OUString exportToSvg( const B2DHomMatrix& rMatrix
);
} // end of namespace basegfx
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx
Sun Mar 6 18:42:24 2016
@@ -28,13 +28,14 @@
#include <basegfx/point/b3dpoint.hxx>
#include <basegfx/vector/b3dvector.hxx>
#include <o3tl/cow_wrapper.hxx>
+#include <basegfx/basegfxdllapi.h>
namespace basegfx
{
class B3DTuple;
class Impl3DHomMatrix;
- class B3DHomMatrix
+ class BASEGFX_DLLPUBLIC B3DHomMatrix
{
public:
typedef o3tl::cow_wrapper< Impl3DHomMatrix > ImplType;
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/numeric/ftools.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/numeric/ftools.hxx?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/numeric/ftools.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/numeric/ftools.hxx
Sun Mar 6 18:42:24 2016
@@ -25,6 +25,7 @@
#define _BGFX_NUMERIC_FTOOLS_HXX
#include <rtl/math.hxx>
+#include <basegfx/basegfxdllapi.h>
//////////////////////////////////////////////////////////////////////////////
// standard PI defines from solar.h, but we do not want to link against tools
@@ -149,15 +150,15 @@ namespace basegfx
snapToNearestMultiple(0.25, 0.5) = 0.0
snapToNearestMultiple(0.26, 0.5) = 0.5
*/
- double snapToNearestMultiple(double v, const double fStep);
+ BASEGFX_DLLPUBLIC double snapToNearestMultiple(double v, const double
fStep);
/** Snap v to the range [0.0 .. fWidth] using modulo
*/
- double snapToZeroRange(double v, double fWidth);
+ BASEGFX_DLLPUBLIC double snapToZeroRange(double v, double fWidth);
/** Snap v to the range [fLow .. fHigh] using modulo
*/
- double snapToRange(double v, double fLow, double fHigh);
+ BASEGFX_DLLPUBLIC double snapToRange(double v, double fLow, double
fHigh);
/** return fValue with the sign of fSignCarrier, thus evtl. changed
*/
@@ -170,7 +171,7 @@ namespace basegfx
#endif
}
- class fTools
+ class BASEGFX_DLLPUBLIC fTools
{
/// Threshold value for equalZero()
static double
mfSmallValue;
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/pixel/bpixel.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/pixel/bpixel.hxx?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/pixel/bpixel.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/pixel/bpixel.hxx
Sun Mar 6 18:42:24 2016
@@ -27,6 +27,7 @@
#include <sal/types.h>
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/color/bcolor.hxx>
+#include <basegfx/basegfxdllapi.h>
//////////////////////////////////////////////////////////////////////////////
// predeclarations
@@ -35,7 +36,7 @@
namespace basegfx
{
- class BPixel
+ class BASEGFX_DLLPUBLIC BPixel
{
protected:
union
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b2dhompoint.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b2dhompoint.hxx?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b2dhompoint.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b2dhompoint.hxx
Sun Mar 6 18:42:24 2016
@@ -25,6 +25,7 @@
#define _BGFX_POINT_B2DHOMPOINT_HXX
#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/basegfxdllapi.h>
namespace basegfx
{
@@ -41,7 +42,7 @@ namespace basegfx
@see B2DTuple
*/
- class B2DHomPoint
+ class BASEGFX_DLLPUBLIC B2DHomPoint
{
protected:
/// This member contains the coordinate part of the point
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b2dpoint.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b2dpoint.hxx?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b2dpoint.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b2dpoint.hxx
Sun Mar 6 18:42:24 2016
@@ -26,6 +26,7 @@
#include <basegfx/tuple/b2dtuple.hxx>
#include <basegfx/point/b2ipoint.hxx>
+#include <basegfx/basegfxdllapi.h>
//////////////////////////////////////////////////////////////////////////////
@@ -42,7 +43,7 @@ namespace basegfx
@see B2DTuple
*/
- class B2DPoint : public ::basegfx::B2DTuple
+ class BASEGFX_DLLPUBLIC B2DPoint : public ::basegfx::B2DTuple
{
public:
/** Create a 2D Point
@@ -139,7 +140,7 @@ namespace basegfx
Since this is a Point, translational components of the
matrix are used.
*/
- B2DPoint operator*( const B2DHomMatrix& rMat, const B2DPoint& rPoint );
+ BASEGFX_DLLPUBLIC B2DPoint operator*( const B2DHomMatrix& rMat, const
B2DPoint& rPoint );
} // end of namespace basegfx
//////////////////////////////////////////////////////////////////////////////
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b2ipoint.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b2ipoint.hxx?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b2ipoint.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b2ipoint.hxx
Sun Mar 6 18:42:24 2016
@@ -25,6 +25,7 @@
#define _BGFX_POINT_B2IPOINT_HXX
#include <basegfx/tuple/b2ituple.hxx>
+#include <basegfx/basegfxdllapi.h>
namespace basegfx
{
@@ -39,7 +40,7 @@ namespace basegfx
@see B2ITuple
*/
- class B2IPoint : public ::basegfx::B2ITuple
+ class BASEGFX_DLLPUBLIC B2IPoint : public ::basegfx::B2ITuple
{
public:
/** Create a 2D Point
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b3dhompoint.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b3dhompoint.hxx?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b3dhompoint.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b3dhompoint.hxx
Sun Mar 6 18:42:24 2016
@@ -25,6 +25,7 @@
#define _BGFX_POINT_B3DHOMPOINT_HXX
#include <basegfx/point/b3dpoint.hxx>
+#include <basegfx/basegfxdllapi.h>
namespace basegfx
{
@@ -41,7 +42,7 @@ namespace basegfx
@see B3DTuple
*/
- class B3DHomPoint
+ class BASEGFX_DLLPUBLIC B3DHomPoint
{
protected:
/// This member contains the coordinate part of the point
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b3dpoint.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b3dpoint.hxx?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b3dpoint.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b3dpoint.hxx
Sun Mar 6 18:42:24 2016
@@ -25,6 +25,7 @@
#define _BGFX_POINT_B3DPOINT_HXX
#include <basegfx/tuple/b3dtuple.hxx>
+#include <basegfx/basegfxdllapi.h>
namespace basegfx
{
@@ -39,7 +40,7 @@ namespace basegfx
@see B3DTuple
*/
- class B3DPoint : public ::basegfx::B3DTuple
+ class BASEGFX_DLLPUBLIC B3DPoint : public ::basegfx::B3DTuple
{
public:
/** Create a 3D Point
@@ -139,7 +140,7 @@ namespace basegfx
Since this is a Point, translational components of the
matrix are used.
*/
- B3DPoint operator*( const B3DHomMatrix& rMat, const B3DPoint& rPoint );
+ BASEGFX_DLLPUBLIC B3DPoint operator*( const B3DHomMatrix& rMat, const
B3DPoint& rPoint );
} // end of namespace basegfx
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b3ipoint.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b3ipoint.hxx?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b3ipoint.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b3ipoint.hxx
Sun Mar 6 18:42:24 2016
@@ -25,6 +25,7 @@
#define _BGFX_POINT_B3IPOINT_HXX
#include <basegfx/tuple/b3ituple.hxx>
+#include <basegfx/basegfxdllapi.h>
namespace basegfx
{
@@ -39,7 +40,7 @@ namespace basegfx
@see B3ITuple
*/
- class B3IPoint : public ::basegfx::B3ITuple
+ class BASEGFX_DLLPUBLIC B3IPoint : public ::basegfx::B3ITuple
{
public:
/** Create a 3D Point
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx
Sun Mar 6 18:42:24 2016
@@ -29,6 +29,7 @@
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <com/sun/star/drawing/LineCap.hpp>
+#include <basegfx/basegfxdllapi.h>
//////////////////////////////////////////////////////////////////////////////
@@ -69,7 +70,7 @@ namespace basegfx
@return
The Line start and end polygon, correctly rotated and scaled
*/
- B2DPolyPolygon createAreaGeometryForLineStartEnd(
+ BASEGFX_DLLPUBLIC B2DPolyPolygon
createAreaGeometryForLineStartEnd(
const B2DPolygon& rCandidate,
const B2DPolyPolygon& rArrow,
bool bStart,
@@ -128,7 +129,7 @@ namespace basegfx
it's line width. Contains bezier segments and edge roundings as
needed and defined.
*/
- B2DPolyPolygon createAreaGeometry(
+ BASEGFX_DLLPUBLIC B2DPolyPolygon createAreaGeometry(
const B2DPolygon& rCandidate,
double fHalfLineWidth,
B2DLineJoin eJoin = B2DLINEJOIN_ROUND,
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
Sun Mar 6 18:42:24 2016
@@ -28,6 +28,7 @@
#include <o3tl/cow_wrapper.hxx>
#include <basegfx/vector/b2enums.hxx>
#include <basegfx/range/b2drange.hxx>
+#include <basegfx/basegfxdllapi.h>
//////////////////////////////////////////////////////////////////////////////
// predeclarations
@@ -46,7 +47,7 @@ namespace basegfx
namespace basegfx
{
- class B2DPolygon
+ class BASEGFX_DLLPUBLIC B2DPolygon
{
public:
typedef o3tl::cow_wrapper< ImplB2DPolygon > ImplType;
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx
Sun Mar 6 18:42:24 2016
@@ -26,6 +26,7 @@
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/basegfxdllapi.h>
//////////////////////////////////////////////////////////////////////////////
@@ -42,21 +43,21 @@ namespace basegfx
// a clip axis parallel to X.Axis and 100 above it, use
bParallelToXAxis = true and fValueOnOtherAxis = 100.
// The value bAboveAxis defines on which side the return value
will be (true -> above X, right of Y).
// The switch bStroke decides if the polygon is interpreted as
area (false) or strokes (true).
- B2DPolyPolygon clipPolyPolygonOnParallelAxis(const
B2DPolyPolygon& rCandidate, bool bParallelToXAxis, bool bAboveAxis, double
fValueOnOtherAxis, bool bStroke);
- B2DPolyPolygon clipPolygonOnParallelAxis(const B2DPolygon&
rCandidate, bool bParallelToXAxis, bool bAboveAxis, double fValueOnOtherAxis,
bool bStroke);
+ BASEGFX_DLLPUBLIC B2DPolyPolygon
clipPolyPolygonOnParallelAxis(const B2DPolyPolygon& rCandidate, bool
bParallelToXAxis, bool bAboveAxis, double fValueOnOtherAxis, bool bStroke);
+ BASEGFX_DLLPUBLIC B2DPolyPolygon
clipPolygonOnParallelAxis(const B2DPolygon& rCandidate, bool bParallelToXAxis,
bool bAboveAxis, double fValueOnOtherAxis, bool bStroke);
// Clip the given PolyPolygon against the given range. bInside
defines if the result will contain the
// parts which are contained in the range or vice versa.
// The switch bStroke decides if the polygon is interpreted as
area (false) or strokes (true).
- B2DPolyPolygon clipPolyPolygonOnRange(const B2DPolyPolygon&
rCandidate, const B2DRange& rRange, bool bInside, bool bStroke);
- B2DPolyPolygon clipPolygonOnRange(const B2DPolygon& rCandidate,
const B2DRange& rRange, bool bInside, bool bStroke);
+ BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolyPolygonOnRange(const
B2DPolyPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke);
+ BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolygonOnRange(const
B2DPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke);
// Clip given PolyPolygon against the endless edge (ray)
defined by the given two points. bAbove defines on which side
// of the edge the result will be together with the definition
of the edge. If the edge is seen as a vector
// from A to B and bAbove is true, the result will contain the
geometry left of the vector.
// The switch bStroke decides if the polygon is interpreted as
area (false) or strokes (true).
- B2DPolyPolygon clipPolyPolygonOnEdge(const B2DPolyPolygon&
rCandidate, const B2DPoint& rPointA, const B2DPoint& rPointB, bool bAbove, bool
bStroke);
- B2DPolyPolygon clipPolygonOnEdge(const B2DPolygon& rCandidate,
const B2DPoint& rPointA, const B2DPoint& rPointB, bool bAbove, bool bStroke);
+ BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolyPolygonOnEdge(const
B2DPolyPolygon& rCandidate, const B2DPoint& rPointA, const B2DPoint& rPointB,
bool bAbove, bool bStroke);
+ BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolygonOnEdge(const
B2DPolygon& rCandidate, const B2DPoint& rPointA, const B2DPoint& rPointB, bool
bAbove, bool bStroke);
// Clip given PolyPolygon against given clipping polygon.
// The switch bStroke decides if the polygon is interpreted as
area (false) or strokes (true).
@@ -64,13 +65,13 @@ namespace basegfx
// With filled polygons, You get all PolyPolygon parts which
were inside rClip.
// The switch bInside decides if the parts inside the clip
polygon or outside shall be created.
// The clip polygon is always assumed closed, even when it's
isClosed() is false.
- B2DPolyPolygon clipPolyPolygonOnPolyPolygon(const
B2DPolyPolygon& rCandidate, const B2DPolyPolygon& rClip, bool bInside, bool
bStroke);
- B2DPolyPolygon clipPolygonOnPolyPolygon(const B2DPolygon&
rCandidate, const B2DPolyPolygon& rClip, bool bInside, bool bStroke);
+ BASEGFX_DLLPUBLIC B2DPolyPolygon
clipPolyPolygonOnPolyPolygon(const B2DPolyPolygon& rCandidate, const
B2DPolyPolygon& rClip, bool bInside, bool bStroke);
+ BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolygonOnPolyPolygon(const
B2DPolygon& rCandidate, const B2DPolyPolygon& rClip, bool bInside, bool
bStroke);
// clip the given polygon against the given range. the
resulting polygon will always contain
// the inside parts which will always be interpreted as areas.
the incoming polygon is expected
// to be a simple triangle list. the result is also a simple
triangle list.
- B2DPolygon clipTriangleListOnRange( const B2DPolygon&
rCandidate, const B2DRange& rRange );
+ BASEGFX_DLLPUBLIC B2DPolygon clipTriangleListOnRange( const
B2DPolygon& rCandidate, const B2DRange& rRange );
} // end of namespace tools
} // end of namespace basegfx
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx
Sun Mar 6 18:42:24 2016
@@ -26,6 +26,7 @@
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/basegfxdllapi.h>
//////////////////////////////////////////////////////////////////////////////
@@ -35,39 +36,39 @@ namespace basegfx
{
// look for self-intersections and self-touches (points on an
edge) in given polygon and add
// extra points there. Result will have no touches or
intersections on an edge, only on points
- B2DPolygon addPointsAtCutsAndTouches(const B2DPolygon&
rCandidate);
+ BASEGFX_DLLPUBLIC B2DPolygon addPointsAtCutsAndTouches(const
B2DPolygon& rCandidate);
// look for polypolygon-intersections and polypolygon-touches
(point of poly A on an edge of poly B) in given PolyPolygon and add
// extra points there. Result will have no touches or
intersections between contained polygons on an edge, only on points. For
// convenience, the correction for self-intersections for each
member polygon will be used, too.
// Changed: Self intersections are searched by default, but may
be switched off by 2nd parameter.
- B2DPolyPolygon addPointsAtCutsAndTouches(const B2DPolyPolygon&
rCandidate, bool bSelfIntersections = true);
+ BASEGFX_DLLPUBLIC B2DPolyPolygon
addPointsAtCutsAndTouches(const B2DPolyPolygon& rCandidate, bool
bSelfIntersections = true);
// look for intersections of rCandidate with all polygons from
rMask and add extra points there. Do
// not change or add points to rMask.
- B2DPolygon addPointsAtCutsAndTouches(const B2DPolyPolygon&
rMask, const B2DPolygon& rCandidate);
+ BASEGFX_DLLPUBLIC B2DPolygon addPointsAtCutsAndTouches(const
B2DPolyPolygon& rMask, const B2DPolygon& rCandidate);
// look for intersections of rCandidate with all polygons from
rMask and add extra points there. Do
// not change or add points to rMask.
- B2DPolyPolygon addPointsAtCutsAndTouches(const B2DPolyPolygon&
rMask, const B2DPolyPolygon& rCandidate);
+ BASEGFX_DLLPUBLIC B2DPolyPolygon
addPointsAtCutsAndTouches(const B2DPolyPolygon& rMask, const B2DPolyPolygon&
rCandidate);
// look for intersections of rCandidate with the edge from
rStart to rEnd and add extra points there.
// Points are only added in the range of the edge, not on the endless
vector.
- B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate, const
B2DPoint& rStart, const B2DPoint& rEnd);
- B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon& rCandidate, const
B2DPoint& rStart, const B2DPoint& rEnd);
+ BASEGFX_DLLPUBLIC B2DPolygon addPointsAtCuts(const B2DPolygon&
rCandidate, const B2DPoint& rStart, const B2DPoint& rEnd);
+ BASEGFX_DLLPUBLIC B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon&
rCandidate, const B2DPoint& rStart, const B2DPoint& rEnd);
// look for intersections of rCandidate with the mask Polygon
and add extra points there.
// The mask polygon is assumed to be closed, even when it's not
explicitely.
- B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate, const
B2DPolyPolygon& rMask);
- B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon& rCandidate, const
B2DPolyPolygon& rMask);
+ BASEGFX_DLLPUBLIC B2DPolygon addPointsAtCuts(const B2DPolygon&
rCandidate, const B2DPolyPolygon& rMask);
+ BASEGFX_DLLPUBLIC B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon&
rCandidate, const B2DPolyPolygon& rMask);
// look for self-intersections in given polygon and add extra
points there. Result will have no
// intersections on an edge
- B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate);
+ BASEGFX_DLLPUBLIC B2DPolygon addPointsAtCuts(const B2DPolygon&
rCandidate);
// add points at all self-intersections of single polygons (depends on
bSelfIntersections)
// and at polygon-polygon intersections
- B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon&
rCandidate, bool bSelfIntersections = true);
+ BASEGFX_DLLPUBLIC B2DPolyPolygon addPointsAtCuts(const
B2DPolyPolygon& rCandidate, bool bSelfIntersections = true);
} // end of namespace tools
} // end of namespace basegfx
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
Sun Mar 6 18:42:24 2016
@@ -32,6 +32,7 @@
#include <com/sun/star/drawing/PointSequence.hpp>
#include <com/sun/star/drawing/FlagSequence.hpp>
#include <vector>
+#include <basegfx/basegfxdllapi.h>
//////////////////////////////////////////////////////////////////////////////
@@ -46,8 +47,8 @@ namespace basegfx
// B2DPolygon tools
// open/close with point add/remove and control point
corrections
- void openWithGeometryChange(B2DPolygon& rCandidate);
- void closeWithGeometryChange(B2DPolygon& rCandidate);
+ BASEGFX_DLLPUBLIC void openWithGeometryChange(B2DPolygon&
rCandidate);
+ BASEGFX_DLLPUBLIC void closeWithGeometryChange(B2DPolygon&
rCandidate);
/** Check if given polygon is closed.
@@ -58,20 +59,20 @@ namespace basegfx
start/end points) and sets the Closed()-state of the
polygon correctly.
*/
- void checkClosed(B2DPolygon& rCandidate);
+ BASEGFX_DLLPUBLIC void checkClosed(B2DPolygon& rCandidate);
// Get successor and predecessor indices. Returning the same
index means there
// is none. Same for successor.
- sal_uInt32 getIndexOfPredecessor(sal_uInt32 nIndex, const
B2DPolygon& rCandidate);
- sal_uInt32 getIndexOfSuccessor(sal_uInt32 nIndex, const
B2DPolygon& rCandidate);
+ BASEGFX_DLLPUBLIC sal_uInt32 getIndexOfPredecessor(sal_uInt32
nIndex, const B2DPolygon& rCandidate);
+ BASEGFX_DLLPUBLIC sal_uInt32 getIndexOfSuccessor(sal_uInt32
nIndex, const B2DPolygon& rCandidate);
// Get orientation of Polygon
- B2VectorOrientation getOrientation(const B2DPolygon&
rCandidate);
+ BASEGFX_DLLPUBLIC B2VectorOrientation getOrientation(const
B2DPolygon& rCandidate);
// isInside tests for B2dPoint and other B2dPolygon. On border
is not inside as long as
// not true is given in bWithBorder flag.
- bool isInside(const B2DPolygon& rCandidate, const B2DPoint&
rPoint, bool bWithBorder = false);
- bool isInside(const B2DPolygon& rCandidate, const B2DPolygon&
rPolygon, bool bWithBorder = false);
+ BASEGFX_DLLPUBLIC bool isInside(const B2DPolygon& rCandidate,
const B2DPoint& rPoint, bool bWithBorder = false);
+ BASEGFX_DLLPUBLIC bool isInside(const B2DPolygon& rCandidate,
const B2DPolygon& rPolygon, bool bWithBorder = false);
/** Get the range of a polygon including bezier control points
@@ -83,7 +84,7 @@ namespace basegfx
@return
The outer range of the bezier curve containing bezier
control points
*/
- B2DRange getRangeWithControlPoints(const B2DPolygon&
rCandidate);
+ BASEGFX_DLLPUBLIC B2DRange getRangeWithControlPoints(const
B2DPolygon& rCandidate);
/** Get the range of a polygon
@@ -96,53 +97,53 @@ namespace basegfx
@return
The outer range of the bezier curve
*/
- B2DRange getRange(const B2DPolygon& rCandidate);
+ BASEGFX_DLLPUBLIC B2DRange getRange(const B2DPolygon&
rCandidate);
// get signed area of polygon
- double getSignedArea(const B2DPolygon& rCandidate);
+ BASEGFX_DLLPUBLIC double getSignedArea(const B2DPolygon&
rCandidate);
// get area of polygon
- double getArea(const B2DPolygon& rCandidate);
+ BASEGFX_DLLPUBLIC double getArea(const B2DPolygon& rCandidate);
/** get length of polygon edge from point nIndex to nIndex + 1
*/
- double getEdgeLength(const B2DPolygon& rCandidate, sal_uInt32
nIndex);
+ BASEGFX_DLLPUBLIC double getEdgeLength(const B2DPolygon&
rCandidate, sal_uInt32 nIndex);
/** get length of polygon */
- double getLength(const B2DPolygon& rCandidate);
+ BASEGFX_DLLPUBLIC double getLength(const B2DPolygon&
rCandidate);
// get position on polygon for absolute given distance. If
// length is given, it is assumed the correct polygon length,
if 0.0 it is calculated
// using getLength(...)
- B2DPoint getPositionAbsolute(const B2DPolygon& rCandidate,
double fDistance, double fLength = 0.0);
+ BASEGFX_DLLPUBLIC B2DPoint getPositionAbsolute(const
B2DPolygon& rCandidate, double fDistance, double fLength = 0.0);
// get position on polygon for relative given distance in range
[0.0 .. 1.0]. If
// length is given, it is assumed the correct polygon length,
if 0.0 it is calculated
// using getLength(...)
- B2DPoint getPositionRelative(const B2DPolygon& rCandidate,
double fDistance, double fLength = 0.0);
+ BASEGFX_DLLPUBLIC B2DPoint getPositionRelative(const
B2DPolygon& rCandidate, double fDistance, double fLength = 0.0);
// get a snippet from given polygon for absolute distances. The
polygon is assumed
// to be opened (not closed). fFrom and fTo need to be in range
[0.0 .. fLength], where
// fTo >= fFrom. If length is given, it is assumed the correct
polygon length,
// if 0.0 it is calculated using getLength(...)
- B2DPolygon getSnippetAbsolute(const B2DPolygon& rCandidate,
double fFrom, double fTo, double fLength = 0.0);
+ BASEGFX_DLLPUBLIC B2DPolygon getSnippetAbsolute(const
B2DPolygon& rCandidate, double fFrom, double fTo, double fLength = 0.0);
// get a snippet from given polygon for relative distances. The
polygon is assumed
// to be opened (not closed). fFrom and fTo need to be in range
[0.0 .. 1.0], where
// fTo >= fFrom. If length is given, it is assumed the correct
polygon length,
// if 0.0 it is calculated using getLength(...)
- B2DPolygon getSnippetRelative(const B2DPolygon& rCandidate,
double fFrom = 0.0, double fTo = 1.0, double fLength = 0.0);
+ BASEGFX_DLLPUBLIC B2DPolygon getSnippetRelative(const
B2DPolygon& rCandidate, double fFrom = 0.0, double fTo = 1.0, double fLength =
0.0);
// Continuity check for point with given index
- B2VectorContinuity getContinuityInPoint(const B2DPolygon&
rCandidate, sal_uInt32 nIndex);
+ BASEGFX_DLLPUBLIC B2VectorContinuity getContinuityInPoint(const
B2DPolygon& rCandidate, sal_uInt32 nIndex);
// Subdivide all contained curves. Use distanceBound value if
given.
- B2DPolygon adaptiveSubdivideByDistance(const B2DPolygon&
rCandidate, double fDistanceBound = 0.0);
+ BASEGFX_DLLPUBLIC B2DPolygon adaptiveSubdivideByDistance(const
B2DPolygon& rCandidate, double fDistanceBound = 0.0);
// Subdivide all contained curves. Use angleBound value if
given.
- B2DPolygon adaptiveSubdivideByAngle(const B2DPolygon&
rCandidate, double fAngleBound = 0.0);
+ BASEGFX_DLLPUBLIC B2DPolygon adaptiveSubdivideByAngle(const
B2DPolygon& rCandidate, double fAngleBound = 0.0);
// #i37443# Subdivide all contained curves.
- B2DPolygon adaptiveSubdivideByCount(const B2DPolygon&
rCandidate, sal_uInt32 nCount = 0L);
+ BASEGFX_DLLPUBLIC B2DPolygon adaptiveSubdivideByCount(const
B2DPolygon& rCandidate, sal_uInt32 nCount = 0L);
// Definitions for the cut flags used from the findCut methods
typedef sal_uInt16 CutFlagValue;
@@ -159,7 +160,7 @@ namespace basegfx
// Calculate cut between the points given by the two indices.
pCut1
// and pCut2 will contain the cut coordinate on each edge in
]0.0, 1.0]
// (if given) and the return value will contain a cut
description.
- CutFlagValue findCut(
+ BASEGFX_DLLPUBLIC CutFlagValue findCut(
const B2DPolygon& rCandidate,
sal_uInt32 nIndex1, sal_uInt32 nIndex2,
CutFlagValue aCutFlags = CUTFLAG_DEFAULT,
@@ -167,7 +168,7 @@ namespace basegfx
// This version is working with two indexed edges from different
// polygons.
- CutFlagValue findCut(
+ BASEGFX_DLLPUBLIC CutFlagValue findCut(
const B2DPolygon& rCandidate1, sal_uInt32 nIndex1,
const B2DPolygon& rCandidate2, sal_uInt32 nIndex2,
CutFlagValue aCutFlags = CUTFLAG_DEFAULT,
@@ -175,7 +176,7 @@ namespace basegfx
// This version works with two points and vectors to define the
// edges for the cut test.
- CutFlagValue findCut(
+ BASEGFX_DLLPUBLIC CutFlagValue findCut(
const B2DPoint& rEdge1Start, const B2DVector&
rEdge1Delta,
const B2DPoint& rEdge2Start, const B2DVector&
rEdge2Delta,
CutFlagValue aCutFlags = CUTFLAG_DEFAULT,
@@ -184,7 +185,7 @@ namespace basegfx
// test if point is on the given edge in range ]0.0..1.0[
without
// the start/end points. If so, return true and put the
parameter
// value in pCut (if provided)
- bool isPointOnEdge(
+ BASEGFX_DLLPUBLIC bool isPointOnEdge(
const B2DPoint& rPoint,
const B2DPoint& rEdgeStart,
const B2DVector& rEdgeDelta,
@@ -223,24 +224,24 @@ namespace basegfx
The sumed-up length of the rDotDashArray. If zero, it
will
be calculated internally.
*/
- void applyLineDashing(
+ BASEGFX_DLLPUBLIC BASEGFX_DLLPUBLIC void applyLineDashing(
const B2DPolygon& rCandidate,
const ::std::vector<double>& rDotDashArray,
B2DPolyPolygon* pLineTarget,
- B2DPolyPolygon* pGapTarget = 0,
+ BASEGFX_DLLPUBLIC B2DPolyPolygon* pGapTarget = 0,
double fFullDashDotLen = 0.0);
// test if point is inside epsilon-range around an edge defined
// by the two given points. Can be used for HitTesting. The
epsilon-range
// is defined to be the rectangle centered to the given edge,
using height
// 2 x fDistance, and the circle around both points with radius
fDistance.
- bool isInEpsilonRange(const B2DPoint& rEdgeStart, const
B2DPoint& rEdgeEnd, const B2DPoint& rTestPosition, double fDistance);
+ BASEGFX_DLLPUBLIC bool isInEpsilonRange(const B2DPoint&
rEdgeStart, const B2DPoint& rEdgeEnd, const B2DPoint& rTestPosition, double
fDistance);
// test if point is inside epsilon-range around the given
Polygon. Can be used
// for HitTesting. The epsilon-range is defined to be the
rectangle centered
// to the given edge, using height 2 x fDistance, and the circle
around both points
// with radius fDistance.
- bool isInEpsilonRange(const B2DPolygon& rCandidate, const
B2DPoint& rTestPosition, double fDistance);
+ BASEGFX_DLLPUBLIC bool isInEpsilonRange(const B2DPolygon&
rCandidate, const B2DPoint& rTestPosition, double fDistance);
/** Create a polygon from a rectangle.
@@ -251,7 +252,7 @@ namespace basegfx
Radius of the edge rounding, relative to the rectangle size. 0.0
means no
rounding, 1.0 will lead to an ellipse
*/
- B2DPolygon createPolygonFromRect( const B2DRectangle& rRect, double
fRadius );
+ BASEGFX_DLLPUBLIC B2DPolygon createPolygonFromRect( const
B2DRectangle& rRect, double fRadius );
/** Create a polygon from a rectangle.
@@ -263,15 +264,15 @@ namespace basegfx
Radius of the edge rounding, relative to the rectangle size. 0.0
means no
rounding, 1.0 will lead to an ellipse
*/
- B2DPolygon createPolygonFromRect( const B2DRectangle& rRect,
double fRadiusX, double fRadiusY );
+ BASEGFX_DLLPUBLIC B2DPolygon createPolygonFromRect( const
B2DRectangle& rRect, double fRadiusX, double fRadiusY );
/** Create a polygon from a rectangle.
*/
- B2DPolygon createPolygonFromRect( const B2DRectangle& rRect );
+ BASEGFX_DLLPUBLIC B2DPolygon createPolygonFromRect( const
B2DRectangle& rRect );
/** Create the unit polygon
*/
- B2DPolygon createUnitPolygon();
+ BASEGFX_DLLPUBLIC B2DPolygon createUnitPolygon();
/** Create a circle polygon with given radius.
@@ -285,7 +286,7 @@ namespace basegfx
@param fRadius
Radius of the circle
*/
- B2DPolygon createPolygonFromCircle( const B2DPoint& rCenter, double
fRadius );
+ BASEGFX_DLLPUBLIC B2DPolygon createPolygonFromCircle( const B2DPoint&
rCenter, double fRadius );
/// create half circle centered on (0,0) from [0 .. F_PI]
B2DPolygon createHalfUnitCircle();
@@ -300,7 +301,7 @@ namespace basegfx
this is the lowest one). This is needed since when
lines are dashed, toe old
geometry started at bottom point, else it would look
different.
*/
- B2DPolygon createPolygonFromUnitCircle(sal_uInt32 nStartQuadrant = 0);
+ BASEGFX_DLLPUBLIC B2DPolygon createPolygonFromUnitCircle(sal_uInt32
nStartQuadrant = 0);
/** Create an ellipse polygon with given radii.
@@ -317,13 +318,13 @@ namespace basegfx
@param fRadiusY
Radius of the ellipse in Y direction
*/
- B2DPolygon createPolygonFromEllipse( const B2DPoint& rCenter, double
fRadiusX, double fRadiusY );
+ BASEGFX_DLLPUBLIC B2DPolygon createPolygonFromEllipse( const B2DPoint&
rCenter, double fRadiusX, double fRadiusY );
/** Create an unit ellipse polygon with the given angles, from
start to end
*/
- B2DPolygon createPolygonFromEllipseSegment( const B2DPoint& rCenter,
double fRadiusX, double fRadiusY, double fStart, double fEnd );
+ BASEGFX_DLLPUBLIC B2DPolygon createPolygonFromEllipseSegment( const
B2DPoint& rCenter, double fRadiusX, double fRadiusY, double fStart,
double fEnd );
- B2DPolygon createPolygonFromUnitEllipseSegment( double fStart, double
fEnd );
+ BASEGFX_DLLPUBLIC B2DPolygon createPolygonFromUnitEllipseSegment(
double fStart, double fEnd );
/** Predicate whether a given polygon is a rectangle.
@@ -335,111 +336,111 @@ namespace basegfx
enumerations of a rectangle's vertices). Note that
intermediate points and duplicate points are ignored.
*/
- bool isRectangle( const B2DPolygon& rPoly );
+ BASEGFX_DLLPUBLIC bool isRectangle( const B2DPolygon& rPoly );
// create 3d polygon from given 2d polygon. The given
fZCoordinate is used to expand the
// third coordinate.
- B3DPolygon createB3DPolygonFromB2DPolygon(const B2DPolygon&
rCandidate, double fZCoordinate = 0.0);
+ BASEGFX_DLLPUBLIC B3DPolygon
createB3DPolygonFromB2DPolygon(const B2DPolygon& rCandidate, double
fZCoordinate = 0.0);
// create 2d PolyPolygon from given 3d PolyPolygon. All
coordinates are transformed using the given
// matrix and the resulting x,y is used to form the new polygon.
- B2DPolygon createB2DPolygonFromB3DPolygon(const B3DPolygon&
rCandidate, const B3DHomMatrix& rMat);
+ BASEGFX_DLLPUBLIC B2DPolygon
createB2DPolygonFromB3DPolygon(const B3DPolygon& rCandidate, const
B3DHomMatrix& rMat);
// create simplified version of the original polygon by
// replacing segments with spikes/loops and self intersections
// by several trivial sub-segments
- B2DPolygon createSimplifiedPolygon(const B2DPolygon&);
+ BASEGFX_DLLPUBLIC B2DPolygon createSimplifiedPolygon(const
B2DPolygon&);
// calculate the distance to the given endless ray and return.
The relative position on the edge is returned in Cut.
// That position may be less than 0.0 or more than 1.0
- double getDistancePointToEndlessRay(const B2DPoint& rPointA,
const B2DPoint& rPointB, const B2DPoint& rTestPoint, double& rCut);
+ BASEGFX_DLLPUBLIC double getDistancePointToEndlessRay(const
B2DPoint& rPointA, const B2DPoint& rPointB, const B2DPoint& rTestPoint, double&
rCut);
// calculate the smallest distance to given edge and return.
The relative position on the edge is returned in Cut.
// That position is in the range [0.0 .. 1.0] and the returned
distance is adapted accordingly to the start or end
// point of the edge
- double getSmallestDistancePointToEdge(const B2DPoint& rPointA,
const B2DPoint& rPointB, const B2DPoint& rTestPoint, double& rCut);
+ BASEGFX_DLLPUBLIC double getSmallestDistancePointToEdge(const
B2DPoint& rPointA, const B2DPoint& rPointB, const B2DPoint& rTestPoint, double&
rCut);
// for each contained edge calculate the smallest distance.
Return the index to the smallest
// edge in rEdgeIndex. The relative position on the edge is
returned in rCut.
// If nothing was found (e.g. empty input plygon), DBL_MAX is
returned.
- double getSmallestDistancePointToPolygon(const B2DPolygon&
rCandidate, const B2DPoint& rTestPoint, sal_uInt32& rEdgeIndex, double& rCut);
+ BASEGFX_DLLPUBLIC double
getSmallestDistancePointToPolygon(const B2DPolygon& rCandidate, const B2DPoint&
rTestPoint, sal_uInt32& rEdgeIndex, double& rCut);
// distort single point. rOriginal describes the original
range, where the given points describe the distorted corresponding points.
- B2DPoint distort(const B2DPoint& rCandidate, const B2DRange&
rOriginal, const B2DPoint& rTopLeft, const B2DPoint& rTopRight, const B2DPoint&
rBottomLeft, const B2DPoint& rBottomRight);
+ BASEGFX_DLLPUBLIC B2DPoint distort(const B2DPoint& rCandidate,
const B2DRange& rOriginal, const B2DPoint& rTopLeft, const B2DPoint& rTopRight,
const B2DPoint& rBottomLeft, const B2DPoint& rBottomRight);
// distort polygon. rOriginal describes the original range,
where the given points describe the distorted corresponding points.
- B2DPolygon distort(const B2DPolygon& rCandidate, const
B2DRange& rOriginal, const B2DPoint& rTopLeft, const B2DPoint& rTopRight, const
B2DPoint& rBottomLeft, const B2DPoint& rBottomRight);
+ BASEGFX_DLLPUBLIC B2DPolygon distort(const B2DPolygon&
rCandidate, const B2DRange& rOriginal, const B2DPoint& rTopLeft, const
B2DPoint& rTopRight, const B2DPoint& rBottomLeft, const B2DPoint& rBottomRight);
// rotate polygon around given point with given angle.
- B2DPolygon rotateAroundPoint(const B2DPolygon& rCandidate,
const B2DPoint& rCenter, double fAngle);
+ BASEGFX_DLLPUBLIC B2DPolygon rotateAroundPoint(const
B2DPolygon& rCandidate, const B2DPoint& rCenter, double fAngle);
// expand all segments (which are not yet) to curve segments.
This is done with setting the control
// vectors on the 1/3 resp. 2/3 distances on each segment.
- B2DPolygon expandToCurve(const B2DPolygon& rCandidate);
+ BASEGFX_DLLPUBLIC B2DPolygon expandToCurve(const B2DPolygon&
rCandidate);
// expand given segment to curve segment. This is done with
setting the control
// vectors on the 1/3 resp. 2/3 distances. The return value
describes if a change took place.
- bool expandToCurveInPoint(B2DPolygon& rCandidate, sal_uInt32
nIndex);
+ BASEGFX_DLLPUBLIC bool expandToCurveInPoint(B2DPolygon&
rCandidate, sal_uInt32 nIndex);
// set continuity for the whole curve. If not a curve, nothing
will change. Non-curve points are not changed, too.
- B2DPolygon setContinuity(const B2DPolygon& rCandidate,
B2VectorContinuity eContinuity);
+ BASEGFX_DLLPUBLIC B2DPolygon setContinuity(const B2DPolygon&
rCandidate, B2VectorContinuity eContinuity);
// set continuity for given index. If not a curve, nothing will
change. Non-curve points are not changed, too.
// The return value describes if a change took place.
- bool setContinuityInPoint(B2DPolygon& rCandidate, sal_uInt32
nIndex, B2VectorContinuity eContinuity);
+ BASEGFX_DLLPUBLIC bool setContinuityInPoint(B2DPolygon&
rCandidate, sal_uInt32 nIndex, B2VectorContinuity eContinuity);
// test if polygon contains neutral points. A neutral point is
one whos orientation is neutral
// e.g. positioned on the edge of it's predecessor and successor
- bool hasNeutralPoints(const B2DPolygon& rCandidate);
+ BASEGFX_DLLPUBLIC bool hasNeutralPoints(const B2DPolygon&
rCandidate);
// remove neutral points. A neutral point is one whos
orientation is neutral
// e.g. positioned on the edge of it's predecessor and successor
- B2DPolygon removeNeutralPoints(const B2DPolygon& rCandidate);
+ BASEGFX_DLLPUBLIC B2DPolygon removeNeutralPoints(const
B2DPolygon& rCandidate);
// tests if polygon is convex
- bool isConvex(const B2DPolygon& rCandidate);
+ BASEGFX_DLLPUBLIC bool isConvex(const B2DPolygon& rCandidate);
// calculates the orientation at edge nIndex
- B2VectorOrientation getOrientationForIndex(const B2DPolygon&
rCandidate, sal_uInt32 nIndex);
+ BASEGFX_DLLPUBLIC B2VectorOrientation
getOrientationForIndex(const B2DPolygon& rCandidate, sal_uInt32 nIndex);
// calculates if given point is on given line, taking care of
the numerical epsilon
- bool isPointOnLine(const B2DPoint& rStart, const B2DPoint&
rEnd, const B2DPoint& rCandidate, bool bWithPoints = false);
+ BASEGFX_DLLPUBLIC bool isPointOnLine(const B2DPoint& rStart,
const B2DPoint& rEnd, const B2DPoint& rCandidate, bool bWithPoints = false);
// calculates if given point is on given polygon, taking care
of the numerical epsilon. Uses
// isPointOnLine internally
- bool isPointOnPolygon(const B2DPolygon& rCandidate, const
B2DPoint& rPoint, bool bWithPoints = true);
+ BASEGFX_DLLPUBLIC bool isPointOnPolygon(const B2DPolygon&
rCandidate, const B2DPoint& rPoint, bool bWithPoints = true);
// test if candidate is inside triangle
- bool isPointInTriangle(const B2DPoint& rA, const B2DPoint& rB,
const B2DPoint& rC, const B2DPoint& rCandidate, bool bWithBorder = false);
+ BASEGFX_DLLPUBLIC bool isPointInTriangle(const B2DPoint& rA,
const B2DPoint& rB, const B2DPoint& rC, const B2DPoint& rCandidate, bool
bWithBorder = false);
// test if candidateA and candidateB are on the same side of
the given line
- bool arePointsOnSameSideOfLine(const B2DPoint& rStart, const
B2DPoint& rEnd, const B2DPoint& rCandidateA, const B2DPoint& rCandidateB, bool
bWithLine = false);
+ BASEGFX_DLLPUBLIC bool arePointsOnSameSideOfLine(const
B2DPoint& rStart, const B2DPoint& rEnd, const B2DPoint& rCandidateA, const
B2DPoint& rCandidateB, bool bWithLine = false);
// add triangles for given rCandidate to rTarget. For each
triangle, 3 points will be added to rCandidate.
// All triangles will go from the start point of rCandidate to
two consecutive points, building (rCandidate.count() - 2)
// triangles.
- void addTriangleFan(const B2DPolygon& rCandidate, B2DPolygon&
rTarget);
+ BASEGFX_DLLPUBLIC void addTriangleFan(const B2DPolygon&
rCandidate, B2DPolygon& rTarget);
// grow for polygon. Move all geometry in each point in the
direction of the normal in that point
// with the given amount. Value may be negative.
- B2DPolygon growInNormalDirection(const B2DPolygon& rCandidate,
double fValue);
+ BASEGFX_DLLPUBLIC B2DPolygon growInNormalDirection(const
B2DPolygon& rCandidate, double fValue);
// force all sub-polygons to a point count of nSegments
- B2DPolygon reSegmentPolygon(const B2DPolygon& rCandidate,
sal_uInt32 nSegments);
+ BASEGFX_DLLPUBLIC B2DPolygon reSegmentPolygon(const B2DPolygon&
rCandidate, sal_uInt32 nSegments);
// create polygon state at t from 0.0 to 1.0 between the two
polygons. Both polygons must have the same
// organisation, e.g. same amount of points
- B2DPolygon interpolate(const B2DPolygon& rOld1, const
B2DPolygon& rOld2, double t);
+ BASEGFX_DLLPUBLIC B2DPolygon interpolate(const B2DPolygon&
rOld1, const B2DPolygon& rOld2, double t);
- bool isPolyPolygonEqualRectangle( const B2DPolyPolygon&
rPolyPoly, const B2DRange& rRect );
+ BASEGFX_DLLPUBLIC bool isPolyPolygonEqualRectangle( const
B2DPolyPolygon& rPolyPoly, const B2DRange& rRect );
// #i76891# Try to remove existing curve segments if they are
simply edges
- B2DPolygon simplifyCurveSegments(const B2DPolygon& rCandidate);
+ BASEGFX_DLLPUBLIC B2DPolygon simplifyCurveSegments(const
B2DPolygon& rCandidate);
// makes the given indexed point the new polygon start point.
To do that, the points in the
// polygon will be rotated. This is only valid for closed
polygons, for non-closed ones
// an assertion will be triggered
- B2DPolygon makeStartPoint(const B2DPolygon& rCandidate,
sal_uInt32 nIndexOfNewStatPoint);
+ BASEGFX_DLLPUBLIC B2DPolygon makeStartPoint(const B2DPolygon&
rCandidate, sal_uInt32 nIndexOfNewStatPoint);
/** create edges of given length along given B2DPolygon
@@ -469,7 +470,7 @@ namespace basegfx
@return
The newly created polygon
*/
- B2DPolygon createEdgesOfGivenLength(const B2DPolygon&
rCandidate, double fLength, double fStart = 0.0, double fEnd = 0.0);
+ BASEGFX_DLLPUBLIC B2DPolygon createEdgesOfGivenLength(const
B2DPolygon& rCandidate, double fLength, double fStart = 0.0, double fEnd = 0.0);
/** Create Waveline along given polygon
The implementation is based on createEdgesOfGivenLength and
creates a curve
@@ -486,7 +487,7 @@ namespace basegfx
@param fgWaveHeight
The height of the waveline (amplitude)
*/
- B2DPolygon createWaveline(const B2DPolygon& rCandidate, double
fWaveWidth, double fWaveHeight);
+ BASEGFX_DLLPUBLIC B2DPolygon createWaveline(const B2DPolygon&
rCandidate, double fWaveWidth, double fWaveHeight);
/** split each edge of a polygon in exactly nSubEdges equidistant edges
@@ -508,12 +509,12 @@ namespace basegfx
into nSubEdges part curved edges of equidistant length. If not,
straight edges will just be copied.
*/
- B2DPolygon reSegmentPolygonEdges(const B2DPolygon& rCandidate,
sal_uInt32 nSubEdges, bool bHandleCurvedEdges, bool bHandleStraightEdges);
+ BASEGFX_DLLPUBLIC B2DPolygon reSegmentPolygonEdges(const
B2DPolygon& rCandidate, sal_uInt32 nSubEdges, bool bHandleCurvedEdges, bool
bHandleStraightEdges);
//////////////////////////////////////////////////////////////////////
// comparators with tolerance for 2D Polygons
- bool equal(const B2DPolygon& rCandidateA, const B2DPolygon&
rCandidateB, const double& rfSmallValue);
- bool equal(const B2DPolygon& rCandidateA, const B2DPolygon&
rCandidateB);
+ BASEGFX_DLLPUBLIC bool equal(const B2DPolygon& rCandidateA,
const B2DPolygon& rCandidateB, const double& rfSmallValue);
+ BASEGFX_DLLPUBLIC bool equal(const B2DPolygon& rCandidateA,
const B2DPolygon& rCandidateB);
/** snap some polygon coordinates to discrete coordinates
@@ -527,37 +528,37 @@ namespace basegfx
@return
The modified version of the source polygon
*/
- B2DPolygon snapPointsOfHorizontalOrVerticalEdges(const
B2DPolygon& rCandidate);
+ BASEGFX_DLLPUBLIC B2DPolygon
snapPointsOfHorizontalOrVerticalEdges(const B2DPolygon& rCandidate);
/** returns true if the Polygon only contains horizontal or vertical
edges
so that it could be represented by RegionBands
*/
- bool containsOnlyHorizontalAndVerticalEdges(const B2DPolygon&
rCandidate);
+ BASEGFX_DLLPUBLIC bool containsOnlyHorizontalAndVerticalEdges(const
B2DPolygon& rCandidate);
/// get the tangent with which the given point is entered seen from
the previous
/// polygon path data. Take into account all stuff like closed state,
zero-length edges and others.
- B2DVector getTangentEnteringPoint(const B2DPolygon& rCandidate,
sal_uInt32 nIndex);
+ BASEGFX_DLLPUBLIC B2DVector getTangentEnteringPoint(const B2DPolygon&
rCandidate, sal_uInt32 nIndex);
/// get the tangent with which the given point is left seen from the
following
/// polygon path data. Take into account all stuff like closed state,
zero-length edges and others.
- B2DVector getTangentLeavingPoint(const B2DPolygon& rCandidate,
sal_uInt32 nIndex);
+ BASEGFX_DLLPUBLIC B2DVector getTangentLeavingPoint(const B2DPolygon&
rCandidate, sal_uInt32 nIndex);
/// converters for com::sun::star::drawing::PointSequence
- B2DPolygon UnoPointSequenceToB2DPolygon(
+ BASEGFX_DLLPUBLIC B2DPolygon UnoPointSequenceToB2DPolygon(
const com::sun::star::drawing::PointSequence&
rPointSequenceSource,
bool bCheckClosed = true);
- void B2DPolygonToUnoPointSequence(
+ BASEGFX_DLLPUBLIC void B2DPolygonToUnoPointSequence(
const B2DPolygon& rPolygon,
com::sun::star::drawing::PointSequence& rPointSequenceRetval);
/* converters for com::sun::star::drawing::PointSequence and
com::sun::star::drawing::FlagSequence to B2DPolygon (curved
polygons)
*/
- B2DPolygon UnoPolygonBezierCoordsToB2DPolygon(
+ BASEGFX_DLLPUBLIC B2DPolygon UnoPolygonBezierCoordsToB2DPolygon(
const com::sun::star::drawing::PointSequence&
rPointSequenceSource,
const com::sun::star::drawing::FlagSequence& rFlagSequenceSource,
bool bCheckClosed = true);
- void B2DPolygonToUnoPolygonBezierCoords(
+ BASEGFX_DLLPUBLIC void B2DPolygonToUnoPolygonBezierCoords(
const B2DPolygon& rPolyPolygon,
com::sun::star::drawing::PointSequence& rPointSequenceRetval,
com::sun::star::drawing::FlagSequence& rFlagSequenceRetval);
@@ -576,7 +577,7 @@ namespace basegfx
@return true, if the string was successfully parsed
*/
- bool importFromSvgPoints( B2DPolygon& o_rPoly,
+ BASEGFX_DLLPUBLIC bool importFromSvgPoints( B2DPolygon&
o_rPoly,
const ::rtl::OUString& rSvgPointsAttribute );
/** Write poly-polygon to SVG.
@@ -592,7 +593,7 @@ namespace basegfx
@return true, if the string was successfully parsed
*/
- ::rtl::OUString exportToSvgPoints( const B2DPolygon& rPoly );
+ BASEGFX_DLLPUBLIC ::rtl::OUString exportToSvgPoints( const B2DPolygon&
rPoly );
} // end of namespace tools
} // end of namespace basegfx
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolygontriangulator.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolygontriangulator.hxx?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolygontriangulator.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolygontriangulator.hxx
Sun Mar 6 18:42:24 2016
@@ -26,6 +26,7 @@
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <vector>
+#include <basegfx/basegfxdllapi.h>
//////////////////////////////////////////////////////////////////////////////
@@ -34,10 +35,10 @@ namespace basegfx
namespace triangulator
{
// triangulate given polygon
- ::basegfx::B2DPolygon triangulate(const ::basegfx::B2DPolygon&
rCandidate);
+ BASEGFX_DLLPUBLIC ::basegfx::B2DPolygon triangulate(const
::basegfx::B2DPolygon& rCandidate);
// triangulate given PolyPolygon
- ::basegfx::B2DPolygon triangulate(const
::basegfx::B2DPolyPolygon& rCandidate);
+ BASEGFX_DLLPUBLIC ::basegfx::B2DPolygon triangulate(const
::basegfx::B2DPolyPolygon& rCandidate);
} // end of namespace triangulator
} // end of namespace basegfx
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx?rev=1733821&r1=1733820&r2=1733821&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx
Sun Mar 6 18:42:24 2016
@@ -27,6 +27,7 @@
#include <sal/types.h>
#include <o3tl/cow_wrapper.hxx>
#include <basegfx/range/b2drange.hxx>
+#include <basegfx/basegfxdllapi.h>
// predeclarations
class ImplB2DPolyPolygon;
@@ -41,7 +42,7 @@ namespace basegfx
namespace basegfx
{
- class B2DPolyPolygon
+ class BASEGFX_DLLPUBLIC B2DPolyPolygon
{
public:
typedef o3tl::cow_wrapper< ImplB2DPolyPolygon > ImplType;
