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

Unified Diff: ui/gfx/codec/jpeg_codec.cc

Issue 10886050: Add code to insure we are using the correct library. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed DEPS Created 8 years, 4 months 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
« no previous file with comments | « ui/gfx/codec/DEPS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/codec/jpeg_codec.cc
diff --git a/ui/gfx/codec/jpeg_codec.cc b/ui/gfx/codec/jpeg_codec.cc
index a58756b286c38fc379aa0dd3f380dd840ee5bb1e..6836143f6eb681c7518d661b941c4328cf2e7fe0 100644
--- a/ui/gfx/codec/jpeg_codec.cc
+++ b/ui/gfx/codec/jpeg_codec.cc
@@ -14,8 +14,10 @@
extern "C" {
#if defined(USE_SYSTEM_LIBJPEG)
#include <jpeglib.h>
+#elif defined(USE_LIBJPEG_TURBO)
+#include "third_party/libjpeg_turbo/jpeglib.h"
#else
-#include "jpeglib.h"
+#include "third_party/libjpeg/jpeglib.h"
#endif
}
« no previous file with comments | « ui/gfx/codec/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698