Compare commits

..

4 Commits

Author SHA1 Message Date
Lioncash
b16c89bf65 vi: Copy data directly into the std::vector within Parcel's ReadBlock function
Previously this would unnecessarily zero-initialize the vector before
copying the actual data into the vector instance.
2018-01-17 20:09:41 -05:00
bunnei
ee08c39b72 Merge pull request #73 from N00byKing/3093
Implement Pull #3093 from citra: Added missing headers to CMakeLists.txt and fixed includes.
2018-01-17 18:18:34 -05:00
N00byKing
10955d72ef Update CMakeLists.txt 2018-01-17 18:21:49 +01:00
N00byKing
66388f7576 Update title_metadata.h 2018-01-17 18:20:52 +01:00
4 changed files with 6 additions and 3 deletions

View File

@@ -7,7 +7,7 @@ include(DownloadExternals)
project(yuzu)
option(ENABLE_SDL2 "Enable the SDL2 frontend" ON)
option(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 binaries" ON)
option(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 binaries" OFF)
option(ENABLE_QT "Enable the Qt frontend" ON)
option(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" OFF)

View File

@@ -89,6 +89,7 @@ set(HEADERS
file_sys/ivfc_archive.h
file_sys/path_parser.h
file_sys/savedata_archive.h
file_sys/title_metadata.h
frontend/emu_window.h
frontend/framebuffer_layout.h
frontend/input.h

View File

@@ -4,6 +4,7 @@
#pragma once
#include <array>
#include <string>
#include <vector>
#include "common/common_types.h"

View File

@@ -47,8 +47,9 @@ public:
}
std::vector<u8> ReadBlock(size_t length) {
std::vector<u8> data(length);
std::memcpy(data.data(), buffer.data() + read_index, length);
const u8* const begin = buffer.data() + read_index;
const u8* const end = begin + length;
std::vector<u8> data(begin, end);
read_index += length;
read_index = Common::AlignUp(read_index, 4);
return data;