diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-10 11:09:44 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-10 11:09:44 -0700 |
| commit | fbf266fc0ea4be2523cbb901a641aa33f0035662 (patch) | |
| tree | d0e5eda4d3c220818903eca76bc2ca835a1851d0 /core/src/fpdfdoc/doc_metadata.cpp | |
| parent | 3c949d5d2b0d680839766ea99c86b263230b263d (diff) | |
| download | pdfium-fbf266fc0ea4be2523cbb901a641aa33f0035662.tar.xz | |
Remove typdefs for pointer types in fx_system.h.
This involves fixing some multiple variable per line
declarations, as the textually-substituted "*" applies
only to the first one.
This involves moving some consts around following the
substitution.
This involves replacing some typedefs used as constructors
with better code.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1171733003
Diffstat (limited to 'core/src/fpdfdoc/doc_metadata.cpp')
| -rw-r--r-- | core/src/fpdfdoc/doc_metadata.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/src/fpdfdoc/doc_metadata.cpp b/core/src/fpdfdoc/doc_metadata.cpp index e3226bd7dd..0239e0ad55 100644 --- a/core/src/fpdfdoc/doc_metadata.cpp +++ b/core/src/fpdfdoc/doc_metadata.cpp @@ -13,7 +13,7 @@ typedef struct _PDFDOC_METADATA { CFX_CMapByteStringToPtr *m_pStringMap; } PDFDOC_METADATA, * PDFDOC_LPMETADATA; typedef PDFDOC_METADATA const * PDFDOC_LPCMETADATA; -const FX_LPCSTR gs_FPDFDOC_Metadata_Titles[] = { +const FX_CHAR* const gs_FPDFDOC_Metadata_Titles[] = { "Title", "title", "Subject", "description", "Author", "creator", @@ -60,7 +60,7 @@ void CPDF_Metadata::LoadDoc(CPDF_Document *pDoc) CPDF_StreamAcc acc; acc.LoadAllData(pStream, FALSE); int size = acc.GetSize(); - FX_LPCBYTE pBuf = acc.GetData(); + const uint8_t* pBuf = acc.GetData(); CXML_Element *&pXmlElmnt = ((PDFDOC_LPMETADATA)m_pData)->m_pXmlElmnt; pXmlElmnt = CXML_Element::Parse(pBuf, size); if (!pXmlElmnt) { @@ -85,7 +85,7 @@ int32_t CPDF_Metadata::GetString(FX_BSTR bsItem, CFX_WideString &wsStr) if (!((PDFDOC_LPMETADATA)m_pData)->m_pStringMap->Lookup(bsItem, szTag)) { return -1; } - CFX_ByteString bsTag = (FX_LPCSTR)szTag; + CFX_ByteString bsTag = (const FX_CHAR*)szTag; wsStr = L""; CXML_Element *pElmntRdf = ((PDFDOC_LPMETADATA)m_pData)->m_pElmntRdf; if (!pElmntRdf) { |