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

Side by Side Diff: source/convert_jpeg.cc

Issue 2006943002: remove includes for duplicate functions (Closed) Base URL: https://chromium.googlesource.com/libyuv/libyuv@master
Patch Set: tried removing row.h but its needed for alloc Created 4 years, 6 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 unified diff | Download patch
« no previous file with comments | « source/convert_argb.cc ('k') | unit_test/scale_argb_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2011 The LibYuv Project Authors. All rights reserved. 2 * Copyright 2011 The LibYuv Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "libyuv/convert.h" 11 #include "libyuv/convert.h"
12 #include "libyuv/convert_argb.h"
12 13
13 #ifdef HAVE_JPEG 14 #ifdef HAVE_JPEG
14 #include "libyuv/mjpeg_decoder.h" 15 #include "libyuv/mjpeg_decoder.h"
15 #endif 16 #endif
16 17
17 #ifdef __cplusplus 18 #ifdef __cplusplus
18 namespace libyuv { 19 namespace libyuv {
19 extern "C" { 20 extern "C" {
20 #endif 21 #endif
21 22
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 return ret ? 0 : 1; 384 return ret ? 0 : 1;
384 } 385 }
385 #endif 386 #endif
386 387
387 #endif 388 #endif
388 389
389 #ifdef __cplusplus 390 #ifdef __cplusplus
390 } // extern "C" 391 } // extern "C"
391 } // namespace libyuv 392 } // namespace libyuv
392 #endif 393 #endif
OLDNEW
« no previous file with comments | « source/convert_argb.cc ('k') | unit_test/scale_argb_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698