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

Side by Side Diff: fpdfsdk/include/fsdk_mgr.h

Issue 834413002: XFA: merge patch from CL 792953005, fix most VC++ warnings (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Pulled latest code. Created 5 years, 11 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 | « core/src/fpdftext/fpdf_text_int.cpp ('k') | fpdfsdk/src/fpdfformfill.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 #ifndef _FPDFSDK_MGR_H 7 #ifndef _FPDFSDK_MGR_H
8 #define _FPDFSDK_MGR_H 8 #define _FPDFSDK_MGR_H
9 9
10 #include "fsdk_common.h" 10 #include "fsdk_common.h"
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 void FFI_GetPageViewRect(FPDF_PAGE page, FS_RECTF& dstRect) 469 void FFI_GetPageViewRect(FPDF_PAGE page, FS_RECTF& dstRect)
470 { 470 {
471 if (m_pInfo && m_pInfo->FFI_GetPageViewRect) 471 if (m_pInfo && m_pInfo->FFI_GetPageViewRect)
472 { 472 {
473 double left; 473 double left;
474 double top; 474 double top;
475 double right; 475 double right;
476 double bottom; 476 double bottom;
477 m_pInfo->FFI_GetPageViewRect(m_pInfo, page, &left, &top, &right, &bottom); 477 m_pInfo->FFI_GetPageViewRect(m_pInfo, page, &left, &top, &right, &bottom);
478 478
479 » » » dstRect.left = left; 479 » » » dstRect.left = static_cast<float>(left);
480 » » » dstRect.top = top < bottom? bottom:top; 480 » » » dstRect.top = static_cast<float>(top < bottom ? bottom : top);
481 » » » dstRect.bottom = top < bottom? top:bottom; 481 » » » dstRect.bottom = static_cast<float>(top < bottom ? top : bottom);
482 » » » dstRect.right = right; 482 » » » dstRect.right = static_cast<float>(right);
483 } 483 }
484 } 484 }
485 485
486 486
487 FX_BOOL FFI_PopupMenu(FPDF_PAGE page, FPDF_WIDGET hWidget, int menuFlag , CFX_PointF ptPopup, const CFX_PointF* pRectExclude) 487 FX_BOOL FFI_PopupMenu(FPDF_PAGE page, FPDF_WIDGET hWidget, int menuFlag , CFX_PointF ptPopup, const CFX_PointF* pRectExclude)
488 { 488 {
489 if (m_pInfo && m_pInfo->FFI_PopupMenu) 489 if (m_pInfo && m_pInfo->FFI_PopupMenu)
490 { 490 {
491 return m_pInfo->FFI_PopupMenu(m_pInfo, page, hWidget, me nuFlag, ptPopup.x, ptPopup.y); 491 return m_pInfo->FFI_PopupMenu(m_pInfo, page, hWidget, me nuFlag, ptPopup.x, ptPopup.y);
492 } 492 }
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
954 } 954 }
955 955
956 if (nStartPos < m) QuickSort(nStartPos, m, bAscend, pCompare); 956 if (nStartPos < m) QuickSort(nStartPos, m, bAscend, pCompare);
957 if (nStopPos > m) QuickSort(m, nStopPos, bAscend, pCompare); 957 if (nStopPos > m) QuickSort(m, nStopPos, bAscend, pCompare);
958 } 958 }
959 }; 959 };
960 960
961 961
962 #endif //_FPDFSDK_MGR_H 962 #endif //_FPDFSDK_MGR_H
963 963
OLDNEW
« no previous file with comments | « core/src/fpdftext/fpdf_text_int.cpp ('k') | fpdfsdk/src/fpdfformfill.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698