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

Unified Diff: pdfium.gyp

Issue 1441973002: Merge to M47: Fix extraction of colour components in CPDF_DIBSource::DownSampleScanline32Bit (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@2526
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: pdfium.gyp
diff --git a/pdfium.gyp b/pdfium.gyp
index 9e7dd96a37c1a8c84b6592aefbb16157d7fda06c..558e8f7e8cca5f2c2a0761d968333930a9fea774 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -758,6 +758,7 @@
'core/src/fpdfapi/fpdf_page/fpdf_page_func_embeddertest.cpp',
'core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp',
'core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_embeddertest.cpp',
Oliver Chang 2015/11/13 17:24:03 ++<<<<<<< HEAD ++======= + 'core/src/fpdfa
+ 'core/src/fpdfapi/fpdf_render/fpdf_render_loadimage_embeddertest.cpp',
'fpdfsdk/src/fpdf_dataavail_embeddertest.cpp',
'fpdfsdk/src/fpdfdoc_embeddertest.cpp',
'fpdfsdk/src/fpdfformfill_embeddertest.cpp',

Powered by Google App Engine
This is Rietveld 408576698