Index: ui/gfx/codec/jpeg_codec.cc |
diff --git a/ui/gfx/codec/jpeg_codec.cc b/ui/gfx/codec/jpeg_codec.cc |
index 8a08fe0291afcc8a61c6b4f560396a4a50057da8..1f74dd8ff77fd9ee1baab2107fe7a589f3b103f3 100644 |
--- a/ui/gfx/codec/jpeg_codec.cc |
+++ b/ui/gfx/codec/jpeg_codec.cc |
@@ -14,7 +14,7 @@ |
extern "C" { |
#if defined(USE_SYSTEM_LIBJPEG) |
#include <jpeglib.h> |
-#elif defined(USE_LIBJPEG_TURBO) |
+#elif defined(USE_LIBJPEG_TURBO) && !defined(OS_CHROMEOS) |
sky
2014/09/18 22:19:37
Why is SE_LIBJPEG_TURBO set for chromeos if we're
Ed Baker
2014/09/18 23:07:35
Chrome OS uses both IJG libjpeg and libjpeg_turbo.
|
#include "third_party/libjpeg_turbo/jpeglib.h" |
#else |
#include "third_party/libjpeg/jpeglib.h" |
@@ -46,7 +46,7 @@ void ErrorExit(jpeg_common_struct* cinfo) { |
JPEGCodec::LibraryVariant JPEGCodec::JpegLibraryVariant() { |
#if defined(USE_SYSTEM_LIBJPEG) |
return SYSTEM_LIBJPEG; |
-#elif defined(USE_LIBJPEG_TURBO) |
+#elif defined(USE_LIBJPEG_TURBO) && !defined(OS_CHROMEOS) |
return LIBJPEG_TURBO; |
#else |
return IJG_LIBJPEG; |