fpdfsdk/src/pdfwindow/PWL_Icon.cpp - Issue 1439223003: Merge to XFA: Remove relative includes.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1439223003: Merge to XFA: Remove relative includes. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: fix merge Created 5 years, 1 month 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 | « fpdfsdk/src/pdfwindow/PWL_FontMap.cpp ('k') | fpdfsdk/src/pdfwindow/PWL_IconList.cpp » ('j') | no next file with comments »

OLD	NEW
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 "../../include/pdfwindow/PDFWindow.h"	7 #include "fpdfsdk/include/pdfwindow/PDFWindow.h"

8 #include "../../include/pdfwindow/PWL_Wnd.h"	8 #include "fpdfsdk/include/pdfwindow/PWL_Icon.h"

9 #include "../../include/pdfwindow/PWL_Icon.h"	9 #include "fpdfsdk/include/pdfwindow/PWL_Utils.h"

10 #include "../../include/pdfwindow/PWL_Utils.h"	10 #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"

11	11

12 /* ------------------------------- CPWL_Image ----------------------------------	12 /* ------------------------------- CPWL_Image ----------------------------------

13 */	13 */

14	14

15 CPWL_Image::CPWL_Image() : m_pPDFStream(NULL) {}	15 CPWL_Image::CPWL_Image() : m_pPDFStream(NULL) {}

16	16

17 CPWL_Image::~CPWL_Image() {}	17 CPWL_Image::~CPWL_Image() {}

18	18

19 CFX_ByteString CPWL_Image::GetImageAppStream() {	19 CFX_ByteString CPWL_Image::GetImageAppStream() {

20 CFX_ByteTextBuf sAppStream;	20 CFX_ByteTextBuf sAppStream;

(...skipping 200 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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 }

OLD	NEW