| Index: core/src/fxcodec/jbig2/JBig2_List.h
|
| diff --git a/core/src/fxcodec/jbig2/JBig2_List.h b/core/src/fxcodec/jbig2/JBig2_List.h
|
| index 19f99dec3dd5f4568f41ecd86546e4528a08cdc2..be2d7cb7e4786cb6dc45a15f8710c2ecb2c7951d 100644
|
| --- a/core/src/fxcodec/jbig2/JBig2_List.h
|
| +++ b/core/src/fxcodec/jbig2/JBig2_List.h
|
| @@ -1,7 +1,7 @@
|
| // Copyright 2014 PDFium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
| -
|
| +
|
| // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
|
|
|
| #ifndef _JBIG2_LIST_H_
|
| @@ -9,59 +9,45 @@
|
| #include "JBig2_Define.h"
|
| #include "JBig2_Object.h"
|
| template <class TYPE>
|
| -class CJBig2_List : public CJBig2_Object
|
| -{
|
| -public:
|
| -
|
| - CJBig2_List(int32_t nSize = 8)
|
| - {
|
| - m_nSize = nSize;
|
| - m_pArray = (TYPE**)m_pModule->JBig2_Malloc2(sizeof(TYPE*), nSize);
|
| - m_nLength = 0;
|
| - }
|
| -
|
| - ~CJBig2_List()
|
| - {
|
| - clear();
|
| - m_pModule->JBig2_Free(m_pArray);
|
| - }
|
| -
|
| - void clear()
|
| - {
|
| - int32_t i;
|
| - for(i = 0; i < m_nLength; i++) {
|
| - delete m_pArray[i];
|
| - }
|
| - m_nLength = 0;
|
| +class CJBig2_List : public CJBig2_Object {
|
| + public:
|
| + CJBig2_List(int32_t nSize = 8) {
|
| + m_nSize = nSize;
|
| + m_pArray = (TYPE**)m_pModule->JBig2_Malloc2(sizeof(TYPE*), nSize);
|
| + m_nLength = 0;
|
| + }
|
| +
|
| + ~CJBig2_List() {
|
| + clear();
|
| + m_pModule->JBig2_Free(m_pArray);
|
| + }
|
| +
|
| + void clear() {
|
| + int32_t i;
|
| + for (i = 0; i < m_nLength; i++) {
|
| + delete m_pArray[i];
|
| }
|
| -
|
| - void addItem(TYPE *pItem)
|
| - {
|
| - if(m_nLength >= m_nSize) {
|
| - m_nSize += 8;
|
| - m_pArray = (TYPE**)m_pModule->JBig2_Realloc(m_pArray, sizeof(TYPE*)*m_nSize);
|
| - }
|
| - m_pArray[m_nLength++] = pItem;
|
| + m_nLength = 0;
|
| + }
|
| +
|
| + void addItem(TYPE* pItem) {
|
| + if (m_nLength >= m_nSize) {
|
| + m_nSize += 8;
|
| + m_pArray =
|
| + (TYPE**)m_pModule->JBig2_Realloc(m_pArray, sizeof(TYPE*) * m_nSize);
|
| }
|
| + m_pArray[m_nLength++] = pItem;
|
| + }
|
|
|
| + int32_t getLength() { return m_nLength; }
|
|
|
| - int32_t getLength()
|
| - {
|
| - return m_nLength;
|
| - }
|
| + TYPE* getAt(int32_t nIndex) { return m_pArray[nIndex]; }
|
|
|
| - TYPE *getAt(int32_t nIndex)
|
| - {
|
| - return m_pArray[nIndex];
|
| - }
|
| + TYPE* getLast() { return m_pArray[m_nLength - 1]; }
|
|
|
| - TYPE *getLast()
|
| - {
|
| - return m_pArray[m_nLength - 1];
|
| - }
|
| -private:
|
| - int32_t m_nSize;
|
| - TYPE **m_pArray;
|
| - int32_t m_nLength;
|
| + private:
|
| + int32_t m_nSize;
|
| + TYPE** m_pArray;
|
| + int32_t m_nLength;
|
| };
|
| #endif
|
|
|