vcl/inc/impoct.hxx | 147 ---------------------------------------------
vcl/inc/impoctree.hxx | 147 +++++++++++++++++++++++++++++++++++++++++++++
vcl/source/gdi/bitmap3.cxx | 6 -
vcl/source/gdi/octree.cxx | 13 ---
4 files changed, 152 insertions(+), 161 deletions(-)
New commits:
commit bd59302728985b7a7d8a80051912577ab29b4852
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date: Mon Jan 25 21:32:28 2016 +1100
tdf#39468 vcl: translate German comment in vcl/source/gdi/octree.cxx
Change-Id: I5cc029f51fc504baaaf68b634f587bf035e2b4ab
diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx
index 4977c01..d65e012 100644
--- a/vcl/source/gdi/octree.cxx
+++ b/vcl/source/gdi/octree.cxx
@@ -126,7 +126,7 @@ void Octree::ImplDeleteOctree( NODE** ppNode )
void Octree::ImplAdd( NODE** ppNode )
{
- // ggf. neuen Knoten erzeugen
+ // possibly generate new nodes
if( !*ppNode )
{
*ppNode = pNodeCache->ImplGetFreeNode();
commit 08cb7f28a38355409ba899324e597b31b008a8e2
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date: Mon Jan 25 21:30:29 2016 +1100
vcl: remove comment cruft from vcl/source/gdi/octree.cxx
Change-Id: I01ea75df297cc7e492a0c035e321695ac74e46a3
diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx
index 50fd40cb..4977c01 100644
--- a/vcl/source/gdi/octree.cxx
+++ b/vcl/source/gdi/octree.cxx
@@ -24,12 +24,8 @@
#include "octree.hxx"
#include "impoctree.hxx"
-// - pMask -
-
static const sal_uInt8 pImplMask[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04,
0x02, 0x01 };
-// - NodeCache -
-
ImpNodeCache::ImpNodeCache( const sal_uLong nInitSize ) :
pActNode( nullptr )
{
@@ -55,8 +51,6 @@ ImpNodeCache::~ImpNodeCache()
}
}
-// - Octree -
-
Octree::Octree( const BitmapReadAccess& rReadAcc, sal_uLong nColors ) :
nMax ( nColors ),
nLeafCount ( 0L ),
@@ -236,8 +230,6 @@ void Octree::GetPalIndex( NODE* pNode )
}
}
-// - InverseColorMap -
-
InverseColorMap::InverseColorMap( const BitmapPalette& rPal ) :
nBits( 8 - OCTREE_BITS )
{
commit 62f21d96b84527c71abd1f895bba8f504c01d514
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date: Mon Jan 25 21:29:42 2016 +1100
vcl: rename impoct.hxx to impoctree.hxx
Change-Id: I4ede6b4f9659ce57423fd1a6431715f35c30db0e
diff --git a/vcl/inc/impoct.hxx b/vcl/inc/impoctree.hxx
similarity index 100%
rename from vcl/inc/impoct.hxx
rename to vcl/inc/impoctree.hxx
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 4ffd136..12efd66 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -28,9 +28,9 @@
#include <memory>
-#include <impbmp.hxx>
-#include <impoct.hxx>
-#include <impvect.hxx>
+#include "impbmp.hxx"
+#include "impoctree.hxx"
+#include "impvect.hxx"
#include "octree.hxx"
#include "BitmapScaleConvolution.hxx"
diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx
index 7206686..50fd40cb 100644
--- a/vcl/source/gdi/octree.cxx
+++ b/vcl/source/gdi/octree.cxx
@@ -21,9 +21,8 @@
#include <vcl/bmpacc.hxx>
-#include <impoct.hxx>
-
#include "octree.hxx"
+#include "impoctree.hxx"
// - pMask -
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
