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

Side by Side Diff: source/convert_argb.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, 7 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 | « include/libyuv/version.h ('k') | source/convert_jpeg.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_argb.h" 11 #include "libyuv/convert_argb.h"
12 12
13 #include "libyuv/cpu_id.h" 13 #include "libyuv/cpu_id.h"
14 #ifdef HAVE_JPEG 14 #ifdef HAVE_JPEG
15 #include "libyuv/mjpeg_decoder.h" 15 #include "libyuv/mjpeg_decoder.h"
16 #endif 16 #endif
17 #include "libyuv/planar_functions.h" // For CopyPlane and ARGBShuffle.
17 #include "libyuv/rotate_argb.h" 18 #include "libyuv/rotate_argb.h"
18 #include "libyuv/row.h" 19 #include "libyuv/row.h"
19 #include "libyuv/video_common.h" 20 #include "libyuv/video_common.h"
20 21
21 #ifdef __cplusplus 22 #ifdef __cplusplus
22 namespace libyuv { 23 namespace libyuv {
23 extern "C" { 24 extern "C" {
24 #endif 25 #endif
25 26
26 // Copy ARGB with optional flipping 27 // Copy ARGB with optional flipping
(...skipping 1419 matching lines...) Expand 10 before | Expand all | Expand 10 after
1446 src_uyvy += src_stride_uyvy; 1447 src_uyvy += src_stride_uyvy;
1447 dst_argb += dst_stride_argb; 1448 dst_argb += dst_stride_argb;
1448 } 1449 }
1449 return 0; 1450 return 0;
1450 } 1451 }
1451 1452
1452 #ifdef __cplusplus 1453 #ifdef __cplusplus
1453 } // extern "C" 1454 } // extern "C"
1454 } // namespace libyuv 1455 } // namespace libyuv
1455 #endif 1456 #endif
OLDNEW
« no previous file with comments | « include/libyuv/version.h ('k') | source/convert_jpeg.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698