Kaydet (Commit) 8db9363c authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl Kaydeden (comit) Tomaž Vajngerl

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: 's avatarTomaž Vajngerl <quikee@gmail.com>
üst 08698950
...@@ -17331,13 +17331,13 @@ vcl/inc/impfontmetric.hxx ...@@ -17331,13 +17331,13 @@ vcl/inc/impfontmetric.hxx
vcl/inc/impfontmetricdata.hxx vcl/inc/impfontmetricdata.hxx
vcl/inc/impgraph.hxx vcl/inc/impgraph.hxx
vcl/inc/implimagetree.hxx vcl/inc/implimagetree.hxx
vcl/inc/impoctree.hxx
vcl/inc/ios/iosinst.hxx vcl/inc/ios/iosinst.hxx
vcl/inc/ios/svsys.h vcl/inc/ios/svsys.h
vcl/inc/jobset.h vcl/inc/jobset.h
vcl/inc/langboost.hxx vcl/inc/langboost.hxx
vcl/inc/listbox.hxx vcl/inc/listbox.hxx
vcl/inc/octree.hxx vcl/inc/bitmap/Octree.hxx
vcl/inc/bitmap/impoctree.hxx
vcl/inc/opengl/BufferObject.hxx vcl/inc/opengl/BufferObject.hxx
vcl/inc/opengl/DeviceInfo.hxx vcl/inc/opengl/DeviceInfo.hxx
vcl/inc/opengl/FixedTextureAtlas.hxx vcl/inc/opengl/FixedTextureAtlas.hxx
...@@ -17777,6 +17777,7 @@ vcl/source/bitmap/BitmapTools.cxx ...@@ -17777,6 +17777,7 @@ vcl/source/bitmap/BitmapTools.cxx
vcl/source/bitmap/bitmap.cxx vcl/source/bitmap/bitmap.cxx
vcl/source/bitmap/bitmapfilter.cxx vcl/source/bitmap/bitmapfilter.cxx
vcl/source/bitmap/checksum.cxx vcl/source/bitmap/checksum.cxx
vcl/source/bitmap/Octree.cxx
vcl/source/components/dtranscomp.cxx vcl/source/components/dtranscomp.cxx
vcl/source/components/factory.cxx vcl/source/components/factory.cxx
vcl/source/components/fontident.cxx vcl/source/components/fontident.cxx
...@@ -17909,7 +17910,6 @@ vcl/source/gdi/lineinfo.cxx ...@@ -17909,7 +17910,6 @@ vcl/source/gdi/lineinfo.cxx
vcl/source/gdi/mapmod.cxx vcl/source/gdi/mapmod.cxx
vcl/source/gdi/metaact.cxx vcl/source/gdi/metaact.cxx
vcl/source/gdi/mtfxmldump.cxx vcl/source/gdi/mtfxmldump.cxx
vcl/source/gdi/octree.cxx
vcl/source/gdi/oldprintadaptor.cxx vcl/source/gdi/oldprintadaptor.cxx
vcl/source/gdi/pdfextoutdevdata.cxx vcl/source/gdi/pdfextoutdevdata.cxx
vcl/source/gdi/pdffontcache.cxx vcl/source/gdi/pdffontcache.cxx
......
...@@ -280,7 +280,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ ...@@ -280,7 +280,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/gdi/lineinfo \ vcl/source/gdi/lineinfo \
vcl/source/gdi/mapmod \ vcl/source/gdi/mapmod \
vcl/source/gdi/metaact \ vcl/source/gdi/metaact \
vcl/source/gdi/octree \
vcl/source/gdi/oldprintadaptor \ vcl/source/gdi/oldprintadaptor \
vcl/source/gdi/pdfbuildin_fonts \ vcl/source/gdi/pdfbuildin_fonts \
vcl/source/gdi/pdfextoutdevdata \ vcl/source/gdi/pdfextoutdevdata \
...@@ -344,6 +343,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ ...@@ -344,6 +343,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/bitmap/BitmapSimpleColorQuantizationFilter \ vcl/source/bitmap/BitmapSimpleColorQuantizationFilter \
vcl/source/bitmap/BitmapTools \ vcl/source/bitmap/BitmapTools \
vcl/source/bitmap/checksum \ vcl/source/bitmap/checksum \
vcl/source/bitmap/Octree \
vcl/source/image/Image \ vcl/source/image/Image \
vcl/source/image/ImageTree \ vcl/source/image/ImageTree \
vcl/source/image/ImageRepository \ vcl/source/image/ImageRepository \
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_INC_IMPOCTREE_HXX #ifndef INCLUDED_VCL_INC_IMPOCTREE_HXX
#define INCLUDED_VCL_INC_IMPOCTREE_HXX #define INCLUDED_VCL_INC_IMPOCTREE_HXX
#include "octree.hxx" #include "Octree.hxx"
class ImpErrorQuad class ImpErrorQuad
{ {
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <vcl/BitmapSimpleColorQuantizationFilter.hxx> #include <vcl/BitmapSimpleColorQuantizationFilter.hxx>
#include <bitmapwriteaccess.hxx> #include <bitmapwriteaccess.hxx>
#include <impoctree.hxx> #include <bitmap/Octree.hxx>
#include <cstdlib> #include <cstdlib>
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
#include <rtl/alloc.h> #include <rtl/alloc.h>
#include <vcl/bitmapaccess.hxx> #include <vcl/bitmapaccess.hxx>
#include <octree.hxx> #include <bitmap/Octree.hxx>
#include <impoctree.hxx> #include <bitmap/impoctree.hxx>
static const sal_uInt8 pImplMask[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }; static const sal_uInt8 pImplMask[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };
......
...@@ -32,13 +32,13 @@ ...@@ -32,13 +32,13 @@
#endif #endif
#include <vcl/BitmapMonochromeFilter.hxx> #include <vcl/BitmapMonochromeFilter.hxx>
#include <impoctree.hxx>
#include <BitmapScaleSuperFilter.hxx> #include <BitmapScaleSuperFilter.hxx>
#include <BitmapScaleConvolutionFilter.hxx> #include <BitmapScaleConvolutionFilter.hxx>
#include <BitmapFastScaleFilter.hxx> #include <BitmapFastScaleFilter.hxx>
#include <BitmapInterpolateScaleFilter.hxx> #include <BitmapInterpolateScaleFilter.hxx>
#include <bitmapwriteaccess.hxx> #include <bitmapwriteaccess.hxx>
#include <octree.hxx> #include <bitmap/impoctree.hxx>
#include <bitmap/Octree.hxx>
#include <svdata.hxx> #include <svdata.hxx>
#include <salinst.hxx> #include <salinst.hxx>
#include <salbmp.hxx> #include <salbmp.hxx>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment