core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp - Issue 1439223003: Merge to XFA: Remove relative includes.

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

Unified Diff: core/src/fpdfapi/fpdf_edit/fpdf_edit_image.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:

Index: core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp

diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp

index 3ffe482026985b72d5ad5b5982d852e4d1fcf442..33af620dab876a0f3c100744721a797969729536 100644

--- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp

+++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp

@@ -4,12 +4,12 @@

-#include "../fpdf_page/pageint.h"

-#include "../fpdf_render/render_int.h"

#include "core/include/fpdfapi/fpdf_module.h"

#include "core/include/fpdfapi/fpdf_page.h"

#include "core/include/fpdfapi/fpdf_render.h"

#include "core/include/fxcodec/fx_codec.h"

+#include "core/src/fpdfapi/fpdf_page/pageint.h"

+#include "core/src/fpdfapi/fpdf_render/render_int.h"

CPDF_Dictionary* CPDF_Image::InitJPEG(uint8_t* pData, FX_DWORD size) {

int32_t width;