Kaydet (Commit) 37159a69 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:useuniqueptr in Decompression

Change-Id: I0b224fd8e9f137e24375dd9975087e6a5891f8fc
Reviewed-on: https://gerrit.libreoffice.org/50719Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 46b32a02
...@@ -251,7 +251,7 @@ sal_Int32 Decompression::explode() ...@@ -251,7 +251,7 @@ sal_Int32 Decompression::explode()
} }
// if the bit is 1 we have here a length/distance pair: // if the bit is 1 we have here a length/distance pair:
// -decode a number with Hufmman Tree #1; variable bit length, result is 0x00 .. 0x0F -> L1 // -decode a number with Hufmman Tree #1; variable bit length, result is 0x00 .. 0x0F -> L1
sal_uInt32 L1 = Decode(m_Tree1); sal_uInt32 L1 = Decode(m_Tree1.get());
sal_uInt32 Length; sal_uInt32 Length;
if (L1 <= 7) if (L1 <= 7)
{ {
...@@ -276,7 +276,7 @@ sal_Int32 Decompression::explode() ...@@ -276,7 +276,7 @@ sal_Int32 Decompression::explode()
} }
// - decode another number with Hufmann Tree #2 giving result 0x00..0x3F -> D1 // - decode another number with Hufmann Tree #2 giving result 0x00..0x3F -> D1
sal_uInt32 D1 = Decode(m_Tree2); sal_uInt32 D1 = Decode(m_Tree2.get());
sal_uInt32 D2; sal_uInt32 D2;
if (Length == 2) if (Length == 2)
{ {
...@@ -400,7 +400,7 @@ void Decompression::ConstructTree1() ...@@ -400,7 +400,7 @@ void Decompression::ConstructTree1()
// d 0000 01 // d 0000 01
// e 0000 001 // e 0000 001
// f 0000 000 // f 0000 000
m_Tree1 = new HuffmanTreeNode(); m_Tree1.reset( new HuffmanTreeNode());
for (sal_uInt32 i=0; i< 16; i++) for (sal_uInt32 i=0; i< 16; i++)
{ {
m_Tree1->InsertNode(i, Tree1String[i]); m_Tree1->InsertNode(i, Tree1String[i]);
...@@ -431,7 +431,7 @@ void Decompression::ConstructTree1() ...@@ -431,7 +431,7 @@ void Decompression::ConstructTree1()
void Decompression::ConstructTree2() void Decompression::ConstructTree2()
{ {
m_Tree2 = new HuffmanTreeNode(); m_Tree2.reset(new HuffmanTreeNode());
for (sal_uInt32 i=0; i< 64; i++) for (sal_uInt32 i=0; i< 64; i++)
{ {
m_Tree2->InsertNode(i, Tree2String[i]); m_Tree2->InsertNode(i, Tree2String[i]);
......
...@@ -85,11 +85,6 @@ class Decompression ...@@ -85,11 +85,6 @@ class Decompression
{ {
public: public:
Decompression(SvStream * pInStream, SvStream * pOutStream); Decompression(SvStream * pInStream, SvStream * pOutStream);
~Decompression()
{
delete m_Tree1;
delete m_Tree2;
};
/** /**
* @brief * @brief
* decompress from instream to outstream * decompress from instream to outstream
...@@ -117,7 +112,7 @@ public: ...@@ -117,7 +112,7 @@ public:
sal_uInt32 m_iArrayOfM[16]; sal_uInt32 m_iArrayOfM[16];
HuffmanTreeNode *m_Tree1, *m_Tree2; std::unique_ptr<HuffmanTreeNode> m_Tree1, m_Tree2;
void ConstructTree1(); void ConstructTree1();
void ConstructTree2(); void ConstructTree2();
......
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