View Issue Details
| ID | Project | Category | View Status | Date Submitted | Last Update |
|---|---|---|---|---|---|
| 0012783 | Scribus | General | public | 2014-10-21 19:54 | 2015-02-23 19:04 |
| Reporter | Kunda | Assigned To | fschmid | ||
| Priority | normal | Severity | minor | Reproducibility | N/A |
| Status | closed | Resolution | fixed | ||
| Product Version | 1.5.0svn | ||||
| Target Version | 1.5.0 | Fixed in Version | 1.5.0svn | ||
| Summary | 0012783: Upgrade libpgf 3rd party code | ||||
| Description | As per MrB on IRC Moving pgf patche in to this ticket and suggesting to upgrade library | ||||
| Tags | No tags attached. | ||||
| Attached Files | 0017-pgf-CMacroBlock-remove-unused-variable-m_decoder.patch (2,005 bytes)
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
| ||||
| Patch | No | ||||
| Date Modified | Username | Field | Change |
|---|---|---|---|
| 2014-10-21 19:54 | Kunda | New Issue | |
| 2014-10-21 19:54 | Kunda | Status | new => assigned |
| 2014-10-21 19:54 | Kunda | Assigned To | => fschmid |
| 2014-10-21 19:54 | Kunda | Issue generated from: 0012782 | |
| 2014-10-21 19:54 | Kunda | Relationship added | related to 0012782 |
| 2014-10-21 19:54 | Kunda | File Deleted: 0016-wpg-WPXInputStream-remove-unused-m_supportsOLE.patch | |
| 2014-10-21 19:54 | Kunda | File Deleted: 0012-wpg-size_t-is-unsigned-can-never-be-less-than-0.patch | |
| 2014-10-21 19:54 | Kunda | File Deleted: 0013-wpg-silence-warning-about-unused-cell-variable.patch | |
| 2014-10-21 19:55 | Kunda | File Deleted: 0014-wpg-remove-unused-m_binaryId.patch | |
| 2014-10-21 19:55 | Kunda | File Deleted: 0015-wpg-WPGHeader-comment-unused-fields.patch | |
| 2014-10-21 19:55 | Kunda | Relationship added | related to 0012778 |
| 2015-01-03 11:42 | fschmid | Status | assigned => resolved |
| 2015-01-03 11:42 | fschmid | Fixed in Version | => 1.5.0svn |
| 2015-01-03 11:42 | fschmid | Resolution | open => fixed |
| 2015-01-30 22:38 | cbradney | Status | resolved => closed |
| 2015-02-23 19:04 | Kunda | Patch | => No |
| 2015-02-23 19:04 | Kunda | Target Version | 1.6 milestone => 1.5.0 |