|
 |
14101bb |
From c6b0194f7a4d9f494b2d51f46d2c332e2e5f4050 Mon Sep 17 00:00:00 2001
|
|
|
14101bb |
From: Daniel Bratell <bratell@opera.com>
|
|
|
14101bb |
Date: Mon, 28 May 2018 13:13:01 +0000
|
|
|
14101bb |
Subject: [PATCH] Use the same libjpeg in all of blink/platform
|
|
|
14101bb |
|
|
|
14101bb |
The normal libjpeg renames some symbols with macros so if its
|
|
|
14101bb |
headers are included together with libjpeg-turbo's headers
|
|
|
14101bb |
in the same translation unit, there will be an inconsistent
|
|
|
14101bb |
renaming of libjpeg symbols. This happened in some extreme
|
|
|
14101bb |
jumbo configuration and resulted in confising linker errors.
|
|
|
14101bb |
|
|
|
14101bb |
This patch changes an include so that jpeglib.h becomes included
|
|
|
14101bb |
the same way everywhere.
|
|
|
14101bb |
|
|
|
14101bb |
Change-Id: I7f122d0919d58371bb40dc0097a766b857b9815e
|
|
|
14101bb |
Reviewed-on: https://chromium-review.googlesource.com/1073423
|
|
|
14101bb |
Reviewed-by: Kentaro Hara <haraken@chromium.org>
|
|
|
14101bb |
Commit-Queue: Daniel Bratell <bratell@opera.com>
|
|
|
14101bb |
Cr-Commit-Position: refs/heads/master@{#562243}
|
|
|
14101bb |
---
|
|
|
14101bb |
.../renderer/platform/image-encoders/image_encoder.cc | 11 +++++++++++
|
|
|
14101bb |
.../renderer/platform/image-encoders/image_encoder.h | 2 --
|
|
|
14101bb |
2 files changed, 11 insertions(+), 2 deletions(-)
|
|
|
14101bb |
|
|
|
14101bb |
diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc
|
|
|
14101bb |
index 0c7f14c7c0e4..4c450f5d6783 100644
|
|
|
14101bb |
--- a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc
|
|
|
14101bb |
+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc
|
|
|
14101bb |
@@ -4,6 +4,17 @@
|
|
|
14101bb |
|
|
|
14101bb |
#include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
|
|
|
14101bb |
|
|
|
14101bb |
+#include "build/build_config.h"
|
|
|
14101bb |
+
|
|
|
14101bb |
+#if defined(OS_WIN)
|
|
|
14101bb |
+#include <basetsd.h> // Included before jpeglib.h because of INT32 clash
|
|
|
14101bb |
+#endif // OS_WIN
|
|
|
14101bb |
+#include <stdio.h> // Needed by jpeglib.h
|
|
|
14101bb |
+
|
|
|
14101bb |
+#include "jpeglib.h" // for JPEG_MAX_DIMENSION
|
|
|
14101bb |
+
|
|
|
14101bb |
+#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION
|
|
|
14101bb |
+
|
|
|
14101bb |
namespace blink {
|
|
|
14101bb |
|
|
|
14101bb |
bool ImageEncoder::Encode(Vector<unsigned char>* dst,
|
|
|
14101bb |
diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.h b/third_party/blink/renderer/platform/image-encoders/image_encoder.h
|
|
|
14101bb |
index 0d1460f34827..40306097d507 100644
|
|
|
14101bb |
--- a/third_party/blink/renderer/platform/image-encoders/image_encoder.h
|
|
|
14101bb |
+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.h
|
|
|
14101bb |
@@ -7,8 +7,6 @@
|
|
|
14101bb |
|
|
|
14101bb |
#include "third_party/blink/renderer/platform/platform_export.h"
|
|
|
14101bb |
#include "third_party/blink/renderer/platform/wtf/vector.h"
|
|
|
14101bb |
-#include "third_party/libjpeg/jpeglib.h" // for JPEG_MAX_DIMENSION
|
|
|
14101bb |
-#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION
|
|
|
14101bb |
#include "third_party/skia/include/core/SkStream.h"
|
|
|
14101bb |
#include "third_party/skia/include/encode/SkJpegEncoder.h"
|
|
|
14101bb |
#include "third_party/skia/include/encode/SkPngEncoder.h"
|
|
|
14101bb |
--
|
|
|
14101bb |
2.17.1
|
|
|
14101bb |
|