Compare commits

..

No commits in common. "dev" and "master" have entirely different histories.
dev ... master

3 changed files with 11 additions and 11 deletions

View file

@ -53,7 +53,7 @@ int libraryflags = 0;
const char* nullchar = ""; const char* nullchar = "";
/* BEGIN OF STATIC LIBRARY FUNCTIONS */ /* BEGIN OF STATIC LIBRARY FUNCTIONS */
static inline size_t readBuffer(const char *input, void *output, size_t *pos, size_t outputLen, size_t inputLen) inline size_t readBuffer(const char *input, void *output, size_t *pos, size_t outputLen, size_t inputLen)
{ {
size_t readLen = 0; size_t readLen = 0;
if (*pos >= inputLen) if (*pos >= inputLen)
@ -66,7 +66,7 @@ static inline size_t readBuffer(const char *input, void *output, size_t *pos, si
return readLen; return readLen;
} }
static inline size_t writeBuffer(const void *input, char *output, size_t *pos, size_t outputLen, size_t inputLen) inline size_t writeBuffer(const void *input, char *output, size_t *pos, size_t outputLen, size_t inputLen)
{ {
const size_t maxLen = outputLen - *pos; const size_t maxLen = outputLen - *pos;
size_t writeLen = inputLen; size_t writeLen = inputLen;
@ -79,7 +79,7 @@ static inline size_t writeBuffer(const void *input, char *output, size_t *pos, s
return writeLen; return writeLen;
} }
static inline size_t zeroBuffer(char *output, size_t *pos, size_t outputLen, size_t inputLen) inline size_t zeroBuffer(char *output, size_t *pos, size_t outputLen, size_t inputLen)
{ {
const size_t maxLen = outputLen - *pos; const size_t maxLen = outputLen - *pos;
size_t zeroLen = inputLen; size_t zeroLen = inputLen;
@ -92,7 +92,7 @@ static inline size_t zeroBuffer(char *output, size_t *pos, size_t outputLen, siz
return zeroLen; return zeroLen;
} }
static inline bool writeDataChar(const char *input, char **output) inline bool writeDataChar(const char *input, char **output)
{ {
const size_t src_s = strlen(input) + 1; const size_t src_s = strlen(input) + 1;
if (*output) { if (*output) {
@ -129,7 +129,7 @@ static inline bool writeDataChar(const char *input, char **output)
return true; return true;
} }
static inline uint32_t charToUInt32LE(char *x) inline uint32_t charToUInt32LE(char *x)
{ {
return ((unsigned char)(x[3]) << 24 | return ((unsigned char)(x[3]) << 24 |
(unsigned char)(x[2]) << 16 | (unsigned char)(x[2]) << 16 |
@ -137,7 +137,7 @@ static inline uint32_t charToUInt32LE(char *x)
(unsigned char)(x[0])); (unsigned char)(x[0]));
} }
static inline uint32_t swapToUInt32LE(uint32_t x) inline uint32_t swapToUInt32LE(uint32_t x)
{ {
unsigned char *y = (unsigned char*)&x; unsigned char *y = (unsigned char*)&x;
return (y[3] << 24 | return (y[3] << 24 |
@ -146,7 +146,7 @@ static inline uint32_t swapToUInt32LE(uint32_t x)
y[0]); y[0]);
} }
static inline void uInt32ToCharLE(uint32_t x, char *y) inline void uInt32ToCharLE(uint32_t x, char *y)
{ {
y[0] = x; y[0] = x;
y[1] = x >> 8; y[1] = x >> 8;
@ -154,7 +154,7 @@ static inline void uInt32ToCharLE(uint32_t x, char *y)
y[3] = x >> 24; y[3] = x >> 24;
} }
static inline uint32_t joaatFromInitial(const char *data, size_t size, uint32_t init_val) inline uint32_t joaatFromInitial(const char *data, size_t size, uint32_t init_val)
{ {
uint32_t val = init_val; uint32_t val = init_val;
for (size_t i = 0; i != size; i++) { for (size_t i = 0; i != size; i++) {

View file

@ -2,10 +2,10 @@
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION @ragephoto_VERSION_MAJOR@, @ragephoto_VERSION_MINOR@, @ragephoto_VERSION_PATCH@, 0 FILEVERSION @ragephoto_VERSION_MAJOR@, @ragephoto_VERSION_MINOR@, @ragephoto_VERSION_PATCH@, 0
PRODUCTVERSION @ragephoto_VERSION_MAJOR@, @ragephoto_VERSION_MINOR@, @ragephoto_VERSION_PATCH@, 0 PRODUCTVERSION @ragephoto_VERSION_MAJOR@, @ragephoto_VERSION_MINOR@, @ragephoto_VERSION_PATCH@, 0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGSMASK 0x3fL
FILEFLAGS 0 FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32 FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_DLL FILETYPE VFT_APP
FILESUBTYPE VFT2_UNKNOWN FILESUBTYPE VFT2_UNKNOWN
BEGIN BEGIN
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

View file

@ -2,7 +2,7 @@
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION @ragephoto_VERSION_MAJOR@, @ragephoto_VERSION_MINOR@, @ragephoto_VERSION_PATCH@, 0 FILEVERSION @ragephoto_VERSION_MAJOR@, @ragephoto_VERSION_MINOR@, @ragephoto_VERSION_PATCH@, 0
PRODUCTVERSION @ragephoto_VERSION_MAJOR@, @ragephoto_VERSION_MINOR@, @ragephoto_VERSION_PATCH@, 0 PRODUCTVERSION @ragephoto_VERSION_MAJOR@, @ragephoto_VERSION_MINOR@, @ragephoto_VERSION_PATCH@, 0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGSMASK 0x3fL
FILEFLAGS 0 FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32 FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_APP FILETYPE VFT_APP