[Libreoffice-commits] core.git: vcl/inc vcl/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Mon Sep 9 15:08:02 UTC 2019
vcl/inc/bitmap/Octree.hxx | 24 +++-----
vcl/source/bitmap/Octree.cxx | 115 ++++++++-----------------------------------
2 files changed, 33 insertions(+), 106 deletions(-)
New commits:
commit 470c9e31366619a3fdadee4e5506a9c2e0726f21
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Sep 6 14:04:40 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Sep 9 17:07:16 2019 +0200
use unique_ptr in Octree
Change-Id: I18d5eb7d63371690de3fd1e8e512bfe4d603078c
Reviewed-on: https://gerrit.libreoffice.org/78707
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/vcl/inc/bitmap/Octree.hxx b/vcl/inc/bitmap/Octree.hxx
index 62003eae18a5..0bc060d450d9 100644
--- a/vcl/inc/bitmap/Octree.hxx
+++ b/vcl/inc/bitmap/Octree.hxx
@@ -25,18 +25,16 @@
struct OctreeNode
{
- sal_uLong nCount;
- sal_uLong nRed;
- sal_uLong nGreen;
- sal_uLong nBlue;
- OctreeNode* pChild[8];
- OctreeNode* pNext;
- OctreeNode* pNextInCache;
- sal_uInt16 nPalIndex;
- bool bLeaf;
+ sal_uLong nCount = 0;
+ sal_uLong nRed = 0;
+ sal_uLong nGreen = 0;
+ sal_uLong nBlue = 0;
+ std::unique_ptr<OctreeNode> pChild[8];
+ OctreeNode* pNext = nullptr;
+ sal_uInt16 nPalIndex = 0;
+ bool bLeaf = false;
};
-class ImpNodeCache;
class BitmapReadAccess;
class VCL_PLUGIN_PUBLIC Octree
@@ -45,17 +43,15 @@ private:
void CreatePalette(OctreeNode* pNode);
void GetPalIndex(OctreeNode* pNode);
- SAL_DLLPRIVATE void deleteOctree(OctreeNode** ppNode);
- SAL_DLLPRIVATE void add(OctreeNode** ppNode);
+ SAL_DLLPRIVATE void add(std::unique_ptr<OctreeNode>& rpNode);
SAL_DLLPRIVATE void reduce();
BitmapPalette maPalette;
sal_uLong mnLeafCount;
sal_uLong mnLevel;
- OctreeNode* pTree;
+ std::unique_ptr<OctreeNode> pTree;
std::vector<OctreeNode*> mpReduce;
BitmapColor const* mpColor;
- std::unique_ptr<ImpNodeCache> mpNodeCache;
const BitmapReadAccess* mpAccess;
sal_uInt16 mnPalIndex;
diff --git a/vcl/source/bitmap/Octree.cxx b/vcl/source/bitmap/Octree.cxx
index 1d35a8e97317..42da9dd2ae7a 100644
--- a/vcl/source/bitmap/Octree.cxx
+++ b/vcl/source/bitmap/Octree.cxx
@@ -30,67 +30,11 @@ constexpr sal_uLong gnBits = 8 - OCTREE_BITS;
} // end anonymous namespace
-class ImpNodeCache
-{
-private:
- OctreeNode* mpActNode;
-
-public:
- ImpNodeCache(const sal_uLong nInitSize)
- : mpActNode(nullptr)
- {
- const sal_uLong nSize = nInitSize + 4;
-
- for (sal_uLong i = 0; i < nSize; i++)
- {
- OctreeNode* pNewNode = new OctreeNode;
-
- pNewNode->pNextInCache = mpActNode;
- mpActNode = pNewNode;
- }
- }
-
- ~ImpNodeCache()
- {
- while (mpActNode)
- {
- OctreeNode* pNode = mpActNode;
-
- mpActNode = pNode->pNextInCache;
- delete pNode;
- }
- }
-
- OctreeNode* ImplGetFreeNode()
- {
- OctreeNode* pNode;
-
- if (!mpActNode)
- {
- mpActNode = new OctreeNode;
- mpActNode->pNextInCache = nullptr;
- }
-
- pNode = mpActNode;
- mpActNode = pNode->pNextInCache;
- memset(pNode, 0, sizeof(OctreeNode));
-
- return pNode;
- }
- void ImplReleaseNode(OctreeNode* pNode)
- {
- pNode->pNextInCache = mpActNode;
- mpActNode = pNode;
- }
-};
-
Octree::Octree(const BitmapReadAccess& rReadAcc, sal_uLong nColors)
: mnLeafCount(0)
, mnLevel(0)
- , pTree(nullptr)
, mpReduce(OCTREE_BITS + 1, nullptr)
, mpColor(nullptr)
- , mpNodeCache(std::make_unique<ImpNodeCache>(nColors))
, mpAccess(&rReadAcc)
, mnPalIndex(0)
{
@@ -110,7 +54,7 @@ Octree::Octree(const BitmapReadAccess& rReadAcc, sal_uLong nColors)
{
mpColor = &mpAccess->GetPaletteColor(mpAccess->GetIndexFromData(pScanline, nX));
mnLevel = 0;
- add(&pTree);
+ add(pTree);
while (mnLeafCount > nMax)
reduce();
@@ -130,7 +74,7 @@ Octree::Octree(const BitmapReadAccess& rReadAcc, sal_uLong nColors)
{
aColor = mpAccess->GetPixelFromData(pScanline, nX);
mnLevel = 0;
- add(&pTree);
+ add(pTree);
while (mnLeafCount > nMax)
reduce();
@@ -140,43 +84,31 @@ Octree::Octree(const BitmapReadAccess& rReadAcc, sal_uLong nColors)
}
}
-Octree::~Octree() { deleteOctree(&pTree); }
-
-void Octree::deleteOctree(OctreeNode** ppNode)
-{
- for (OctreeNode* i : (*ppNode)->pChild)
- {
- if (i)
- deleteOctree(&i);
- }
-
- mpNodeCache->ImplReleaseNode(*ppNode);
- *ppNode = nullptr;
-}
+Octree::~Octree() {}
-void Octree::add(OctreeNode** ppNode)
+void Octree::add(std::unique_ptr<OctreeNode>& rpNode)
{
// possibly generate new nodes
- if (!*ppNode)
+ if (!rpNode)
{
- *ppNode = mpNodeCache->ImplGetFreeNode();
- (*ppNode)->bLeaf = (OCTREE_BITS == mnLevel);
+ rpNode.reset(new OctreeNode);
+ rpNode->bLeaf = (OCTREE_BITS == mnLevel);
- if ((*ppNode)->bLeaf)
+ if (rpNode->bLeaf)
mnLeafCount++;
else
{
- (*ppNode)->pNext = mpReduce[mnLevel];
- mpReduce[mnLevel] = *ppNode;
+ rpNode->pNext = mpReduce[mnLevel];
+ mpReduce[mnLevel] = rpNode.get();
}
}
- if ((*ppNode)->bLeaf)
+ if (rpNode->bLeaf)
{
- (*ppNode)->nCount++;
- (*ppNode)->nRed += mpColor->GetRed();
- (*ppNode)->nGreen += mpColor->GetGreen();
- (*ppNode)->nBlue += mpColor->GetBlue();
+ rpNode->nCount++;
+ rpNode->nRed += mpColor->GetRed();
+ rpNode->nGreen += mpColor->GetGreen();
+ rpNode->nBlue += mpColor->GetBlue();
}
else
{
@@ -187,7 +119,7 @@ void Octree::add(OctreeNode** ppNode)
| ((mpColor->GetBlue() & cMask) >> nShift);
mnLevel++;
- add(&(*ppNode)->pChild[nIndex]);
+ add(rpNode->pChild[nIndex]);
}
}
@@ -212,15 +144,14 @@ void Octree::reduce()
{
if (pNode->pChild[i])
{
- OctreeNode* pChild = pNode->pChild[i];
+ OctreeNode* pChild = pNode->pChild[i].get();
nRedSum += pChild->nRed;
nGreenSum += pChild->nGreen;
nBlueSum += pChild->nBlue;
pNode->nCount += pChild->nCount;
- mpNodeCache->ImplReleaseNode(pNode->pChild[i]);
- pNode->pChild[i] = nullptr;
+ pNode->pChild[i].reset();
nChildren++;
}
}
@@ -243,11 +174,11 @@ void Octree::CreatePalette(OctreeNode* pNode)
}
else
{
- for (OctreeNode* i : pNode->pChild)
+ for (auto const& i : pNode->pChild)
{
if (i)
{
- CreatePalette(i);
+ CreatePalette(i.get());
}
}
}
@@ -266,7 +197,7 @@ void Octree::GetPalIndex(OctreeNode* pNode)
| (((mpColor->GetGreen() & cMask) >> nShift) << 1)
| ((mpColor->GetBlue() & cMask) >> nShift);
- GetPalIndex(pNode->pChild[nIndex]);
+ GetPalIndex(pNode->pChild[nIndex].get());
}
}
@@ -274,7 +205,7 @@ const BitmapPalette& Octree::GetPalette()
{
maPalette.SetEntryCount(sal_uInt16(mnLeafCount));
mnPalIndex = 0;
- CreatePalette(pTree);
+ CreatePalette(pTree.get());
return maPalette;
}
@@ -283,7 +214,7 @@ sal_uInt16 Octree::GetBestPaletteIndex(const BitmapColor& rColor)
mpColor = &rColor;
mnPalIndex = 65535;
mnLevel = 0;
- GetPalIndex(pTree);
+ GetPalIndex(pTree.get());
return mnPalIndex;
}
More information about the Libreoffice-commits
mailing list