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

Side by Side Diff: fpdfsdk/src/pdfwindow/PWL_Icon.cpp

Issue 1529553003: Merge to XFA: Get rid of most instance of 'foo != NULL' (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 5 years 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
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 "fpdfsdk/include/pdfwindow/PDFWindow.h" 7 #include "fpdfsdk/include/pdfwindow/PDFWindow.h"
8 #include "fpdfsdk/include/pdfwindow/PWL_Icon.h" 8 #include "fpdfsdk/include/pdfwindow/PWL_Icon.h"
9 #include "fpdfsdk/include/pdfwindow/PWL_Utils.h" 9 #include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
10 #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" 10 #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 return FALSE; 130 return FALSE;
131 } 131 }
132 132
133 void CPWL_Icon::GetIconPosition(FX_FLOAT& fLeft, FX_FLOAT& fBottom) { 133 void CPWL_Icon::GetIconPosition(FX_FLOAT& fLeft, FX_FLOAT& fBottom) {
134 if (m_pIconFit) { 134 if (m_pIconFit) {
135 // m_pIconFit->GetIconPosition(fLeft,fBottom); 135 // m_pIconFit->GetIconPosition(fLeft,fBottom);
136 fLeft = 0.0f; 136 fLeft = 0.0f;
137 fBottom = 0.0f; 137 fBottom = 0.0f;
138 CPDF_Array* pA = 138 CPDF_Array* pA =
139 m_pIconFit->m_pDict ? m_pIconFit->m_pDict->GetArray("A") : NULL; 139 m_pIconFit->m_pDict ? m_pIconFit->m_pDict->GetArray("A") : NULL;
140 if (pA != NULL) { 140 if (pA) {
141 FX_DWORD dwCount = pA->GetCount(); 141 FX_DWORD dwCount = pA->GetCount();
142 if (dwCount > 0) 142 if (dwCount > 0)
143 fLeft = pA->GetNumber(0); 143 fLeft = pA->GetNumber(0);
144 if (dwCount > 1) 144 if (dwCount > 1)
145 fBottom = pA->GetNumber(1); 145 fBottom = pA->GetNumber(1);
146 } 146 }
147 } else { 147 } else {
148 fLeft = 0.0f; 148 fLeft = 0.0f;
149 fBottom = 0.0f; 149 fBottom = 0.0f;
150 } 150 }
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 FX_FLOAT fImageFactHeight = fImageHeight * fVScale; 221 FX_FLOAT fImageFactHeight = fImageHeight * fVScale;
222 222
223 FX_FLOAT fPlateWidth, fPlateHeight; 223 FX_FLOAT fPlateWidth, fPlateHeight;
224 CPDF_Rect rcPlate = GetClientRect(); 224 CPDF_Rect rcPlate = GetClientRect();
225 fPlateWidth = rcPlate.right - rcPlate.left; 225 fPlateWidth = rcPlate.right - rcPlate.left;
226 fPlateHeight = rcPlate.top - rcPlate.bottom; 226 fPlateHeight = rcPlate.top - rcPlate.bottom;
227 227
228 x = (fPlateWidth - fImageFactWidth) * fLeft; 228 x = (fPlateWidth - fImageFactWidth) * fLeft;
229 y = (fPlateHeight - fImageFactHeight) * fBottom; 229 y = (fPlateHeight - fImageFactHeight) * fBottom;
230 } 230 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698