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 /xfa/src/fxbarcode/oned | |
| 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 'xfa/src/fxbarcode/oned')
| -rw-r--r-- | xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp | 2 | ||||
| -rw-r--r-- | xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp | 2 | ||||
| -rw-r--r-- | xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp | 2 | ||||
| -rw-r--r-- | xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp index e2a0da6c95..382b82a12b 100644 --- a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp +++ b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp @@ -230,7 +230,7 @@ void CBC_OneDimWriter::ShowChars(const CFX_WideStringC& contents, CFX_DIBitmap * if (!pCharPos) {
return;
}
- FXSYS_memset32(pCharPos, 0, sizeof(FXTEXT_CHARPOS) * iLen);
+ FXSYS_memset(pCharPos, 0, sizeof(FXTEXT_CHARPOS) * iLen);
FX_FLOAT charsLen = 0;
FX_FLOAT geWidth = 0;
if ( m_locTextLoc == BC_TEXT_LOC_ABOVEEMBED ||
diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp index 0ecb3d06a7..7753d1eabb 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp @@ -162,7 +162,7 @@ void CBC_OnedEAN13Writer::ShowChars(const CFX_WideStringC& contents, CFX_DIBitma if (!pCharPos) {
return;
}
- FXSYS_memset32(pCharPos, 0, sizeof(FXTEXT_CHARPOS) * iLen);
+ FXSYS_memset(pCharPos, 0, sizeof(FXTEXT_CHARPOS) * iLen);
CFX_FxgeDevice geBitmap;
if (pOutBitmap != NULL) {
geBitmap.Attach(pOutBitmap);
diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp index 4c9e13d131..a247a0670b 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp @@ -169,7 +169,7 @@ void CBC_OnedEAN8Writer::ShowChars(const CFX_WideStringC& contents, CFX_DIBitmap if (!pCharPos) {
return;
}
- FXSYS_memset32(pCharPos, 0, sizeof(FXTEXT_CHARPOS) * iLength);
+ FXSYS_memset(pCharPos, 0, sizeof(FXTEXT_CHARPOS) * iLength);
CFX_ByteString tempStr = str.Mid(0, 4);
int32_t iLen = tempStr.GetLength();
int32_t strWidth = 7 * multiple * 4;
diff --git a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp index 547d87872f..366dc9c67f 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp @@ -119,7 +119,7 @@ void CBC_OnedUPCAWriter::ShowChars(const CFX_WideStringC& contents, CFX_DIBitmap if (!pCharPos) {
return;
}
- FXSYS_memset32(pCharPos, 0, sizeof(FXTEXT_CHARPOS) * iLen);
+ FXSYS_memset(pCharPos, 0, sizeof(FXTEXT_CHARPOS) * iLen);
CFX_ByteString tempStr = str.Mid(1, 5);
FX_FLOAT strWidth = (FX_FLOAT)35 * multiple;
FX_FLOAT blank = 0.0;
|