Fix else-after-returns throughout pdfium.

[pdfium.git] / fpdfsdk / src / pdfwindow / PWL_Icon.cpp

diff --git a/fpdfsdk/src/pdfwindow/PWL_Icon.cpp b/fpdfsdk/src/pdfwindow/PWL_Icon.cpp
index b85b845..71174df 100644 (file)
--- a/fpdfsdk/src/pdfwindow/PWL_Icon.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Icon.cpp
@@ -1,7 +1,7 @@
 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
- 
+
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../include/pdfwindow/PDFWindow.h"
@@ -23,7 +23,7 @@ CFX_ByteString CPWL_Image::GetImageAppStream()
 {
        CFX_ByteTextBuf sAppStream;
 
-       CFX_ByteString sAlias = this->GetImageAlias();
+       CFX_ByteString sAlias = GetImageAlias();
        CPDF_Rect rcPlate = GetClientRect();
        CPDF_Matrix mt;
        mt.SetReverse(GetImageMatrix());
@@ -58,7 +58,7 @@ void CPWL_Image::SetPDFStream(CPDF_Stream * pStream)
 
 CPDF_Stream * CPWL_Image::GetPDFStream()
 {
-       return this->m_pPDFStream;
+       return m_pPDFStream;
 }
 
 void CPWL_Image::GetImageSize(FX_FLOAT & fWidth,FX_FLOAT & fHeight)
@@ -97,7 +97,7 @@ CFX_ByteString CPWL_Image::GetImageAlias()
        {
                if (m_pPDFStream)
                {
-                       if (CPDF_Dictionary * pDict = m_pPDFStream->GetDict())          
+                       if (CPDF_Dictionary * pDict = m_pPDFStream->GetDict())
                        {
                                return pDict->GetString("Name");
                        }
@@ -109,7 +109,7 @@ CFX_ByteString CPWL_Image::GetImageAlias()
        return CFX_ByteString();
 }
 
-void CPWL_Image::SetImageAlias(FX_LPCSTR sImageAlias)
+void CPWL_Image::SetImageAlias(const FX_CHAR* sImageAlias)
 {
        m_sImageAlias = sImageAlias;
 }
@@ -137,7 +137,7 @@ CPWL_Icon::~CPWL_Icon()
 {
 }
 
-FX_INT32 CPWL_Icon::GetScaleMethod()
+int32_t CPWL_Icon::GetScaleMethod()
 {
        if (m_pIconFit)
                return m_pIconFit->GetScaleMethod();
@@ -160,7 +160,7 @@ void CPWL_Icon::GetIconPosition(FX_FLOAT & fLeft, FX_FLOAT & fBottom)
                //m_pIconFit->GetIconPosition(fLeft,fBottom);
                fLeft = 0.0f;
                fBottom = 0.0f;
-               CPDF_Array* pA = m_pIconFit->m_pDict->GetArray("A");
+               CPDF_Array* pA = m_pIconFit->m_pDict ? m_pIconFit->m_pDict->GetArray("A") : NULL;
                if (pA != NULL)
                {
                        FX_DWORD dwCount = pA->GetCount();
@@ -187,29 +187,19 @@ void CPWL_Icon::GetScale(FX_FLOAT & fHScale,FX_FLOAT & fVScale)
 {
        fHScale = 1.0f;
        fVScale = 1.0f;
-       
+
        if (m_pPDFStream)
        {
                FX_FLOAT fImageWidth,fImageHeight;
                FX_FLOAT fPlateWidth,fPlateHeight;
 
-               CPDF_Rect rcPlate = this->GetClientRect();      
+               CPDF_Rect rcPlate = GetClientRect();
                fPlateWidth = rcPlate.right - rcPlate.left;
                fPlateHeight = rcPlate.top - rcPlate.bottom;
 
                GetImageSize(fImageWidth,fImageHeight);
 
-               FX_INT32 nScaleMethod = this->GetScaleMethod();
-
-               /*
-               enum ScaleMethod
-               {
-                       Always = 0,     //A, Always scale
-                       Bigger,         //B, Scale only when the icon is bigger than the annotation rectangle
-                       Smaller,        //S, Scale only when the icon is smaller then the annotation rectangle
-                       Never           //N, Never scale
-               };
-               */
+               int32_t nScaleMethod = GetScaleMethod();
 
                switch (nScaleMethod)
                {
@@ -248,7 +238,7 @@ void CPWL_Icon::GetImageOffset(FX_FLOAT & x,FX_FLOAT & y)
 {
        FX_FLOAT fLeft,fBottom;
 
-       this->GetIconPosition(fLeft,fBottom);
+       GetIconPosition(fLeft, fBottom);
        x = 0.0f;
        y = 0.0f;
 
@@ -262,7 +252,7 @@ void CPWL_Icon::GetImageOffset(FX_FLOAT & x,FX_FLOAT & y)
        FX_FLOAT fImageFactHeight = fImageHeight * fVScale;
 
        FX_FLOAT fPlateWidth,fPlateHeight;
-       CPDF_Rect rcPlate = this->GetClientRect();      
+       CPDF_Rect rcPlate = GetClientRect();
        fPlateWidth = rcPlate.right - rcPlate.left;
        fPlateHeight = rcPlate.top - rcPlate.bottom;