Merge remote-tracking branch 'upstream/master' into develop

buffer.h

 #ifndef CORE_BUFFER_H
 #define CORE_BUFFER_H
 
+#include <cstdio>
 #include <cstring>
 #include <vector>
 
@@ -21,7 +22,7 @@ inline void buffer_write_block(unsigned char*& p, const void* src, size_t size)
 }
 template<typename T>
 inline void buffer_write(unsigned char*& p, T value) {
-	buffer_write_block(p, &value,sizeof(T));
+	buffer_write_block(p, &value, sizeof(T));
 }
 
 inline void vector_write_block(std::vector<unsigned char>& buffer, const void* src, size_t size) {
@@ -34,4 +35,11 @@ inline void vector_write(std::vector<unsigned char>& buffer, T value) {
 	vector_write_block(buffer, &value, sizeof(T));
 }
 
+inline void vector_fread(std::vector<unsigned char>& buffer, FILE* fp) {
+	unsigned char temp[4096]{};
+	while (size_t len = std::fread(temp, 1, sizeof temp, fp))
+		vector_write_block(buffer, temp, len);
+	std::fclose(fp);
+}
+
 #endif // !CORE_BUFFER_H