diff options
| author | Lei Zhang <thestig@chromium.org> | 2016-01-05 16:46:58 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2016-01-05 16:46:58 -0800 |
| commit | c2fb35f2bbcf6c8fcf37380000544ae39d9a8cec (patch) | |
| tree | 6b8da05d1624cbbe5a0c7042c9820f02180f442c /fpdfsdk/src/pdfwindow/PWL_Icon.cpp | |
| parent | 62664cee15230d6cbe08ed010721a4557b36dc22 (diff) | |
| download | pdfium-c2fb35f2bbcf6c8fcf37380000544ae39d9a8cec.tar.xz | |
Merge to XFA: Remove header files that only have includes.
Also do some cleanups in affected files.
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1552583002 .
(cherry picked from commit d794d34b5deb6ad691c19af758090f9ce46015a3)
Review URL: https://codereview.chromium.org/1566583002 .
Diffstat (limited to 'fpdfsdk/src/pdfwindow/PWL_Icon.cpp')
| -rw-r--r-- | fpdfsdk/src/pdfwindow/PWL_Icon.cpp | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/fpdfsdk/src/pdfwindow/PWL_Icon.cpp b/fpdfsdk/src/pdfwindow/PWL_Icon.cpp index db5355c59e..6afd76c5c6 100644 --- a/fpdfsdk/src/pdfwindow/PWL_Icon.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_Icon.cpp @@ -4,14 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/pdfwindow/PDFWindow.h" #include "fpdfsdk/include/pdfwindow/PWL_Icon.h" #include "fpdfsdk/include/pdfwindow/PWL_Utils.h" #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" -/* ------------------------------- CPWL_Image ---------------------------------- - */ - CPWL_Image::CPWL_Image() : m_pPDFStream(NULL) {} CPWL_Image::~CPWL_Image() {} @@ -83,15 +79,15 @@ CFX_Matrix CPWL_Image::GetImageMatrix() { } CFX_ByteString CPWL_Image::GetImageAlias() { - if (m_sImageAlias.IsEmpty()) { - if (m_pPDFStream) { - if (CPDF_Dictionary* pDict = m_pPDFStream->GetDict()) { - return pDict->GetString("Name"); - } - } - } else + if (!m_sImageAlias.IsEmpty()) return m_sImageAlias; + if (m_pPDFStream) { + if (CPDF_Dictionary* pDict = m_pPDFStream->GetDict()) { + return pDict->GetString("Name"); + } + } + return CFX_ByteString(); } @@ -109,9 +105,6 @@ void CPWL_Image::GetImageOffset(FX_FLOAT& x, FX_FLOAT& y) { y = 0.0f; } -/* ------------------------------- CPWL_Icon ---------------------------------- - */ - CPWL_Icon::CPWL_Icon() : m_pIconFit(NULL) {} CPWL_Icon::~CPWL_Icon() {} @@ -132,7 +125,6 @@ FX_BOOL CPWL_Icon::IsProportionalScale() { void CPWL_Icon::GetIconPosition(FX_FLOAT& fLeft, FX_FLOAT& fBottom) { if (m_pIconFit) { - // m_pIconFit->GetIconPosition(fLeft,fBottom); fLeft = 0.0f; fBottom = 0.0f; CPDF_Array* pA = |