summaryrefslogtreecommitdiff
path: root/core/src/fxcrt/extension.h
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-12-09 16:39:40 -0800
committerTom Sepez <tsepez@chromium.org>2015-12-09 16:39:40 -0800
commitbd573f126f93acc2034be2df1c6f571670f76c35 (patch)
treebeeea3b9370bb7490ed5933dadbef857cb8df23d /core/src/fxcrt/extension.h
parente021e084717b8cc43f8a0667ad9d1a807dfe381c (diff)
downloadpdfium-bd573f126f93acc2034be2df1c6f571670f76c35.tar.xz
Merge to XFA: Get rid of most uses of CFX_PtrArray.
Original Review URL: https://codereview.chromium.org/1518593002 . (cherry picked from commit 035359cd8ddb555fa33b6133db4fd405e4660712) R=thestig@chromium.org TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1513103002 .
Diffstat (limited to 'core/src/fxcrt/extension.h')
-rw-r--r--core/src/fxcrt/extension.h18
1 files changed, 8 insertions, 10 deletions
diff --git a/core/src/fxcrt/extension.h b/core/src/fxcrt/extension.h
index 0c9f4573df..638ffef58e 100644
--- a/core/src/fxcrt/extension.h
+++ b/core/src/fxcrt/extension.h
@@ -133,7 +133,7 @@ class CFX_MemoryStream final : public IFX_MemoryStream {
~CFX_MemoryStream() override {
if (m_dwFlags & FX_MEMSTREAM_TakeOver) {
for (int32_t i = 0; i < m_Blocks.GetSize(); i++) {
- FX_Free((uint8_t*)m_Blocks[i]);
+ FX_Free(m_Blocks[i]);
}
}
m_Blocks.RemoveAll();
@@ -168,7 +168,7 @@ class CFX_MemoryStream final : public IFX_MemoryStream {
m_nCurPos = newPos.ValueOrDie();
if (m_dwFlags & FX_MEMSTREAM_Consecutive) {
- FXSYS_memcpy(buffer, (uint8_t*)m_Blocks[0] + (size_t)offset, size);
+ FXSYS_memcpy(buffer, m_Blocks[0] + (size_t)offset, size);
return TRUE;
}
size_t nStartBlock = (size_t)offset / m_nGrowSize;
@@ -178,8 +178,7 @@ class CFX_MemoryStream final : public IFX_MemoryStream {
if (nRead > size) {
nRead = size;
}
- FXSYS_memcpy(
- buffer, (uint8_t*)m_Blocks[(int)nStartBlock] + (size_t)offset, nRead);
+ FXSYS_memcpy(buffer, m_Blocks[(int)nStartBlock] + (size_t)offset, nRead);
buffer = ((uint8_t*)buffer) + nRead;
size -= nRead;
nStartBlock++;
@@ -214,7 +213,7 @@ class CFX_MemoryStream final : public IFX_MemoryStream {
m_nTotalSize =
(m_nCurPos + m_nGrowSize - 1) / m_nGrowSize * m_nGrowSize;
if (m_Blocks.GetSize() < 1) {
- void* block = FX_Alloc(uint8_t, m_nTotalSize);
+ uint8_t* block = FX_Alloc(uint8_t, m_nTotalSize);
m_Blocks.Add(block);
} else {
m_Blocks[0] = FX_Realloc(uint8_t, m_Blocks[0], m_nTotalSize);
@@ -224,7 +223,7 @@ class CFX_MemoryStream final : public IFX_MemoryStream {
return FALSE;
}
}
- FXSYS_memcpy((uint8_t*)m_Blocks[0] + (size_t)offset, buffer, size);
+ FXSYS_memcpy(m_Blocks[0] + (size_t)offset, buffer, size);
if (m_nCurSize < m_nCurPos) {
m_nCurSize = m_nCurPos;
}
@@ -248,8 +247,7 @@ class CFX_MemoryStream final : public IFX_MemoryStream {
if (nWrite > size) {
nWrite = size;
}
- FXSYS_memcpy((uint8_t*)m_Blocks[(int)nStartBlock] + (size_t)offset,
- buffer, nWrite);
+ FXSYS_memcpy(m_Blocks[(int)nStartBlock] + (size_t)offset, buffer, nWrite);
buffer = ((uint8_t*)buffer) + nWrite;
size -= nWrite;
nStartBlock++;
@@ -273,7 +271,7 @@ class CFX_MemoryStream final : public IFX_MemoryStream {
}
}
uint8_t* GetBuffer() const override {
- return m_Blocks.GetSize() ? (uint8_t*)m_Blocks[0] : NULL;
+ return m_Blocks.GetSize() ? m_Blocks[0] : nullptr;
}
void AttachBuffer(uint8_t* pBuffer,
size_t nSize,
@@ -298,7 +296,7 @@ class CFX_MemoryStream final : public IFX_MemoryStream {
}
protected:
- CFX_PtrArray m_Blocks;
+ CFX_ArrayTemplate<uint8_t*> m_Blocks;
FX_DWORD m_dwCount;
size_t m_nTotalSize;
size_t m_nCurSize;