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

Side by Side Diff: xfa/fde/css/fde_csssyntax.cpp

Issue 1821043003: Remove FX_WORD in favor of uint16_t. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Use stdint.h directly, bitfield minefield. 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 unified diff | Download patch
« no previous file with comments | « xfa/fde/css/fde_cssstylesheet.cpp ('k') | xfa/fde/xml/fde_xml_imp.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "xfa/fde/css/fde_csssyntax.h" 7 #include "xfa/fde/css/fde_csssyntax.h"
8 8
9 #include "xfa/fde/css/fde_cssdatatable.h" 9 #include "xfa/fde/css/fde_cssdatatable.h"
10 #include "xfa/fgas/crt/fgas_codepage.h" 10 #include "xfa/fgas/crt/fgas_codepage.h"
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 } 330 }
331 break; 331 break;
332 case FDE_CSSSYNTAXMODE_Charset: 332 case FDE_CSSSYNTAXMODE_Charset:
333 if (wch == ';') { 333 if (wch == ';') {
334 m_TextPlane.MoveNext(); 334 m_TextPlane.MoveNext();
335 SwitchMode(FDE_CSSSYNTAXMODE_RuleSet); 335 SwitchMode(FDE_CSSSYNTAXMODE_RuleSet);
336 if (IsCharsetEnabled()) { 336 if (IsCharsetEnabled()) {
337 DisableCharset(); 337 DisableCharset();
338 if (m_iTextDatLen > 0) { 338 if (m_iTextDatLen > 0) {
339 if (m_pStream != NULL) { 339 if (m_pStream != NULL) {
340 FX_WORD wCodePage = FX_GetCodePageFormStringW( 340 uint16_t wCodePage = FX_GetCodePageFormStringW(
341 m_TextData.GetBuffer(), m_iTextDatLen); 341 m_TextData.GetBuffer(), m_iTextDatLen);
342 if (wCodePage < 0xFFFF && 342 if (wCodePage < 0xFFFF &&
343 m_pStream->GetCodePage() != wCodePage) { 343 m_pStream->GetCodePage() != wCodePage) {
344 m_pStream->SetCodePage(wCodePage); 344 m_pStream->SetCodePage(wCodePage);
345 } 345 }
346 } 346 }
347 return FDE_CSSSYNTAXSTATUS_Charset; 347 return FDE_CSSSYNTAXSTATUS_Charset;
348 } 348 }
349 } 349 }
350 } else { 350 } else {
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 if (iLength > m_iDatLen - iStart) { 478 if (iLength > m_iDatLen - iStart) {
479 iLength = m_iDatLen - iStart; 479 iLength = m_iDatLen - iStart;
480 } 480 }
481 if (iLength < 0) { 481 if (iLength < 0) {
482 iLength = 0; 482 iLength = 0;
483 } else { 483 } else {
484 FXSYS_memmove(m_pBuffer, m_pBuffer + iStart, iLength * sizeof(FX_WCHAR)); 484 FXSYS_memmove(m_pBuffer, m_pBuffer + iStart, iLength * sizeof(FX_WCHAR));
485 } 485 }
486 m_iDatLen = iLength; 486 m_iDatLen = iLength;
487 } 487 }
OLDNEW
« no previous file with comments | « xfa/fde/css/fde_cssstylesheet.cpp ('k') | xfa/fde/xml/fde_xml_imp.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698