fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into d3d12

Browse Source
This commit is contained in:
gibbed
2019-07-18 12:33:52 -05:00
parent 1e5fa61030 e14639c6c0
commit e024cbc3f0
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/xenia/cpu/lzx.cc
View File

@@ -96,10 +96,13 @@ void mspack_memory_sys_destroy(struct mspack_system* sys) { free(sys); }
int lzx_decompress(const void* lzx_data, size_t lzx_len, void* dest, int lzx_decompress(const void* lzx_data, size_t lzx_len, void* dest,
size_t dest_len, uint32_t window_size, void* window_data, size_t dest_len, uint32_t window_size, void* window_data,
size_t window_data_len) { size_t window_data_len) {
uint32_t window_bits = xe::bit_count(window_size);
int result_code = 1; int result_code = 1;
uint32_t window_bits;
if (!xe::bit_scan_forward(window_size, &window_bits)) {
return result_code;
}
mspack_system* sys = mspack_memory_sys_create(); mspack_system* sys = mspack_memory_sys_create();
mspack_memory_file* lzxsrc = mspack_memory_file* lzxsrc =
mspack_memory_open(sys, (void*)lzx_data, lzx_len); mspack_memory_open(sys, (void*)lzx_data, lzx_len);

2
xenia-build
View File

@@ -1370,7 +1370,7 @@ class TidyCommand(Command):
super(TidyCommand, self).__init__( super(TidyCommand, self).__init__(
subparsers, subparsers,
name='tidy', name='tidy',
help_short='Runs the clang-tiday checker on all code.', help_short='Runs the clang-tidy checker on all code.',
*args, **kwargs) *args, **kwargs)
self.parser.add_argument( self.parser.add_argument(
'--fix', action='store_true', '--fix', action='store_true',