diff options
| author | Frank Barchard <fbarchard@google.com> | 2017-04-05 18:57:22 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2017-04-06 18:58:42 +0000 |
| commit | 78ef440a1f5c076842da670f10aeec9e245682b3 (patch) | |
| tree | 6cb76245231aaa211e27f00bff07cf25a71411a0 | |
| parent | cbe5385055b9360cacd14877450631b87eea1fcd (diff) | |
| download | libyuv-78ef440a1f5c076842da670f10aeec9e245682b3.tar.gz | |
Rename convert to yuvconvert to avoid name clash with linux util
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>
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | BUILD.gn | 6 | ||||
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | docs/deprecated_builds.md | 2 | ||||
| -rw-r--r-- | libyuv_test.gyp | 4 | ||||
| -rw-r--r-- | util/yuvconvert.cc (renamed from util/convert.cc) | 2 |
6 files changed, 12 insertions, 12 deletions
@@ -21,7 +21,7 @@ pin-log.txt cmake_install.cmake CMakeCache.txt CMakeFiles/ -convert +yuvconvert libgtest.a libyuv.a libyuv_unittest @@ -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", diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c95487f..6420371d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 ) diff --git a/docs/deprecated_builds.md b/docs/deprecated_builds.md index f623e50c..d54a0282 100644 --- a/docs/deprecated_builds.md +++ b/docs/deprecated_builds.md @@ -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 diff --git a/libyuv_test.gyp b/libyuv_test.gyp index 88860f5c..87e7a5bb 100644 --- a/libyuv_test.gyp +++ b/libyuv_test.gyp @@ -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"', { diff --git a/util/convert.cc b/util/yuvconvert.cc index acaf43ad..bc01d9ff 100644 --- a/util/convert.cc +++ b/util/yuvconvert.cc @@ -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 |