diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-11 12:17:45 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-11 12:17:45 -0700 |
| commit | 6581175666ba4e1eb2826142376cbfe4495c6e76 (patch) | |
| tree | 38770d7cf709979b0d493a6ca0367a0cbc080736 /core/src/reflow | |
| parent | 05f11bcf48a630b53cac603538bb75f21ad4231d (diff) | |
| download | pdfium-6581175666ba4e1eb2826142376cbfe4495c6e76.tar.xz | |
Merge to XFA: Kill FXSYS_mem{cpy,cmp,set.move}{32,8}.
Only manual merge was core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp
follwed by scripts.
Original Review URL: https://codereview.chromium.org/1179693003.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1179953002.
Diffstat (limited to 'core/src/reflow')
| -rw-r--r-- | core/src/reflow/layoutprocessor_reflow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/src/reflow/layoutprocessor_reflow.cpp b/core/src/reflow/layoutprocessor_reflow.cpp index 371f47e19c..81ba691c97 100644 --- a/core/src/reflow/layoutprocessor_reflow.cpp +++ b/core/src/reflow/layoutprocessor_reflow.cpp @@ -216,7 +216,7 @@ void CPDF_LayoutProcessor_Reflow::ProcessTable(FX_FLOAT dx) int rowCount = pTable->m_nCell.GetSize(); int n = 0; FX_FLOAT* dyRow = FX_Alloc(FX_FLOAT, rowCount + 1); - FXSYS_memset32(dyRow, 0, sizeof(FX_FLOAT) * (rowCount + 1)); + FXSYS_memset(dyRow, 0, sizeof(FX_FLOAT) * (rowCount + 1)); dyRow[0] = 0 ; dyRow[0] = - pTable->m_ReflowPageHeight; int tableColCount = 0; @@ -229,7 +229,7 @@ void CPDF_LayoutProcessor_Reflow::ProcessTable(FX_FLOAT dx) } int cellCount = tableColCount * rowCount; RF_TableCell** pVirtualTable = FX_Alloc(RF_TableCell*, cellCount); - FXSYS_memset32(pVirtualTable, 0, sizeof(RF_TableCell*) * cellCount); + FXSYS_memset(pVirtualTable, 0, sizeof(RF_TableCell*) * cellCount); for(i = 0; i < rowCount; i++) { int colCount = pTable->m_nCell.GetAt(i); FX_FLOAT rowWidth = 0; @@ -589,7 +589,7 @@ void CPDF_LayoutProcessor_Reflow::ProcessElement(IPDF_LayoutElement* pElement, F break; } RF_TableCell* pCell = FX_Alloc(RF_TableCell, 1); - FXSYS_memset32(pCell, 0 , sizeof(RF_TableCell)); + FXSYS_memset(pCell, 0 , sizeof(RF_TableCell)); CRF_Table* pTable = m_TableArray.GetAt(m_TableArray.GetSize() - 1); int pos = pTable->m_nCell.GetSize() - 1; pCell->m_BeginPos = m_pReflowedPage->m_pReflowed->GetSize(); |