summaryrefslogtreecommitdiff
path: root/third_party/agg23/agg_array.h
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-04-03 15:05:11 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-04-03 20:39:56 +0000
commit1c5d0b48ec7a6443ba72fec2a58a65fc6d694aca (patch)
tree315955cce6b29093dcddfc48c0811957a172bedf /third_party/agg23/agg_array.h
parent2ae80f52cec81c080515724f99deb06b2fee3cc9 (diff)
downloadpdfium-1c5d0b48ec7a6443ba72fec2a58a65fc6d694aca.tar.xz
Drop FXSYS_ from mem methods
This Cl drops the FXSYS_ from mem methods which are the same on all platforms. Bug: pdfium:694 Change-Id: I9d5ae905997dbaaec5aa0b2ae4c07358ed9c6236 Reviewed-on: https://pdfium-review.googlesource.com/3613 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'third_party/agg23/agg_array.h')
-rw-r--r--third_party/agg23/agg_array.h27
1 files changed, 10 insertions, 17 deletions
diff --git a/third_party/agg23/agg_array.h b/third_party/agg23/agg_array.h
index 204ae2e7a2..d521b04606 100644
--- a/third_party/agg23/agg_array.h
+++ b/third_party/agg23/agg_array.h
@@ -40,10 +40,7 @@ public:
}
void allocate(unsigned size, unsigned extra_tail = 0);
void resize(unsigned new_size);
- void zero()
- {
- FXSYS_memset(m_array, 0, sizeof(T) * m_size);
- }
+ void zero() { memset(m_array, 0, sizeof(T) * m_size); }
void add(const T& v)
{
m_array[m_size++] = v;
@@ -130,7 +127,7 @@ void pod_array<T>::resize(unsigned new_size)
if(new_size > m_size) {
if(new_size > m_capacity) {
T* data = FX_Alloc(T, new_size);
- FXSYS_memcpy(data, m_array, m_size * sizeof(T));
+ memcpy(data, m_array, m_size * sizeof(T));
FX_Free(m_array);
m_array = data;
}
@@ -145,14 +142,14 @@ template<class T> pod_array<T>::pod_array(const pod_array<T>& v) :
m_capacity(v.m_capacity),
m_array(v.m_capacity ? FX_Alloc(T, v.m_capacity) : 0)
{
- FXSYS_memcpy(m_array, v.m_array, sizeof(T) * v.m_size);
+ memcpy(m_array, v.m_array, sizeof(T) * v.m_size);
}
template<class T> const pod_array<T>&
pod_array<T>::operator = (const pod_array<T>&v)
{
allocate(v.m_size);
if(v.m_size) {
- FXSYS_memcpy(m_array, v.m_array, sizeof(T) * v.m_size);
+ memcpy(m_array, v.m_array, sizeof(T) * v.m_size);
}
return *this;
}
@@ -322,7 +319,7 @@ pod_deque<T, S>::pod_deque(const pod_deque<T, S>& v) :
unsigned i;
for(i = 0; i < v.m_num_blocks; ++i) {
m_blocks[i] = FX_Alloc(T, block_size);
- FXSYS_memcpy(m_blocks[i], v.m_blocks[i], block_size * sizeof(T));
+ memcpy(m_blocks[i], v.m_blocks[i], block_size * sizeof(T));
}
}
template<class T, unsigned S>
@@ -333,7 +330,7 @@ const pod_deque<T, S>& pod_deque<T, S>::operator = (const pod_deque<T, S>& v)
allocate_block(i);
}
for(i = 0; i < v.m_num_blocks; ++i) {
- FXSYS_memcpy(m_blocks[i], v.m_blocks[i], block_size * sizeof(T));
+ memcpy(m_blocks[i], v.m_blocks[i], block_size * sizeof(T));
}
m_size = v.m_size;
return *this;
@@ -344,10 +341,8 @@ void pod_deque<T, S>::allocate_block(unsigned nb)
if(nb >= m_max_blocks) {
T** new_blocks = FX_Alloc(T*, m_max_blocks + m_block_ptr_inc);
if(m_blocks) {
- FXSYS_memcpy(new_blocks,
- m_blocks,
- m_num_blocks * sizeof(T*));
- FX_Free(m_blocks);
+ memcpy(new_blocks, m_blocks, m_num_blocks * sizeof(T*));
+ FX_Free(m_blocks);
}
m_blocks = new_blocks;
m_max_blocks += m_block_ptr_inc;
@@ -476,10 +471,8 @@ private:
if(m_num_blocks >= m_max_blocks) {
int8u** new_blocks = FX_Alloc(int8u*, m_max_blocks + m_block_ptr_inc);
if(m_blocks) {
- FXSYS_memcpy(new_blocks,
- m_blocks,
- m_num_blocks * sizeof(int8u*));
- FX_Free(m_blocks);
+ memcpy(new_blocks, m_blocks, m_num_blocks * sizeof(int8u*));
+ FX_Free(m_blocks);
}
m_blocks = new_blocks;
m_max_blocks += m_block_ptr_inc;