Remove CPDF_Creator::m_ObjectSize, it's never read from.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1543413002 .
diff --git a/core/include/fpdfapi/fpdf_serial.h b/core/include/fpdfapi/fpdf_serial.h
index 4a32534..b0989f7 100644
--- a/core/include/fpdfapi/fpdf_serial.h
+++ b/core/include/fpdfapi/fpdf_serial.h
@@ -91,15 +91,11 @@
FX_DWORD m_dwFlags;
FX_POSITION m_Pos;
FX_FILESIZE m_XrefStart;
-
CFX_FileSizeListArray m_ObjectOffset;
-
- CFX_DWordListArray m_ObjectSize;
CFX_DWordArray m_NewObjNumArray;
-
CPDF_Array* m_pIDArray;
-
int32_t m_FileVersion;
+
friend class CPDF_ObjectStream;
friend class CPDF_XRefStream;
};
diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h
index bb34e2b..fd35de9 100644
--- a/core/include/fxcrt/fx_basic.h
+++ b/core/include/fxcrt/fx_basic.h
@@ -1082,8 +1082,7 @@
};
typedef CFX_ListArrayTemplate<CFX_SortListArray<sizeof(FX_FILESIZE)>,
FX_FILESIZE> CFX_FileSizeListArray;
-typedef CFX_ListArrayTemplate<CFX_SortListArray<sizeof(FX_DWORD)>, FX_DWORD>
- CFX_DWordListArray;
+
typedef enum {
Ready,
ToBeContinued,
diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
index 8c3defd..3fb5818 100644
--- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
+++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
@@ -654,7 +654,6 @@
}
if (iSize > 0 && bEOF) {
pCreator->m_ObjectOffset.Add(dwObjStmNum, 1);
- pCreator->m_ObjectSize.Add(dwObjStmNum, 1);
pCreator->m_ObjectOffset[dwObjStmNum] = objOffset;
}
m_iSeg = iSeg;
@@ -1265,7 +1264,6 @@
CPDF_Object* pObj = m_pDocument->GetIndirectObject(objnum);
if (!pObj) {
m_ObjectOffset[objnum] = 0;
- m_ObjectSize[objnum] = 0;
return 0;
}
if (WriteIndirectObj(pObj)) {
@@ -1332,7 +1330,6 @@
if (!iRet)
continue;
- m_ObjectSize[objnum] = (FX_DWORD)(m_Offset - m_ObjectOffset[objnum]);
if (pPause && pPause->NeedToPauseNow()) {
m_Pos = (void*)(uintptr_t)(objnum + 1);
return 1;
@@ -1355,7 +1352,6 @@
if (WriteIndirectObj(pObj)) {
return -1;
}
- m_ObjectSize[objnum] = (FX_DWORD)(m_Offset - m_ObjectOffset[objnum]);
index++;
if (pPause && pPause->NeedToPauseNow()) {
m_Pos = (FX_POSITION)(uintptr_t)index;
@@ -1385,7 +1381,6 @@
j++;
}
m_ObjectOffset.Add(dwStart, j - dwStart);
- m_ObjectSize.Add(dwStart, j - dwStart);
dwStart = j;
}
}
@@ -1437,10 +1432,8 @@
bool bExist = m_pParser && m_pParser->IsValidObjectNumber(dwCurObjNum) &&
m_ObjectOffset.GetPtrAt(dwCurObjNum);
if (bExist || dwCurObjNum - dwLastObjNum > 1) {
- if (!bNewStart) {
+ if (!bNewStart)
m_ObjectOffset.Add(dwStartObjNum, dwLastObjNum - dwStartObjNum + 1);
- m_ObjectSize.Add(dwStartObjNum, dwLastObjNum - dwStartObjNum + 1);
- }
dwStartObjNum = dwCurObjNum;
}
if (bNewStart) {
@@ -1450,7 +1443,6 @@
dwLastObjNum = dwCurObjNum;
}
m_ObjectOffset.Add(dwStartObjNum, dwLastObjNum - dwStartObjNum + 1);
- m_ObjectSize.Add(dwStartObjNum, dwLastObjNum - dwStartObjNum + 1);
}
void CPDF_Creator::AppendNewObjNum(FX_DWORD objbum) {
int32_t iStart = 0, iFind = 0;
@@ -1609,8 +1601,6 @@
}
m_ObjectOffset.Add(m_dwLastObjNum, 1);
m_ObjectOffset[m_dwLastObjNum] = saveOffset;
- m_ObjectSize.Add(m_dwLastObjNum, 1);
- m_ObjectSize[m_dwLastObjNum] = m_Offset - saveOffset;
m_dwEnryptObjNum = m_dwLastObjNum;
if (m_dwFlags & FPDFCREATE_INCREMENTAL) {
m_NewObjNumArray.Add(m_dwLastObjNum);
@@ -1998,7 +1988,6 @@
m_Offset = 0;
m_dwLastObjNum = m_pDocument->GetLastObjNum();
m_ObjectOffset.Clear();
- m_ObjectSize.Clear();
m_NewObjNumArray.RemoveAll();
InitID();
if (flags & FPDFCREATE_PROGRESSIVE) {
