summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2019-04-14 18:37:54 +0900
committerTomaž Vajngerl <quikee@gmail.com>2019-04-14 14:18:50 +0200
commit8db9363c8ef6138d2420366cc4f42ca1d662bdd7 (patch)
treec1ebed71f42f4f7d402ce98c40aeccfe8e6e4a3d /vcl/source
parent0869895063bd528893707cb74c6cf4c461fef066 (diff)
move octree to bitmap folder, and *octree headers to inc/bitmap
Octree is a tree, that's used for color quantization, so it's better to move it there. Headers are also moved to bitmap subfolder so it's better organized. Change-Id: I2b84a5469c1479cf0a060ba8eb46591dabab2883 Reviewed-on: https://gerrit.libreoffice.org/70726 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx2
-rw-r--r--vcl/source/bitmap/Octree.cxx (renamed from vcl/source/gdi/octree.cxx)4
-rw-r--r--vcl/source/gdi/bitmap3.cxx4
3 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx b/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx
index 2f1fb9906a1f..ae066cc66cf6 100644
--- a/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx
+++ b/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx
@@ -14,7 +14,7 @@
#include <vcl/BitmapSimpleColorQuantizationFilter.hxx>
#include <bitmapwriteaccess.hxx>
-#include <impoctree.hxx>
+#include <bitmap/Octree.hxx>
#include <cstdlib>
diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/bitmap/Octree.cxx
index 4635067901f8..64914f76385e 100644
--- a/vcl/source/gdi/octree.cxx
+++ b/vcl/source/bitmap/Octree.cxx
@@ -22,8 +22,8 @@
#include <rtl/alloc.h>
#include <vcl/bitmapaccess.hxx>
-#include <octree.hxx>
-#include <impoctree.hxx>
+#include <bitmap/Octree.hxx>
+#include <bitmap/impoctree.hxx>
static const sal_uInt8 pImplMask[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 23aa996b6a2d..71a3bc468876 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -32,13 +32,13 @@
#endif
#include <vcl/BitmapMonochromeFilter.hxx>
-#include <impoctree.hxx>
#include <BitmapScaleSuperFilter.hxx>
#include <BitmapScaleConvolutionFilter.hxx>
#include <BitmapFastScaleFilter.hxx>
#include <BitmapInterpolateScaleFilter.hxx>
#include <bitmapwriteaccess.hxx>
-#include <octree.hxx>
+#include <bitmap/impoctree.hxx>
+#include <bitmap/Octree.hxx>
#include <svdata.hxx>
#include <salinst.hxx>
#include <salbmp.hxx>