Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(733)

Unified Diff: xfa/fgas/crt/fgas_algorithm.cpp

Issue 1830323006: Remove FX_DWORD from XFA. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « xfa/fee/fx_wordbreak/fx_wordbreak_impl.cpp ('k') | xfa/fgas/crt/fgas_encode.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/fgas/crt/fgas_algorithm.cpp
diff --git a/xfa/fgas/crt/fgas_algorithm.cpp b/xfa/fgas/crt/fgas_algorithm.cpp
index 8f13cb30459e47850ce33db4f02376684229ad55..ce8dda646aacb509252181ef8c930333cbd65798 100644
--- a/xfa/fgas/crt/fgas_algorithm.cpp
+++ b/xfa/fgas/crt/fgas_algorithm.cpp
@@ -21,20 +21,20 @@ static const FX_CHAR g_FXBase64EncoderMap[64] = {
};
struct FX_BASE64DATA {
- FX_DWORD data1 : 2;
- FX_DWORD data2 : 6;
- FX_DWORD data3 : 4;
- FX_DWORD data4 : 4;
- FX_DWORD data5 : 6;
- FX_DWORD data6 : 2;
- FX_DWORD data7 : 8;
+ uint32_t data1 : 2;
+ uint32_t data2 : 6;
+ uint32_t data3 : 4;
+ uint32_t data4 : 4;
+ uint32_t data5 : 6;
+ uint32_t data6 : 2;
+ uint32_t data7 : 8;
};
static void FX_Base64EncodePiece(const FX_BASE64DATA& src,
int32_t iBytes,
FX_CHAR dst[4]) {
dst[0] = g_FXBase64EncoderMap[src.data2];
- FX_DWORD b = src.data1 << 4;
+ uint32_t b = src.data1 << 4;
if (iBytes > 1) {
b |= src.data4;
}
@@ -76,7 +76,7 @@ int32_t FX_Base64EncodeA(const uint8_t* pSrc, int32_t iSrcLen, FX_CHAR* pDst) {
((uint8_t*)&srcData)[2] = *pSrc++;
iSrcLen -= 3;
} else {
- *((FX_DWORD*)&srcData) = 0;
+ *((uint32_t*)&srcData) = 0;
((uint8_t*)&srcData)[0] = *pSrc++;
if (iSrcLen > 1) {
((uint8_t*)&srcData)[1] = *pSrc++;
@@ -172,12 +172,12 @@ int32_t FX_Base64DecodeA(const FX_CHAR* pSrc, int32_t iSrcLen, uint8_t* pDst) {
uint8_t* pDstEnd = pDst;
while (iSrcLen > 0) {
if (iSrcLen > 3) {
- *((FX_DWORD*)srcData) = *((FX_DWORD*)pSrc);
+ *((uint32_t*)srcData) = *((uint32_t*)pSrc);
pSrc += 4;
iSrcLen -= 4;
} else {
- *((FX_DWORD*)&dstData) = 0;
- *((FX_DWORD*)srcData) = 0;
+ *((uint32_t*)&dstData) = 0;
+ *((uint32_t*)srcData) = 0;
srcData[0] = *pSrc++;
if (iSrcLen > 1) {
srcData[1] = *pSrc++;
@@ -234,8 +234,8 @@ int32_t FX_Base64DecodeW(const FX_WCHAR* pSrc, int32_t iSrcLen, uint8_t* pDst) {
srcData[3] = (FX_CHAR)*pSrc++;
iSrcLen -= 4;
} else {
- *((FX_DWORD*)&dstData) = 0;
- *((FX_DWORD*)srcData) = 0;
+ *((uint32_t*)&dstData) = 0;
+ *((uint32_t*)srcData) = 0;
srcData[0] = (FX_CHAR)*pSrc++;
if (iSrcLen > 1) {
srcData[1] = (FX_CHAR)*pSrc++;
« no previous file with comments | « xfa/fee/fx_wordbreak/fx_wordbreak_impl.cpp ('k') | xfa/fgas/crt/fgas_encode.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698