coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2026-01-01 03:12:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename convert to yuvconvert to avoid name clash with linux util

Browse Source 
Bug: libyuv:695
Test: untested
Change-Id: Ib088fd16fd00bbc50868ea330b2a544e29a3385c
Reviewed-on: https://chromium-review.googlesource.com/469077
Reviewed-by: Henrik Kjellander <kjellander@chromium.org>
Commit-Queue: Frank Barchard <fbarchard@google.com>
This commit is contained in:
Frank Barchard 2017-04-05 18:57:22 -07:00 committed by Commit Bot
parent cbe5385055
commit 78ef440a1f
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -21,7 +21,7 @@ pin-log.txt
cmake_install.cmake
CMakeCache.txt
CMakeFiles/
convert
yuvconvert
libgtest.a
libyuv.a
libyuv_unittest

6
BUILD.gn
View File

@ -33,7 +33,7 @@ group("default") {
if (libyuv_include_tests) {
deps += [
":compare",
":convert",
":yuvconvert",
":cpuid",
":libyuv_unittest",
":psnr",
@ -297,10 +297,10 @@ if (libyuv_include_tests) {
}
}
executable("convert") {
executable("yuvconvert") {
sources = [
# sources
"util/convert.cc",
"util/yuvconvert.cc",
]
deps = [
":libyuv",

8
CMakeLists.txt
View File

@ -31,14 +31,14 @@ SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES OUTPUT_NAME "${ly_lib_name}"
SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES PREFIX "lib" )
# this creates the conversion tool
ADD_EXECUTABLE ( convert ${ly_base_dir}/util/convert.cc )
TARGET_LINK_LIBRARIES ( convert ${ly_lib_static} )
ADD_EXECUTABLE ( yuvconvert ${ly_base_dir}/util/yuvconvert.cc )
TARGET_LINK_LIBRARIES ( yuvconvert ${ly_lib_static} )
INCLUDE ( FindJPEG )
if (JPEG_FOUND)
include_directories( ${JPEG_INCLUDE_DIR} )
target_link_libraries( convert ${JPEG_LIBRARY} )
target_link_libraries( yuvconvert ${JPEG_LIBRARY} )
add_definitions( -DHAVE_JPEG )
endif()
@ -73,7 +73,7 @@ endif()
# install the conversion tool, .so, .a, and all the header files
INSTALL ( PROGRAMS ${CMAKE_BINARY_DIR}/convert DESTINATION bin RENAME yuvconvert )
INSTALL ( PROGRAMS ${CMAKE_BINARY_DIR}/yuvconvert DESTINATION bin )
INSTALL ( TARGETS ${ly_lib_static} DESTINATION lib )
INSTALL ( TARGETS ${ly_lib_shared} LIBRARY DESTINATION lib )
INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include )

2
docs/deprecated_builds.md
View File

@ -238,7 +238,7 @@ If you get a compile error for atlthunk.lib on Windows, read http://www.chromium
ninja -C out/Debug libyuv
ninja -C out/Debug libyuv_unittest
ninja -C out/Debug compare
ninja -C out/Debug convert
ninja -C out/Debug yuvconvert
ninja -C out/Debug psnr
ninja -C out/Debug cpuid

4
libyuv_test.gyp
View File

@ -123,14 +123,14 @@
], # conditions
},
{
'target_name': 'convert',
'target_name': 'yuvconvert',
'type': 'executable',
'dependencies': [
'libyuv.gyp:libyuv',
],
'sources': [
# sources
'util/convert.cc',
'util/yuvconvert.cc',
],
'conditions': [
['OS=="linux"', {

2
util/convert.cc → util/yuvconvert.cc
View File

@ -9,7 +9,7 @@
*/
// Convert an ARGB image to YUV.
// Usage: convert src_argb.raw dst_yuv.raw
// Usage: yuvconvert src_argb.raw dst_yuv.raw
#ifndef _CRT_SECURE_NO_WARNINGS
#define _CRT_SECURE_NO_WARNINGS