fpdfsdk/src/fpdf_progressive.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/fpdf_progressive.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/fpdf_flatten.cpp ('k') | fpdfsdk/src/fpdf_sysfontinfo.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 "public/fpdf_progressive.h"	7 #include "public/fpdf_progressive.h"

8	8

9 #include "../include/fsdk_define.h"	9 #include "fpdfsdk/include/fsdk_define.h"

10 #include "../include/fsdk_rendercontext.h"	10 #include "fpdfsdk/include/fsdk_rendercontext.h"

11 #include "public/fpdfview.h"	11 #include "public/fpdfview.h"

12	12

13 // These checks are here because core/ and public/ cannot depend on each other.	13 // These checks are here because core/ and public/ cannot depend on each other.

14 static_assert(CPDF_ProgressiveRenderer::Ready == FPDF_RENDER_READER,	14 static_assert(CPDF_ProgressiveRenderer::Ready == FPDF_RENDER_READER,

15 "CPDF_ProgressiveRenderer::Ready value mismatch");	15 "CPDF_ProgressiveRenderer::Ready value mismatch");

16 static_assert(CPDF_ProgressiveRenderer::ToBeContinued ==	16 static_assert(CPDF_ProgressiveRenderer::ToBeContinued ==

17 FPDF_RENDER_TOBECOUNTINUED,	17 FPDF_RENDER_TOBECOUNTINUED,

18 "CPDF_ProgressiveRenderer::ToBeContinued value mismatch");	18 "CPDF_ProgressiveRenderer::ToBeContinued value mismatch");

19 static_assert(CPDF_ProgressiveRenderer::Done == FPDF_RENDER_DONE,	19 static_assert(CPDF_ProgressiveRenderer::Done == FPDF_RENDER_DONE,

20 "CPDF_ProgressiveRenderer::Done value mismatch");	20 "CPDF_ProgressiveRenderer::Done value mismatch");

(...skipping 70 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
91 return;	91 return;

92	92

93 CRenderContext* pContext = (CRenderContext)pPage->GetPrivateData((void)1);	93 CRenderContext* pContext = (CRenderContext)pPage->GetPrivateData((void)1);

94 if (!pContext)	94 if (!pContext)

95 return;	95 return;

96	96

97 pContext->m_pDevice->RestoreState();	97 pContext->m_pDevice->RestoreState();

98 delete pContext;	98 delete pContext;

99 pPage->RemovePrivateData((void*)1);	99 pPage->RemovePrivateData((void*)1);

100 }	100 }

OLD	NEW