core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.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_cmaps/fpdf_cmaps.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_cmaps/fpdf_cmaps.cpp

diff --git a/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp b/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp

index cbae49692001482614a319647ea9d82a1ace20e6..fba3a2b031b94824e0fa8256048452b081c6e34a 100644

--- a/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp

+++ b/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp

@@ -6,9 +6,9 @@

#include "cmap_int.h"

-#include "../fpdf_font/font_int.h"

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

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

+#include "core/src/fpdfapi/fpdf_font/font_int.h"

void FPDFAPI_FindEmbeddedCMap(const char* name,

int charset,