From c2d1cd81c8b7033b655fc7b849c5c2436aa560b6 Mon Sep 17 00:00:00 2001
From: Christian Hitz <christian@klarinett.li>
Date: Fri, 19 Sep 2014 11:14:18 +0200
Subject: [PATCH 17/17] pgf: CMacroBlock: remove unused variable m_decoder

---
 scribus/third_party/pgf/Decoder.cpp | 4 ++--
 scribus/third_party/pgf/Decoder.h   | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/scribus/third_party/pgf/Decoder.cpp b/scribus/third_party/pgf/Decoder.cpp
index 662dc3c..35a442b 100644
--- a/scribus/third_party/pgf/Decoder.cpp
+++ b/scribus/third_party/pgf/Decoder.cpp
@@ -91,10 +91,10 @@ CDecoder::CDecoder(CPGFStream* stream, PGFPreHeader& preHeader, PGFHeader& heade
 
 		// create macro block array
 		m_macroBlocks = new CMacroBlock*[m_macroBlockLen];
-		for (int i=0; i < m_macroBlockLen; i++) m_macroBlocks[i] = new CMacroBlock(this);
+		for (int i=0; i < m_macroBlockLen; i++) m_macroBlocks[i] = new CMacroBlock();
 	} else {
 		m_macroBlocks = 0;
-		m_currentBlock = new CMacroBlock(this);
+		m_currentBlock = new CMacroBlock();
 	}
 
 	// store current stream position
diff --git a/scribus/third_party/pgf/Decoder.h b/scribus/third_party/pgf/Decoder.h
index bb172b1..3b9553b 100644
--- a/scribus/third_party/pgf/Decoder.h
+++ b/scribus/third_party/pgf/Decoder.h
@@ -49,10 +49,9 @@ class CDecoder {
 	/// @brief A macro block is a decoding unit of fixed size (uncoded)
 	class CMacroBlock {
 	public:
-		CMacroBlock(CDecoder *decoder)
+		CMacroBlock()
 		: m_header(0)
         , m_valuePos(0)
-		, m_decoder(decoder)
 		{
 			ASSERT(m_decoder);
 		}
@@ -71,7 +70,6 @@ class CDecoder {
 		void  SetBitAtPos(UINT32 pos, DataT planeMask)			{ (m_value[pos] >= 0) ? m_value[pos] |= planeMask : m_value[pos] -= planeMask; }
 		void  SetSign(UINT32 pos, bool sign)					{ m_value[pos] = -m_value[pos]*sign + m_value[pos]*(!sign); }
 
-		CDecoder *m_decoder;						// outer class
 		bool m_sigFlagVector[BufferSize+1];			// see paper from Malvar, Fast Progressive Wavelet Coder
 	};
 
-- 
2.1.0