From 19fe8f0b419ec8105eb2f4ad505649d3cbb1ebb9 Mon Sep 17 00:00:00 2001 From: "hbono@chromium.org" Date: Tue, 7 Dec 2010 07:27:27 +0000 Subject: Integrates libjpeg-turbo into Chromium (Chromium side) This change is the Chromium-side change that integrates libjpeg-turbo into Chromium. (We need another change for WebKit.) It adds a GYP option 'libjpeg_turbo' so we can switch from libjpeg to libjpeg-turbo and use libjpeg-turbo when its value is 1. (Unfortunately, its value must be 0 for now to avoid build breaks until we land all changes required for libjpeg-turbo.) BUG=48789 TEST=build Chromium. Review URL: http://codereview.chromium.org/5292007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68453 0039d316-1c4b-4281-b951-d872f2087c98 --- gfx/codec/jpeg_codec.cc | 2 +- gfx/gfx.gyp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'gfx') diff --git a/gfx/codec/jpeg_codec.cc b/gfx/codec/jpeg_codec.cc index 940eb74..ad499e5 100644 --- a/gfx/codec/jpeg_codec.cc +++ b/gfx/codec/jpeg_codec.cc @@ -15,7 +15,7 @@ extern "C" { #if defined(USE_SYSTEM_LIBJPEG) #include #else -#include "third_party/libjpeg/jpeglib.h" +#include "jpeglib.h" #endif } diff --git a/gfx/gfx.gyp b/gfx/gfx.gyp index dc8c378..c180f3e 100644 --- a/gfx/gfx.gyp +++ b/gfx/gfx.gyp @@ -79,10 +79,10 @@ '../skia/skia.gyp:skia', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', - '../third_party/libjpeg/libjpeg.gyp:libjpeg', '../third_party/libpng/libpng.gyp:libpng', '../third_party/zlib/zlib.gyp:zlib', 'gfx_resources', + '<(libjpeg_gyp_path):libjpeg', ], 'sources': [ 'blit.cc', -- cgit v1.1