basebmp/Library_basebmp.mk | 5
basebmp/inc/accessor.hxx | 113 ++++
basebmp/inc/accessoradapters.hxx | 520 ++++++++++++++++++++
basebmp/inc/accessorfunctors.hxx | 181 +++++++
basebmp/inc/accessortraits.hxx | 130 +++++
basebmp/inc/clippedlinerenderer.hxx | 438 ++++++++++++++++
basebmp/inc/colorblendaccessoradapter.hxx | 142 +++++
basebmp/inc/colormisc.hxx | 173 ++++++
basebmp/inc/colortraits.hxx | 137 +++++
basebmp/inc/compositeiterator.hxx | 395 +++++++++++++++
basebmp/inc/endian.hxx | 51 +
basebmp/inc/fillimage.hxx | 63 ++
basebmp/inc/genericcolorimageaccessor.hxx | 76 ++
basebmp/inc/greylevelformats.hxx | 129 +++++
basebmp/inc/iteratortraits.hxx | 49 +
basebmp/inc/metafunctions.hxx | 217 ++++++++
basebmp/inc/nonstandarditerator.hxx | 39 +
basebmp/inc/packedpixeliterator.hxx | 670 ++++++++++++++++++++++++++
basebmp/inc/paletteformats.hxx | 139 +++++
basebmp/inc/paletteimageaccessor.hxx | 162 ++++++
basebmp/inc/pixelformatadapters.hxx | 102 +++
basebmp/inc/pixeliterator.hxx | 349 +++++++++++++
basebmp/inc/polypolygonrenderer.hxx | 355 +++++++++++++
basebmp/inc/rgb24pixelformats.hxx | 92 +++
basebmp/inc/rgbmaskpixelformats.hxx | 355 +++++++++++++
basebmp/inc/scaleimage.hxx | 189 +++++++
basebmp/inc/stridedarrayiterator.hxx | 108 ++++
basebmp/inc/tools.hxx | 85 +++
basebmp/source/bitmapdevice.cxx | 36 -
basebmp/source/polypolygonrenderer.cxx | 2
include/basebmp/accessor.hxx | 113 ----
include/basebmp/accessoradapters.hxx | 520 --------------------
include/basebmp/accessorfunctors.hxx | 181 -------
include/basebmp/accessortraits.hxx | 130 -----
include/basebmp/clippedlinerenderer.hxx | 438 ----------------
include/basebmp/colorblendaccessoradapter.hxx | 142 -----
include/basebmp/colormisc.hxx | 173 ------
include/basebmp/colortraits.hxx | 137 -----
include/basebmp/compositeiterator.hxx | 395 ---------------
include/basebmp/endian.hxx | 51 -
include/basebmp/fillimage.hxx | 63 --
include/basebmp/genericcolorimageaccessor.hxx | 76 --
include/basebmp/greylevelformats.hxx | 129 -----
include/basebmp/iteratortraits.hxx | 49 -
include/basebmp/metafunctions.hxx | 217 --------
include/basebmp/nonstandarditerator.hxx | 39 -
include/basebmp/packedpixeliterator.hxx | 670 --------------------------
include/basebmp/paletteformats.hxx | 139 -----
include/basebmp/paletteimageaccessor.hxx | 162 ------
include/basebmp/pixelformatadapters.hxx | 102 ---
include/basebmp/pixeliterator.hxx | 349 -------------
include/basebmp/polypolygonrenderer.hxx | 355 -------------
include/basebmp/rgb24pixelformats.hxx | 92 ---
include/basebmp/rgbmaskpixelformats.hxx | 355 -------------
include/basebmp/scaleimage.hxx | 189 -------
include/basebmp/stridedarrayiterator.hxx | 108 ----
include/basebmp/tools.hxx | 85 ---
57 files changed, 5483 insertions(+), 5478 deletions(-)
New commits:
commit 8e27c68847c6461c7bc0bdbff44412d6bfb0b1e8
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Thu Oct 1 08:31:24 2015 +0200
basebmp: these headers are not used from other modules
Change-Id: I88c5c341b88a6ea62730e5d3dd1962365c531f70
diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk
index 12a2dec..809671c 100644
--- a/basebmp/Library_basebmp.mk
+++ b/basebmp/Library_basebmp.mk
@@ -11,6 +11,11 @@ $(eval $(call gb_Library_Library,basebmp))
$(eval $(call gb_Library_use_sdk_api,basebmp))
+$(eval $(call gb_Library_set_include,basebmp,\
+ -I$(SRCDIR)/basebmp/inc \
+ $$(INCLUDE) \
+))
+
$(eval $(call gb_Library_use_externals,basebmp,\
boost_headers \
vigra_headers \
diff --git a/include/basebmp/accessor.hxx b/basebmp/inc/accessor.hxx
similarity index 95%
rename from include/basebmp/accessor.hxx
rename to basebmp/inc/accessor.hxx
index b77af90..828d8fe 100644
--- a/include/basebmp/accessor.hxx
+++ b/basebmp/inc/accessor.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_ACCESSOR_HXX
-#define INCLUDED_BASEBMP_ACCESSOR_HXX
+#ifndef INCLUDED_BASEBMP_INC_ACCESSOR_HXX
+#define INCLUDED_BASEBMP_INC_ACCESSOR_HXX
#include <vigra/numerictraits.hxx>
@@ -108,6 +108,6 @@ public:
} // namespace basebmp
-#endif /* INCLUDED_BASEBMP_ACCESSOR_HXX */
+#endif /* INCLUDED_BASEBMP_INC_ACCESSOR_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/accessoradapters.hxx
b/basebmp/inc/accessoradapters.hxx
similarity index 99%
rename from include/basebmp/accessoradapters.hxx
rename to basebmp/inc/accessoradapters.hxx
index 0d0122e..8680565 100644
--- a/include/basebmp/accessoradapters.hxx
+++ b/basebmp/inc/accessoradapters.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_ACCESSORADAPTERS_HXX
-#define INCLUDED_BASEBMP_ACCESSORADAPTERS_HXX
+#ifndef INCLUDED_BASEBMP_INC_ACCESSORADAPTERS_HXX
+#define INCLUDED_BASEBMP_INC_ACCESSORADAPTERS_HXX
#include <vigra/numerictraits.hxx>
@@ -515,6 +515,6 @@ public:
} // namespace basebmp
-#endif /* INCLUDED_BASEBMP_ACCESSORADAPTERS_HXX */
+#endif /* INCLUDED_BASEBMP_INC_ACCESSORADAPTERS_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/accessorfunctors.hxx
b/basebmp/inc/accessorfunctors.hxx
similarity index 96%
rename from include/basebmp/accessorfunctors.hxx
rename to basebmp/inc/accessorfunctors.hxx
index 02e3aba..cae37ba 100644
--- a/include/basebmp/accessorfunctors.hxx
+++ b/basebmp/inc/accessorfunctors.hxx
@@ -17,11 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_ACCESSORFUNCTORS_HXX
-#define INCLUDED_BASEBMP_ACCESSORFUNCTORS_HXX
+#ifndef INCLUDED_BASEBMP_INC_ACCESSORFUNCTORS_HXX
+#define INCLUDED_BASEBMP_INC_ACCESSORFUNCTORS_HXX
#include <osl/diagnose.h>
-#include <basebmp/metafunctions.hxx>
+#include <metafunctions.hxx>
#include <functional>
@@ -176,6 +176,6 @@ public:
} // namespace basebmp
-#endif /* INCLUDED_BASEBMP_ACCESSORFUNCTORS_HXX */
+#endif /* INCLUDED_BASEBMP_INC_ACCESSORFUNCTORS_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/accessortraits.hxx b/basebmp/inc/accessortraits.hxx
similarity index 94%
rename from include/basebmp/accessortraits.hxx
rename to basebmp/inc/accessortraits.hxx
index c8f45a0..6ca8893 100644
--- a/include/basebmp/accessortraits.hxx
+++ b/basebmp/inc/accessortraits.hxx
@@ -17,12 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_ACCESSORTRAITS_HXX
-#define INCLUDED_BASEBMP_ACCESSORTRAITS_HXX
+#ifndef INCLUDED_BASEBMP_INC_ACCESSORTRAITS_HXX
+#define INCLUDED_BASEBMP_INC_ACCESSORTRAITS_HXX
-#include <basebmp/accessorfunctors.hxx>
-#include <basebmp/accessoradapters.hxx>
-#include <basebmp/metafunctions.hxx>
+#include <accessorfunctors.hxx>
+#include <accessoradapters.hxx>
+#include <metafunctions.hxx>
namespace basebmp
{
@@ -125,6 +125,6 @@ template< class Accessor > struct AccessorTraits
} // namespace basebmp
-#endif /* INCLUDED_BASEBMP_ACCESSORTRAITS_HXX */
+#endif /* INCLUDED_BASEBMP_INC_ACCESSORTRAITS_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/clippedlinerenderer.hxx
b/basebmp/inc/clippedlinerenderer.hxx
similarity index 98%
rename from include/basebmp/clippedlinerenderer.hxx
rename to basebmp/inc/clippedlinerenderer.hxx
index 0265a65..e863872 100644
--- a/include/basebmp/clippedlinerenderer.hxx
+++ b/basebmp/inc/clippedlinerenderer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_CLIPPEDLINERENDERER_HXX
-#define INCLUDED_BASEBMP_CLIPPEDLINERENDERER_HXX
+#ifndef INCLUDED_BASEBMP_INC_CLIPPEDLINERENDERER_HXX
+#define INCLUDED_BASEBMP_INC_CLIPPEDLINERENDERER_HXX
#include <basegfx/tools/rectcliptools.hxx>
#include <basegfx/point/b2ipoint.hxx>
@@ -433,6 +433,6 @@ void renderClippedLine( basegfx::B2IPoint aPt1,
} // namespace basebmp
-#endif /* INCLUDED_BASEBMP_CLIPPEDLINERENDERER_HXX */
+#endif /* INCLUDED_BASEBMP_INC_CLIPPEDLINERENDERER_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/colorblendaccessoradapter.hxx
b/basebmp/inc/colorblendaccessoradapter.hxx
similarity index 95%
rename from include/basebmp/colorblendaccessoradapter.hxx
rename to basebmp/inc/colorblendaccessoradapter.hxx
index 59055b0..b9465fb 100644
--- a/include/basebmp/colorblendaccessoradapter.hxx
+++ b/basebmp/inc/colorblendaccessoradapter.hxx
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_COLORBLENDACCESSORADAPTER_HXX
-#define INCLUDED_BASEBMP_COLORBLENDACCESSORADAPTER_HXX
+#ifndef INCLUDED_BASEBMP_INC_COLORBLENDACCESSORADAPTER_HXX
+#define INCLUDED_BASEBMP_INC_COLORBLENDACCESSORADAPTER_HXX
-#include <basebmp/colortraits.hxx>
+#include <colortraits.hxx>
namespace basebmp
{
@@ -137,6 +137,6 @@ public:
} // namespace basebmp
-#endif /* INCLUDED_BASEBMP_COLORBLENDACCESSORADAPTER_HXX */
+#endif /* INCLUDED_BASEBMP_INC_COLORBLENDACCESSORADAPTER_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/colormisc.hxx b/basebmp/inc/colormisc.hxx
similarity index 96%
rename from include/basebmp/colormisc.hxx
rename to basebmp/inc/colormisc.hxx
index dc269a0..5d38b93 100644
--- a/include/basebmp/colormisc.hxx
+++ b/basebmp/inc/colormisc.hxx
@@ -17,13 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_COLORMISC_HXX
-#define INCLUDED_BASEBMP_COLORMISC_HXX
+#ifndef INCLUDED_BASEBMP_INC_COLORMISC_HXX
+#define INCLUDED_BASEBMP_INC_COLORMISC_HXX
#include <osl/diagnose.h>
#include <basebmp/color.hxx>
-#include <basebmp/colortraits.hxx>
-#include <basebmp/accessortraits.hxx>
+#include <colortraits.hxx>
+#include <accessortraits.hxx>
#include <vigra/mathutil.hxx>
// Contents of this header moved out of color.hxx, as it is not useful
@@ -168,6 +168,6 @@ struct NumericTraits<basebmp::Color>
} // namespace vigra
-#endif /* INCLUDED_BASEBMP_COLORMISC_HXX */
+#endif /* INCLUDED_BASEBMP_INC_COLORMISC_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/colortraits.hxx b/basebmp/inc/colortraits.hxx
similarity index 95%
rename from include/basebmp/colortraits.hxx
rename to basebmp/inc/colortraits.hxx
index d9b4332..5a54645 100644
--- a/include/basebmp/colortraits.hxx
+++ b/basebmp/inc/colortraits.hxx
@@ -17,11 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_COLORTRAITS_HXX
-#define INCLUDED_BASEBMP_COLORTRAITS_HXX
+#ifndef INCLUDED_BASEBMP_INC_COLORTRAITS_HXX
+#define INCLUDED_BASEBMP_INC_COLORTRAITS_HXX
-#include <basebmp/accessoradapters.hxx>
-#include <basebmp/metafunctions.hxx>
+#include <accessoradapters.hxx>
+#include <metafunctions.hxx>
#include <vigra/mathutil.hxx>
@@ -132,6 +132,6 @@ template< typename ColorType > struct ColorTraits
} // namespace basebmp
-#endif /* INCLUDED_BASEBMP_COLORTRAITS_HXX */
+#endif /* INCLUDED_BASEBMP_INC_COLORTRAITS_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/compositeiterator.hxx
b/basebmp/inc/compositeiterator.hxx
similarity index 98%
rename from include/basebmp/compositeiterator.hxx
rename to basebmp/inc/compositeiterator.hxx
index 1823181..2db654a 100644
--- a/include/basebmp/compositeiterator.hxx
+++ b/basebmp/inc/compositeiterator.hxx
@@ -17,13 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_COMPOSITEITERATOR_HXX
-#define INCLUDED_BASEBMP_COMPOSITEITERATOR_HXX
+#ifndef INCLUDED_BASEBMP_INC_COMPOSITEITERATOR_HXX
+#define INCLUDED_BASEBMP_INC_COMPOSITEITERATOR_HXX
#include <sal/types.h>
#include <osl/diagnose.h>
-#include <basebmp/nonstandarditerator.hxx>
+#include <nonstandarditerator.hxx>
#include <vigra/tuple.hxx>
#include <vigra/iteratortraits.hxx>
@@ -390,6 +390,6 @@ public:
} // namespace basebmp
-#endif /* INCLUDED_BASEBMP_COMPOSITEITERATOR_HXX */
+#endif /* INCLUDED_BASEBMP_INC_COMPOSITEITERATOR_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/endian.hxx b/basebmp/inc/endian.hxx
similarity index 92%
rename from include/basebmp/endian.hxx
rename to basebmp/inc/endian.hxx
index 22c32b6..a924f5a 100644
--- a/include/basebmp/endian.hxx
+++ b/basebmp/inc/endian.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_ENDIAN_HXX
-#define INCLUDED_BASEBMP_ENDIAN_HXX
+#ifndef INCLUDED_BASEBMP_INC_ENDIAN_HXX
+#define INCLUDED_BASEBMP_INC_ENDIAN_HXX
#include <osl/endian.h>
@@ -46,6 +46,6 @@ BASEBMP_BYTE_SWAP(sal_uInt32,OSL_SWAPDWORD)
} // namespace basebmp
-#endif /* INCLUDED_BASEBMP_ENDIAN_HXX */
+#endif /* INCLUDED_BASEBMP_INC_ENDIAN_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/fillimage.hxx b/basebmp/inc/fillimage.hxx
similarity index 93%
rename from include/basebmp/fillimage.hxx
rename to basebmp/inc/fillimage.hxx
index 561b029..7acd901 100644
--- a/include/basebmp/fillimage.hxx
+++ b/basebmp/inc/fillimage.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_FILLIMAGE_HXX
-#define INCLUDED_BASEBMP_FILLIMAGE_HXX
+#ifndef INCLUDED_BASEBMP_INC_FILLIMAGE_HXX
+#define INCLUDED_BASEBMP_INC_FILLIMAGE_HXX
#include <vigra/tuple.hxx>
#include <vigra/iteratortraits.hxx>
@@ -58,6 +58,6 @@ inline void fillImage(
vigra::triple<DestIterator,DestIterator,DestAccessor> con
} // namespace basebmp
-#endif /* INCLUDED_BASEBMP_FILLIMAGE_HXX */
+#endif /* INCLUDED_BASEBMP_INC_FILLIMAGE_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/genericcolorimageaccessor.hxx
b/basebmp/inc/genericcolorimageaccessor.hxx
similarity index 93%
rename from include/basebmp/genericcolorimageaccessor.hxx
rename to basebmp/inc/genericcolorimageaccessor.hxx
index 6d7cd53..3db0fde 100644
--- a/include/basebmp/genericcolorimageaccessor.hxx
+++ b/basebmp/inc/genericcolorimageaccessor.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_GENERICCOLORIMAGEACCESSOR_HXX
-#define INCLUDED_BASEBMP_GENERICCOLORIMAGEACCESSOR_HXX
+#ifndef INCLUDED_BASEBMP_INC_GENERICCOLORIMAGEACCESSOR_HXX
+#define INCLUDED_BASEBMP_INC_GENERICCOLORIMAGEACCESSOR_HXX
#include <basebmp/color.hxx>
#include <basebmp/bitmapdevice.hxx>
@@ -71,6 +71,6 @@ namespace basebmp
};
}
-#endif /* INCLUDED_BASEBMP_GENERICCOLORIMAGEACCESSOR_HXX */
+#endif /* INCLUDED_BASEBMP_INC_GENERICCOLORIMAGEACCESSOR_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/greylevelformats.hxx
b/basebmp/inc/greylevelformats.hxx
similarity index 91%
rename from include/basebmp/greylevelformats.hxx
rename to basebmp/inc/greylevelformats.hxx
index 705c26d..a758fa9 100644
--- a/include/basebmp/greylevelformats.hxx
+++ b/basebmp/inc/greylevelformats.hxx
@@ -17,16 +17,16 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_GREYLEVELFORMATS_HXX
-#define INCLUDED_BASEBMP_GREYLEVELFORMATS_HXX
+#ifndef INCLUDED_BASEBMP_INC_GREYLEVELFORMATS_HXX
+#define INCLUDED_BASEBMP_INC_GREYLEVELFORMATS_HXX
#include <basebmp/color.hxx>
-#include <basebmp/colortraits.hxx>
-#include <basebmp/accessor.hxx>
-#include <basebmp/pixeliterator.hxx>
-#include <basebmp/packedpixeliterator.hxx>
-#include <basebmp/pixelformatadapters.hxx>
-#include <basebmp/metafunctions.hxx>
+#include <colortraits.hxx>
+#include <accessor.hxx>
+#include <pixeliterator.hxx>
+#include <packedpixeliterator.hxx>
+#include <pixelformatadapters.hxx>
+#include <metafunctions.hxx>
#include <vigra/numerictraits.hxx>
#include <vigra/metaprogramming.hxx>
@@ -124,6 +124,6 @@
BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_GREY8::getter_type,
} // namespace basebmp
-#endif /* INCLUDED_BASEBMP_GREYLEVELFORMATS_HXX */
+#endif /* INCLUDED_BASEBMP_INC_GREYLEVELFORMATS_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/iteratortraits.hxx b/basebmp/inc/iteratortraits.hxx
similarity index 88%
rename from include/basebmp/iteratortraits.hxx
rename to basebmp/inc/iteratortraits.hxx
index 5d87df7..a0b65f5 100644
--- a/include/basebmp/iteratortraits.hxx
+++ b/basebmp/inc/iteratortraits.hxx
@@ -17,11 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_ITERATORTRAITS_HXX
-#define INCLUDED_BASEBMP_ITERATORTRAITS_HXX
+#ifndef INCLUDED_BASEBMP_INC_ITERATORTRAITS_HXX
+#define INCLUDED_BASEBMP_INC_ITERATORTRAITS_HXX
-#include <basebmp/accessor.hxx>
-#include <basebmp/nonstandarditerator.hxx>
+#include <accessor.hxx>
+#include <nonstandarditerator.hxx>
namespace basebmp
{
@@ -44,6 +44,6 @@ template< class Iterator > struct IteratorTraits
} // namespace basebmp
-#endif /* INCLUDED_BASEBMP_ITERATORTRAITS_HXX */
+#endif /* INCLUDED_BASEBMP_INC_ITERATORTRAITS_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/metafunctions.hxx b/basebmp/inc/metafunctions.hxx
similarity index 97%
rename from include/basebmp/metafunctions.hxx
rename to basebmp/inc/metafunctions.hxx
index 1f3f180..16ee261 100644
--- a/include/basebmp/metafunctions.hxx
+++ b/basebmp/inc/metafunctions.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_METAFUNCTIONS_HXX
-#define INCLUDED_BASEBMP_METAFUNCTIONS_HXX
+#ifndef INCLUDED_BASEBMP_INC_METAFUNCTIONS_HXX
+#define INCLUDED_BASEBMP_INC_METAFUNCTIONS_HXX
#include <boost/mpl/integral_c.hpp>
#include <vigra/metaprogramming.hxx>
@@ -212,6 +212,6 @@ template< typename T > inline T shiftRight( T v, int shift )
} // namespace basebmp
-#endif /* INCLUDED_BASEBMP_METAFUNCTIONS_HXX */
+#endif /* INCLUDED_BASEBMP_INC_METAFUNCTIONS_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/nonstandarditerator.hxx
b/basebmp/inc/nonstandarditerator.hxx
similarity index 88%
rename from include/basebmp/nonstandarditerator.hxx
rename to basebmp/inc/nonstandarditerator.hxx
index ff51c59..fbf9683 100644
--- a/include/basebmp/nonstandarditerator.hxx
+++ b/basebmp/inc/nonstandarditerator.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_NONSTANDARDITERATOR_HXX
-#define INCLUDED_BASEBMP_NONSTANDARDITERATOR_HXX
+#ifndef INCLUDED_BASEBMP_INC_NONSTANDARDITERATOR_HXX
+#define INCLUDED_BASEBMP_INC_NONSTANDARDITERATOR_HXX
#include <vigra/metaprogramming.hxx>
@@ -34,6 +34,6 @@ namespace basebmp
} // namespace basebmp
-#endif /* INCLUDED_BASEBMP_NONSTANDARDITERATOR_HXX */
+#endif /* INCLUDED_BASEBMP_INC_NONSTANDARDITERATOR_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/packedpixeliterator.hxx
b/basebmp/inc/packedpixeliterator.hxx
similarity index 98%
rename from include/basebmp/packedpixeliterator.hxx
rename to basebmp/inc/packedpixeliterator.hxx
index a536cec..b7bcac0 100644
--- a/include/basebmp/packedpixeliterator.hxx
+++ b/basebmp/inc/packedpixeliterator.hxx
@@ -17,13 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_PACKEDPIXELITERATOR_HXX
-#define INCLUDED_BASEBMP_PACKEDPIXELITERATOR_HXX
+#ifndef INCLUDED_BASEBMP_INC_PACKEDPIXELITERATOR_HXX
+#define INCLUDED_BASEBMP_INC_PACKEDPIXELITERATOR_HXX
-#include <basebmp/metafunctions.hxx>
-#include <basebmp/stridedarrayiterator.hxx>
-#include <basebmp/nonstandarditerator.hxx>
-#include <basebmp/accessortraits.hxx>
+#include <metafunctions.hxx>
+#include <stridedarrayiterator.hxx>
+#include <nonstandarditerator.hxx>
+#include <accessortraits.hxx>
#include <vigra/metaprogramming.hxx>
#include <vigra/diff2d.hxx>
@@ -665,6 +665,6 @@ template< class Accessor,
} // namespace basebmp
-#endif /* INCLUDED_BASEBMP_PACKEDPIXELITERATOR_HXX */
+#endif /* INCLUDED_BASEBMP_INC_PACKEDPIXELITERATOR_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/paletteformats.hxx b/basebmp/inc/paletteformats.hxx
similarity index 91%
rename from include/basebmp/paletteformats.hxx
rename to basebmp/inc/paletteformats.hxx
index 083164c..f42424c 100644
--- a/include/basebmp/paletteformats.hxx
+++ b/basebmp/inc/paletteformats.hxx
@@ -17,17 +17,17 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_PALETTEFORMATS_HXX
-#define INCLUDED_BASEBMP_PALETTEFORMATS_HXX
+#ifndef INCLUDED_BASEBMP_INC_PALETTEFORMATS_HXX
+#define INCLUDED_BASEBMP_INC_PALETTEFORMATS_HXX
#include <basebmp/color.hxx>
-#include <basebmp/colortraits.hxx>
-#include <basebmp/accessor.hxx>
-#include <basebmp/pixeliterator.hxx>
-#include <basebmp/packedpixeliterator.hxx>
-#include <basebmp/pixelformatadapters.hxx>
-#include <basebmp/paletteimageaccessor.hxx>
-#include <basebmp/metafunctions.hxx>
+#include <colortraits.hxx>
+#include <accessor.hxx>
+#include <pixeliterator.hxx>
+#include <packedpixeliterator.hxx>
+#include <pixelformatadapters.hxx>
+#include <paletteimageaccessor.hxx>
+#include <metafunctions.hxx>
#include <vigra/numerictraits.hxx>
#include <vigra/metaprogramming.hxx>
@@ -134,6 +134,6 @@ typedef PixelFormatTraitsTemplate_Palette<
} // namespace basebmp
-#endif // INCLUDED_BASEBMP_PALETTEFORMATS_HXX
+#endif // INCLUDED_BASEBMP_INC_PALETTEFORMATS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/paletteimageaccessor.hxx
b/basebmp/inc/paletteimageaccessor.hxx
similarity index 95%
rename from include/basebmp/paletteimageaccessor.hxx
rename to basebmp/inc/paletteimageaccessor.hxx
index d19cd03..85d5488 100644
--- a/include/basebmp/paletteimageaccessor.hxx
+++ b/basebmp/inc/paletteimageaccessor.hxx
@@ -17,11 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_PALETTEIMAGEACCESSOR_HXX
-#define INCLUDED_BASEBMP_PALETTEIMAGEACCESSOR_HXX
+#ifndef INCLUDED_BASEBMP_INC_PALETTEIMAGEACCESSOR_HXX
+#define INCLUDED_BASEBMP_INC_PALETTEIMAGEACCESSOR_HXX
-#include <basebmp/colortraits.hxx>
-#include <basebmp/accessortraits.hxx>
+#include <colortraits.hxx>
+#include <accessortraits.hxx>
#include <vigra/numerictraits.hxx>
#include <vigra/metaprogramming.hxx>
@@ -157,6 +157,6 @@ public:
} // namespace basebmp
-#endif /* INCLUDED_BASEBMP_PALETTEIMAGEACCESSOR_HXX */
+#endif /* INCLUDED_BASEBMP_INC_PALETTEIMAGEACCESSOR_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/pixelformatadapters.hxx
b/basebmp/inc/pixelformatadapters.hxx
similarity index 94%
rename from include/basebmp/pixelformatadapters.hxx
rename to basebmp/inc/pixelformatadapters.hxx
index 3789b7e..9a6a11d 100644
--- a/include/basebmp/pixelformatadapters.hxx
+++ b/basebmp/inc/pixelformatadapters.hxx
@@ -17,11 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_PIXELFORMATADAPTERS_HXX
-#define INCLUDED_BASEBMP_PIXELFORMATADAPTERS_HXX
+#ifndef INCLUDED_BASEBMP_INC_PIXELFORMATADAPTERS_HXX
+#define INCLUDED_BASEBMP_INC_PIXELFORMATADAPTERS_HXX
-#include <basebmp/accessortraits.hxx>
-#include <basebmp/accessoradapters.hxx>
+#include <accessortraits.hxx>
+#include <accessoradapters.hxx>
#include <vigra/metaprogramming.hxx>
@@ -97,6 +97,6 @@ template< class Accessor > struct AccessorTraits<
\
} // namespace basebmp
-#endif /* INCLUDED_BASEBMP_PIXELFORMATADAPTERS_HXX */
+#endif /* INCLUDED_BASEBMP_INC_PIXELFORMATADAPTERS_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/pixeliterator.hxx b/basebmp/inc/pixeliterator.hxx
similarity index 97%
rename from include/basebmp/pixeliterator.hxx
rename to basebmp/inc/pixeliterator.hxx
index e629af2..d38af98 100644
--- a/include/basebmp/pixeliterator.hxx
+++ b/basebmp/inc/pixeliterator.hxx
@@ -17,11 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_PIXELITERATOR_HXX
-#define INCLUDED_BASEBMP_PIXELITERATOR_HXX
+#ifndef INCLUDED_BASEBMP_INC_PIXELITERATOR_HXX
+#define INCLUDED_BASEBMP_INC_PIXELITERATOR_HXX
-#include <basebmp/metafunctions.hxx>
-#include <basebmp/stridedarrayiterator.hxx>
+#include <metafunctions.hxx>
+#include <stridedarrayiterator.hxx>
#include <vigra/metaprogramming.hxx>
#include <vigra/diff2d.hxx>
@@ -344,6 +344,6 @@ public:
} // namespace basebmp
-#endif /* INCLUDED_BASEBMP_PIXELITERATOR_HXX */
+#endif /* INCLUDED_BASEBMP_INC_PIXELITERATOR_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/polypolygonrenderer.hxx
b/basebmp/inc/polypolygonrenderer.hxx
similarity index 98%
rename from include/basebmp/polypolygonrenderer.hxx
rename to basebmp/inc/polypolygonrenderer.hxx
index 05860da..fef2f7f 100644
--- a/include/basebmp/polypolygonrenderer.hxx
+++ b/basebmp/inc/polypolygonrenderer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_POLYPOLYGONRENDERER_HXX
-#define INCLUDED_BASEBMP_POLYPOLYGONRENDERER_HXX
+#ifndef INCLUDED_BASEBMP_INC_POLYPOLYGONRENDERER_HXX
+#define INCLUDED_BASEBMP_INC_POLYPOLYGONRENDERER_HXX
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/range/b2drange.hxx>
@@ -350,6 +350,6 @@ namespace basebmp
} // namespace basebmp
-#endif /* INCLUDED_BASEBMP_POLYPOLYGONRENDERER_HXX */
+#endif /* INCLUDED_BASEBMP_INC_POLYPOLYGONRENDERER_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/rgb24pixelformats.hxx
b/basebmp/inc/rgb24pixelformats.hxx
similarity index 91%
rename from include/basebmp/rgb24pixelformats.hxx
rename to basebmp/inc/rgb24pixelformats.hxx
index 50c110a..6b7edd7 100644
--- a/include/basebmp/rgb24pixelformats.hxx
+++ b/basebmp/inc/rgb24pixelformats.hxx
@@ -17,13 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_RGB24PIXELFORMATS_HXX
-#define INCLUDED_BASEBMP_RGB24PIXELFORMATS_HXX
+#ifndef INCLUDED_BASEBMP_INC_RGB24PIXELFORMATS_HXX
+#define INCLUDED_BASEBMP_INC_RGB24PIXELFORMATS_HXX
#include <basebmp/color.hxx>
-#include <basebmp/accessor.hxx>
-#include <basebmp/pixeliterator.hxx>
-#include <basebmp/pixelformatadapters.hxx>
+#include <accessor.hxx>
+#include <pixeliterator.hxx>
+#include <pixelformatadapters.hxx>
#include <vigra/rgbvalue.hxx>
@@ -87,6 +87,6 @@
BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_BGR24::getter_type,
} // namespace basebmp
-#endif /* INCLUDED_BASEBMP_RGB24PIXELFORMATS_HXX */
+#endif /* INCLUDED_BASEBMP_INC_RGB24PIXELFORMATS_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/rgbmaskpixelformats.hxx
b/basebmp/inc/rgbmaskpixelformats.hxx
similarity index 97%
rename from include/basebmp/rgbmaskpixelformats.hxx
rename to basebmp/inc/rgbmaskpixelformats.hxx
index 262b17e..6306882 100644
--- a/include/basebmp/rgbmaskpixelformats.hxx
+++ b/basebmp/inc/rgbmaskpixelformats.hxx
@@ -17,16 +17,16 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_RGBMASKPIXELFORMATS_HXX
-#define INCLUDED_BASEBMP_RGBMASKPIXELFORMATS_HXX
+#ifndef INCLUDED_BASEBMP_INC_RGBMASKPIXELFORMATS_HXX
+#define INCLUDED_BASEBMP_INC_RGBMASKPIXELFORMATS_HXX
#include <basebmp/color.hxx>
-#include <basebmp/colortraits.hxx>
-#include <basebmp/accessor.hxx>
-#include <basebmp/pixeliterator.hxx>
-#include <basebmp/pixelformatadapters.hxx>
-#include <basebmp/metafunctions.hxx>
-#include <basebmp/endian.hxx>
+#include <colortraits.hxx>
+#include <accessor.hxx>
+#include <pixeliterator.hxx>
+#include <pixelformatadapters.hxx>
+#include <metafunctions.hxx>
+#include <endian.hxx>
#include <vigra/numerictraits.hxx>
#include <vigra/metaprogramming.hxx>
@@ -350,6 +350,6 @@
BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_BGRX32_8888::getter_type,
} // namespace basebmp
-#endif /* INCLUDED_BASEBMP_RGBMASKPIXELFORMATS_HXX */
+#endif /* INCLUDED_BASEBMP_INC_RGBMASKPIXELFORMATS_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/scaleimage.hxx b/basebmp/inc/scaleimage.hxx
similarity index 97%
rename from include/basebmp/scaleimage.hxx
rename to basebmp/inc/scaleimage.hxx
index fc90223..69beaf6 100644
--- a/include/basebmp/scaleimage.hxx
+++ b/basebmp/inc/scaleimage.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_SCALEIMAGE_HXX
-#define INCLUDED_BASEBMP_SCALEIMAGE_HXX
+#ifndef INCLUDED_BASEBMP_INC_SCALEIMAGE_HXX
+#define INCLUDED_BASEBMP_INC_SCALEIMAGE_HXX
#include <osl/diagnose.h>
@@ -184,6 +184,6 @@ inline void scaleImage(
vigra::triple<SourceIter,SourceIter,SourceAcc> const& sr
}
-#endif /* INCLUDED_BASEBMP_SCALEIMAGE_HXX */
+#endif /* INCLUDED_BASEBMP_INC_SCALEIMAGE_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/stridedarrayiterator.hxx
b/basebmp/inc/stridedarrayiterator.hxx
similarity index 94%
rename from include/basebmp/stridedarrayiterator.hxx
rename to basebmp/inc/stridedarrayiterator.hxx
index 6f5772e..821d3aa 100644
--- a/include/basebmp/stridedarrayiterator.hxx
+++ b/basebmp/inc/stridedarrayiterator.hxx
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_STRIDEDARRAYITERATOR_HXX
-#define INCLUDED_BASEBMP_STRIDEDARRAYITERATOR_HXX
+#ifndef INCLUDED_BASEBMP_INC_STRIDEDARRAYITERATOR_HXX
+#define INCLUDED_BASEBMP_INC_STRIDEDARRAYITERATOR_HXX
-#include <basebmp/metafunctions.hxx>
+#include <metafunctions.hxx>
namespace basebmp
{
@@ -103,6 +103,6 @@ private:
} // namespace basebmp
-#endif /* INCLUDED_BASEBMP_STRIDEDARRAYITERATOR_HXX */
+#endif /* INCLUDED_BASEBMP_INC_STRIDEDARRAYITERATOR_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/tools.hxx b/basebmp/inc/tools.hxx
similarity index 96%
rename from include/basebmp/tools.hxx
rename to basebmp/inc/tools.hxx
index 31854a1..c562a30 100644
--- a/include/basebmp/tools.hxx
+++ b/basebmp/inc/tools.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASEBMP_TOOLS_HXX
-#define INCLUDED_BASEBMP_TOOLS_HXX
+#ifndef INCLUDED_BASEBMP_INC_TOOLS_HXX
+#define INCLUDED_BASEBMP_INC_TOOLS_HXX
#include <basegfx/range/b2ibox.hxx>
#include <basegfx/point/b2ipoint.hxx>
@@ -80,6 +80,6 @@ namespace basebmp
}
}
-#endif /* INCLUDED_BASEBMP_TOOLS_HXX */
+#endif /* INCLUDED_BASEBMP_INC_TOOLS_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index 961f07b..040015e 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -24,31 +24,31 @@
#include <basebmp/bitmapdevice.hxx>
-#include <basebmp/compositeiterator.hxx>
-#include <basebmp/iteratortraits.hxx>
+#include <compositeiterator.hxx>
+#include <iteratortraits.hxx>
-#include <basebmp/accessor.hxx>
-#include <basebmp/accessortraits.hxx>
-#include <basebmp/accessoradapters.hxx>
-#include <basebmp/colorblendaccessoradapter.hxx>
+#include <accessor.hxx>
+#include <accessortraits.hxx>
+#include <accessoradapters.hxx>
+#include <colorblendaccessoradapter.hxx>
#include <basebmp/color.hxx>
-#include <basebmp/colormisc.hxx>
-#include <basebmp/colortraits.hxx>
+#include <colormisc.hxx>
+#include <colortraits.hxx>
-#include <basebmp/greylevelformats.hxx>
-#include <basebmp/paletteformats.hxx>
-#include <basebmp/rgbmaskpixelformats.hxx>
-#include <basebmp/rgb24pixelformats.hxx>
+#include <greylevelformats.hxx>
+#include <paletteformats.hxx>
+#include <rgbmaskpixelformats.hxx>
+#include <rgb24pixelformats.hxx>
#include <basebmp/scanlineformats.hxx>
-#include <basebmp/fillimage.hxx>
-#include <basebmp/scaleimage.hxx>
-#include <basebmp/clippedlinerenderer.hxx>
-#include <basebmp/polypolygonrenderer.hxx>
-#include <basebmp/genericcolorimageaccessor.hxx>
+#include <fillimage.hxx>
+#include <scaleimage.hxx>
+#include <clippedlinerenderer.hxx>
+#include <polypolygonrenderer.hxx>
+#include <genericcolorimageaccessor.hxx>
-#include <basebmp/tools.hxx>
+#include <tools.hxx>
#include "intconversion.hxx"
#include <rtl/alloc.h>
diff --git a/basebmp/source/polypolygonrenderer.cxx
b/basebmp/source/polypolygonrenderer.cxx
index 55d6d69..91cd273 100644
--- a/basebmp/source/polypolygonrenderer.cxx
+++ b/basebmp/source/polypolygonrenderer.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <basebmp/polypolygonrenderer.hxx>
+#include <polypolygonrenderer.hxx>
#include <algorithm>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
