summaryrefslogtreecommitdiff
path: root/basebmp
diff options
context:
space:
mode:
Diffstat (limited to 'basebmp')
-rw-r--r--basebmp/CppunitTest_basebmp.mk50
-rw-r--r--basebmp/Library_basebmp.mk64
-rw-r--r--basebmp/Makefile38
-rw-r--r--basebmp/Module_basebmp.mk39
-rw-r--r--basebmp/Package_inc.mk64
-rw-r--r--basebmp/inc/basebmp/bitmapdevice.hxx19
-rw-r--r--basebmp/prj/build.lst5
-rw-r--r--basebmp/prj/d.lst9
-rw-r--r--basebmp/prj/makefile.mk (renamed from basebmp/util/makefile.mk)44
-rw-r--r--basebmp/source/makefile.mk76
-rw-r--r--basebmp/test/basictest.cxx1
-rw-r--r--basebmp/test/makefile.mk111
-rw-r--r--basebmp/util/basebmp.flt4
13 files changed, 279 insertions, 245 deletions
diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk
new file mode 100644
index 000000000000..eb39b981c858
--- /dev/null
+++ b/basebmp/CppunitTest_basebmp.mk
@@ -0,0 +1,50 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_CppunitTest_CppunitTest,basebmp_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,basebmp_test, \
+ basebmp/test/basictest \
+ basebmp/test/bmpmasktest \
+ basebmp/test/bmptest \
+ basebmp/test/cliptest \
+ basebmp/test/filltest \
+ basebmp/test/linetest \
+ basebmp/test/masktest \
+ basebmp/test/polytest \
+ basebmp/test/tools \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,basebmp_test, \
+ basebmp \
+ basegfx \
+ cppunit \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk
new file mode 100644
index 000000000000..97fcb79329ea
--- /dev/null
+++ b/basebmp/Library_basebmp.mk
@@ -0,0 +1,64 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,basebmp))
+
+$(eval $(call gb_Library_add_package_headers,basebmp,basebmp_inc))
+
+$(eval $(call gb_Library_set_include,basebmp,\
+ -I$(SRCDIR)/basebmp/inc/ \
+ -I$(SRCDIR)/basebmp/inc/pch \
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_defs,basebmp,\
+ -DBASEBMP_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,basebmp,\
+ basegfx \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+ifeq ($(OS),SOLARIS)
+$(eval $(call gb_Library_add_cxxobjects,basebmp, \
+ basebmp/source/bitmapdevice \
+ basebmp/source/debug \
+ basebmp/source/polypolygonrenderer \
+ , $(gb_COMPILEROPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) -xalias_level=compatible \
+))
+else
+$(eval $(call gb_Library_add_exception_objects,basebmp,\
+ basebmp/source/bitmapdevice \
+ basebmp/source/debug \
+ basebmp/source/polypolygonrenderer \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/basebmp/Makefile b/basebmp/Makefile
new file mode 100644
index 000000000000..90947b2e5f48
--- /dev/null
+++ b/basebmp/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/basebmp/Module_basebmp.mk b/basebmp/Module_basebmp.mk
new file mode 100644
index 000000000000..7ac5d945ffdd
--- /dev/null
+++ b/basebmp/Module_basebmp.mk
@@ -0,0 +1,39 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Module_Module,basebmp))
+
+$(eval $(call gb_Module_add_targets,basebmp,\
+ Library_basebmp \
+ Package_inc \
+))
+
+$(eval $(call gb_Module_add_check_targets,basebmp,\
+ CppunitTest_basebmp \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/basebmp/Package_inc.mk b/basebmp/Package_inc.mk
new file mode 100644
index 000000000000..d38f58ca8ef6
--- /dev/null
+++ b/basebmp/Package_inc.mk
@@ -0,0 +1,64 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,basebmp_inc,$(SRCDIR)/basebmp/inc))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/accessor.hxx,basebmp/accessor.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/accessoradapters.hxx,basebmp/accessoradapters.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/accessorfunctors.hxx,basebmp/accessorfunctors.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/accessortraits.hxx,basebmp/accessortraits.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/bitmapdevice.hxx,basebmp/bitmapdevice.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/clippedlinerenderer.hxx,basebmp/clippedlinerenderer.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/color.hxx,basebmp/color.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/colorblendaccessoradapter.hxx,basebmp/colorblendaccessoradapter.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/colormisc.hxx,basebmp/colormisc.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/colortraits.hxx,basebmp/colortraits.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/compositeiterator.hxx,basebmp/compositeiterator.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/debug.hxx,basebmp/debug.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/drawmodes.hxx,basebmp/drawmodes.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/endian.hxx,basebmp/endian.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/fillimage.hxx,basebmp/fillimage.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/genericcolorimageaccessor.hxx,basebmp/genericcolorimageaccessor.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/greylevelformats.hxx,basebmp/greylevelformats.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/iteratortraits.hxx,basebmp/iteratortraits.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/linerenderer.hxx,basebmp/linerenderer.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/metafunctions.hxx,basebmp/metafunctions.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/nonstandarditerator.hxx,basebmp/nonstandarditerator.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/packedpixeliterator.hxx,basebmp/packedpixeliterator.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/paletteformats.hxx,basebmp/paletteformats.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/paletteimageaccessor.hxx,basebmp/paletteimageaccessor.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/pixelformatadapters.hxx,basebmp/pixelformatadapters.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/pixeliterator.hxx,basebmp/pixeliterator.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/polypolygonrenderer.hxx,basebmp/polypolygonrenderer.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/rgb24pixelformats.hxx,basebmp/rgb24pixelformats.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/rgbmaskpixelformats.hxx,basebmp/rgbmaskpixelformats.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/scaleimage.hxx,basebmp/scaleimage.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/scanlineformats.hxx,basebmp/scanlineformats.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/stridedarrayiterator.hxx,basebmp/stridedarrayiterator.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/tools.hxx,basebmp/tools.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/truecolormaskaccessor.hxx,basebmp/truecolormaskaccessor.hxx))
+
+# vim: set noet sw=4 ts=4:
diff --git a/basebmp/inc/basebmp/bitmapdevice.hxx b/basebmp/inc/basebmp/bitmapdevice.hxx
index 5a5436432169..0db4099213f4 100644
--- a/basebmp/inc/basebmp/bitmapdevice.hxx
+++ b/basebmp/inc/basebmp/bitmapdevice.hxx
@@ -39,6 +39,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;
@@ -77,7 +84,7 @@ class BitmapDeviceDamageTracker {
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:
@@ -647,7 +654,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,
BitmapDeviceDamageTracker* pDamage = NULL );
@@ -659,7 +666,7 @@ BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize,
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 );
@@ -670,7 +677,7 @@ BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize
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,
@@ -685,7 +692,7 @@ BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize
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.
@@ -694,7 +701,7 @@ BitmapDeviceSharedPtr subsetBitmapDevice( const BitmapDeviceSharedPtr& rProt
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 );
}
diff --git a/basebmp/prj/build.lst b/basebmp/prj/build.lst
index b68e8f2eb6fd..2b0fa1e0f72a 100644
--- a/basebmp/prj/build.lst
+++ b/basebmp/prj/build.lst
@@ -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
diff --git a/basebmp/prj/d.lst b/basebmp/prj/d.lst
index 2dd75fa5b1c5..e69de29bb2d1 100644
--- a/basebmp/prj/d.lst
+++ b/basebmp/prj/d.lst
@@ -1,9 +0,0 @@
-..\%__SRC%\lib\ibasebmp.lib %_DEST%\lib\ibasebmp.lib
-
-..\%__SRC%\bin\basebmp?????.dll %_DEST%\bin\basebmp?????.dll
-
-..\%__SRC%\lib\libbasebmp*.* %_DEST%\lib\libbasebmp*.*
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-
-mkdir: %_DEST%\inc\basebmp
-..\inc\basebmp\*.hxx %_DEST%\inc\basebmp\*.hxx
diff --git a/basebmp/util/makefile.mk b/basebmp/prj/makefile.mk
index bc86ebd6bac4..88cd9dfe08b8 100644
--- a/basebmp/util/makefile.mk
+++ b/basebmp/prj/makefile.mk
@@ -26,41 +26,15 @@
#*************************************************************************
PRJ=..
+TARGET=prj
-PRJNAME=basebmp
-TARGET=basebmp
+.INCLUDE : settings.mk
-# --- Settings ---------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Allgemein ---------------------------------------------------
-
-LIB1TARGET=$(SLB)$/basebmp.lib
-LIB1FILES=\
- $(SLB)$/wrapper.lib
-
-SHL1TARGET= basebmp$(DLLPOSTFIX)
-SHL1IMPLIB= ibasebmp
-
-SHL1STDLIBS=\
- $(SALLIB) \
- $(BASEGFXLIB)
-
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-SHL1LIBS= $(SLB)$/basebmp.lib
-
-DEF1NAME =$(SHL1TARGET)
-DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt \
- $(LIB1TARGET)
-
-DEF1DES =BaseBMP
-DEFLIB1NAME =basebmp
-
-# --- Targets -----------------------------------------------------------
-
-.INCLUDE : target.mk
-
-$(MISC)$/$(SHL1TARGET).flt : makefile.mk
- @$(TYPE) $(TARGET).flt > $@
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/basebmp/source/makefile.mk b/basebmp/source/makefile.mk
deleted file mode 100644
index 55b27cfa7565..000000000000
--- a/basebmp/source/makefile.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/
-
-PRJNAME=basebmp
-TARGET=wrapper
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-
-# TODO(F3) unify BASEBMP_NO_NESTED_TEMPLATE_PARAMETER and
-# VIGRA_WITHOUT_NESTED_TEMPLATES_PARAMS
-#
-# - VIGRA_WITHOUT_NESTED_TEMPLATES_PARAMS avoids template parameters
-# to templates - the template keyword is broken for SunCC
-# - VIGRA_HAS_LONG_LONG enables long long overloads (but appears to not work
-# reliably in some environments, and is thus not enabled)
-# - VIGRA_HAS_LONG_DOUBLE enables long double overloads
-
-.IF "$(OS)"!="WNT"
-CDEFS+= -DVIGRA_HAS_LONG_DOUBLE
-.ENDIF
-
-.IF "$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
-CDEFS+= -DBASEBMP_NO_NESTED_TEMPLATE_PARAMETER -DVIGRA_WITHOUT_NESTED_TEMPLATE_PARAMS
-.ENDIF
-
-# SunStudio 12 (-m64 and -m32 modes): three test cases of the unit tests fail
-# if compiled with default -xalias_level (and optimization level -xO3)
-.IF "$(OS)"=="SOLARIS"
-# For Sun Studio 8 this switch does not work: compilation fails on bitmapdevice.cxx
-.IF "$(CCNUMVER)"!="00050005"
-CDEFS+=-xalias_level=compatible
-.ENDIF
-.ENDIF
-
-# --- Common ----------------------------------------------------------
-
-SLOFILES = \
- $(SLO)$/bitmapdevice.obj \
- $(SLO)$/debug.obj \
- $(SLO)$/polypolygonrenderer.obj
-
-# $(SLO)$/genericintegerimageaccessor.obj \
-
-# ==========================================================================
-
-.INCLUDE : target.mk
diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx
index d953095585fa..1b409921d046 100644
--- a/basebmp/test/basictest.cxx
+++ b/basebmp/test/basictest.cxx
@@ -28,6 +28,7 @@
// autogenerated file with codegen.pl
+#include <sal/cppunit.h>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk
deleted file mode 100644
index 6941ed963b75..000000000000
--- a/basebmp/test/makefile.mk
+++ /dev/null
@@ -1,111 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=basebmp
-TARGET=tests
-TARGETTYPE=GUI
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(CROSS_COMPILING)"=="YES"
-all:
- @echo Nothing done when cross-compiling
-.ENDIF
-
-.IF "$(debug)"!="" || "$(DEBUG)"!=""
-
-.IF "$(COM)"=="MSC"
-# disable inlining for MSVC
-CFLAGS += -Ob0
-.ENDIF
-
-.IF "$(COM)"=="GCC"
-# disable inlining for gcc
-CFLAGS += -fno-inline
-.ENDIF
-
-.ENDIF
-
-# SunStudio 12 (-m64 and -m32 modes): three test cases of the unit tests fail
-# if compiled with default -xalias_level (and optimization level -xO3)
-.IF "$(OS)"=="SOLARIS"
-# For Sun Studio 8 this switch does not work: compilation fails on bitmapdevice.cxx
-.IF "$(CCNUMVER)"!="00050005"
-CDEFS+=-xalias_level=compatible
-.ENDIF
-.ENDIF
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-# --- Common ----------------------------------------------------------
-.IF "$(L10N_framework)"==""
-
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:tests by codegen.pl
-SHL1OBJS= \
- $(SLO)$/basictest.obj \
- $(SLO)$/bmpmasktest.obj \
- $(SLO)$/bmptest.obj \
- $(SLO)$/cliptest.obj \
- $(SLO)$/filltest.obj \
- $(SLO)$/linetest.obj \
- $(SLO)$/masktest.obj \
- $(SLO)$/polytest.obj \
- $(SLO)$/tools.obj
-SHL1TARGET= tests
-SHL1STDLIBS= $(BASEBMPLIB) \
- $(SALLIB) \
- $(CPPUNITLIB) \
- $(BASEGFXLIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-
-DEF1NAME =$(SHL1TARGET)
-SHL1VERSIONMAP = export.map
-SHL1RPATH = NONE
-
-.ENDIF
-# END ------------------------------------------------------------------
-
-#------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-SLOFILES=$(SHL1OBJS)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-# --- Enable test execution in normal build ------------------------
-.IF "$(L10N_framework)"==""
-.INCLUDE : _cppunit.mk
-.ENDIF
diff --git a/basebmp/util/basebmp.flt b/basebmp/util/basebmp.flt
deleted file mode 100644
index 28a1dd1b65c6..000000000000
--- a/basebmp/util/basebmp.flt
+++ /dev/null
@@ -1,4 +0,0 @@
-__CT
-Impl
-IMP
-internal \ No newline at end of file
generated by cgit (git 2.34.1) at 2024-07-29 08:39:00 +0000