From 3f2dc94c0e4ce1487c119469a0d589b3288e87df Mon Sep 17 00:00:00 2001 From: tsukumijima Date: Sun, 24 Oct 2021 22:40:39 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E4=B8=AD=E3=81=AE?= =?UTF-8?q?=E6=9C=AB=E5=B0=BE=E3=81=AE=E7=A9=BA=E7=99=BD=E3=82=92=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 4 ++++ .travis.yml | 4 ++-- CMakeLists.txt | 2 +- NOTICE | 4 ++-- aribb25/arib_std_b25.c | 4 ++-- aribb25/libaribb25.cpp | 4 ++-- aribb25/td.c | 2 +- 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.editorconfig b/.editorconfig index bab7388..da1ae29 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,7 +5,11 @@ end_of_life = lf charset = utf-8 indent_style = tab indent_size = 2 +trim_trailing_whitespace = true [*.yml] indent_style = space indent_size = 2 + +[*.md] +trim_trailing_whitespace = false diff --git a/.travis.yml b/.travis.yml index 599f7f8..cc4a9fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ matrix: - cmake - cmake-data - libpcsclite-dev - + # Linux with LLVM C Compiler - os: linux compiler: clang @@ -59,7 +59,7 @@ matrix: compiler: clang # macOS 10.11 (Sierra) - - os: osx + - os: osx osx_image: xcode8 compiler: clang diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c337b6..bd6c075 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -135,7 +135,7 @@ if(UNIX AND NOT CYGWIN) install(FILES aribb25/arib_std_b25.h aribb25/b_cas_card.h aribb25/multi2.h aribb25/ts_section_parser.h aribb25/portable.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/aribb25) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${ARIBB25_LIB_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -DLDCONFIG_EXECUTABLE=${LDCONFIG_EXECUTABLE} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/PostInstall.cmake)") - + add_custom_target(uninstall ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Uninstall.cmake) elseif(WIN32) install(TARGETS b25 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/NOTICE b/NOTICE index ff9e88f..88730ac 100644 --- a/NOTICE +++ b/NOTICE @@ -1,8 +1,8 @@ stz2012 - libaribb25 Copyright (c)2012 stz2012 - + This product include software from MARUMO Manufacturing libaribb25 project. * Copyright (c)2007-2012 MOGI, Kazuhiro ; All rights reserved. - MARUMO Manufacturing (https://www.marumo.ne.jp/) + MARUMO Manufacturing (https://www.marumo.ne.jp/) Special Thanks: 2ch NoNames, eternalharvest, eru. diff --git a/aribb25/arib_std_b25.c b/aribb25/arib_std_b25.c index 73d44fb..15aac7c 100644 --- a/aribb25/arib_std_b25.c +++ b/aribb25/arib_std_b25.c @@ -2135,7 +2135,7 @@ static int proc_ecm(DECRYPTOR_ELEM *dec, B_CAS_CARD *bcas, int32_t multi2_round) fprintf(stderr, "\n"); fflush(stderr); #endif - + LAST: if(sect.raw != NULL){ n = dec->ecm->ret(dec->ecm, §); @@ -2150,7 +2150,7 @@ static void dump_pts(uint8_t *src, int32_t crypt) { int32_t pts_dts_flag; int64_t pts,dts; - + src += 4; // TS ヘッダ部 src += 4; // start_code_prefix + stream_id 部 src += 2; // packet_length 部 diff --git a/aribb25/libaribb25.cpp b/aribb25/libaribb25.cpp index e023a46..4d82883 100644 --- a/aribb25/libaribb25.cpp +++ b/aribb25/libaribb25.cpp @@ -201,7 +201,7 @@ const BOOL CB25Decoder::Decode(BYTE *pSrcBuf, const DWORD dwSrcSize, BYTE **ppDs const BOOL CB25Decoder::Flush(BYTE **ppDstBuf, DWORD *pdwDstSize) { BOOL ret = TRUE; - + if (_b25) { int rc = _b25->flush(_b25); ret = (rc < 0) ? FALSE : TRUE; @@ -216,7 +216,7 @@ const BOOL CB25Decoder::Flush(BYTE **ppDstBuf, DWORD *pdwDstSize) const BOOL CB25Decoder::Reset(void) { BOOL ret = TRUE; - + if (_b25) { int rc = _b25->reset(_b25); ret = (rc < 0) ? FALSE : TRUE; diff --git a/aribb25/td.c b/aribb25/td.c index 9614029..f9dff44 100644 --- a/aribb25/td.c +++ b/aribb25/td.c @@ -585,7 +585,7 @@ static void run_multi2_benchmark_test(OPTION *opt) }else{ time_percentage = -(int32_t)(totals[i]*100/base_time) - 100; } - + _ftprintf(stdout, _T(" (%3d%% faster)\n"), time_percentage); }