colin/Megapixels
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to clang-format 14

Browse Source
This commit is contained in:
Martijn Braam
2022-06-21 14:49:53 +02:00
parent d41fb6745a
commit f66fcc5a71
5 changed files with 557 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
clang-format.sh
View File

@@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
cd "$MESON_SOURCE_ROOT" cd "$MESON_SOURCE_ROOT"
clang-format-12 $@ clang-format-14 $@

204
src/ini.c
View File

@@ -11,8 +11,8 @@ https://github.com/benhoyt/inih
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS
#endif #endif
#include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include <stdio.h>
#include <string.h> #include <string.h>
#include "ini.h" #include "ini.h"
@@ -28,19 +28,19 @@ https://github.com/benhoyt/inih
static char * static char *
rstrip(char *s) rstrip(char *s)
{ {
char *p = s + strlen(s); char *p = s + strlen(s);
while (p > s && isspace((unsigned char)(*--p))) while (p > s && isspace((unsigned char)(*--p)))
*p = '\0'; *p = '\0';
return s; return s;
} }
/* Return pointer to first non-whitespace char in given string. */ /* Return pointer to first non-whitespace char in given string. */
static char * static char *
lskip(const char *s) lskip(const char *s)
{ {
while (*s && isspace((unsigned char)(*s))) while (*s && isspace((unsigned char)(*s)))
s++; s++;
return (char *)s; return (char *)s;
} }
/* Return pointer to first char (of chars) or inline comment in given string, /* Return pointer to first char (of chars) or inline comment in given string,
@@ -50,149 +50,149 @@ static char *
find_chars_or_comment(const char *s, const char *chars) find_chars_or_comment(const char *s, const char *chars)
{ {
#if INI_ALLOW_INLINE_COMMENTS #if INI_ALLOW_INLINE_COMMENTS
int was_space = 0; int was_space = 0;
while (*s && (!chars || !strchr(chars, *s)) && while (*s && (!chars || !strchr(chars, *s)) &&
!(was_space && strchr(INI_INLINE_COMMENT_PREFIXES, *s))) { !(was_space && strchr(INI_INLINE_COMMENT_PREFIXES, *s))) {
was_space = isspace((unsigned char)(*s)); was_space = isspace((unsigned char)(*s));
s++; s++;
} }
#else #else
while (*s && (!chars || !strchr(chars, *s))) { while (*s && (!chars || !strchr(chars, *s))) {
s++; s++;
} }
#endif #endif
return (char *)s; return (char *)s;
} }
/* Version of strncpy that ensures dest (size bytes) is null-terminated. */ /* Version of strncpy that ensures dest (size bytes) is null-terminated. */
static char * static char *
strncpy0(char *dest, const char *src, size_t size) strncpy0(char *dest, const char *src, size_t size)
{ {
strncpy(dest, src, size - 1); strncpy(dest, src, size - 1);
dest[size - 1] = '\0'; dest[size - 1] = '\0';
return dest; return dest;
} }
/* See documentation in header file. */ /* See documentation in header file. */
int int
ini_parse_stream(ini_reader reader, void *stream, ini_handler handler, void *user) ini_parse_stream(ini_reader reader, void *stream, ini_handler handler, void *user)
{ {
/* Uses a fair bit of stack (use heap instead if you need to) */ /* Uses a fair bit of stack (use heap instead if you need to) */
#if INI_USE_STACK #if INI_USE_STACK
char line[INI_MAX_LINE]; char line[INI_MAX_LINE];
#else #else
char *line; char *line;
#endif #endif
char section[MAX_SECTION] = ""; char section[MAX_SECTION] = "";
char prev_name[MAX_NAME] = ""; char prev_name[MAX_NAME] = "";
char *start; char *start;
char *end; char *end;
char *name; char *name;
char *value; char *value;
int lineno = 0; int lineno = 0;
int error = 0; int error = 0;
#if !INI_USE_STACK #if !INI_USE_STACK
line = (char *)malloc(INI_MAX_LINE); line = (char *)malloc(INI_MAX_LINE);
if (!line) { if (!line) {
return -2; return -2;
} }
#endif #endif
/* Scan through stream line by line */ /* Scan through stream line by line */
while (reader(line, INI_MAX_LINE, stream) != NULL) { while (reader(line, INI_MAX_LINE, stream) != NULL) {
lineno++; lineno++;
start = line; start = line;
#if INI_ALLOW_BOM #if INI_ALLOW_BOM
if (lineno == 1 && (unsigned char)start[0] == 0xEF && if (lineno == 1 && (unsigned char)start[0] == 0xEF &&
(unsigned char)start[1] == 0xBB && (unsigned char)start[1] == 0xBB &&
(unsigned char)start[2] == 0xBF) { (unsigned char)start[2] == 0xBF) {
start += 3; start += 3;
} }
#endif #endif
start = lskip(rstrip(start)); start = lskip(rstrip(start));
if (*start == ';' || *start == '#') { if (*start == ';' || *start == '#') {
/* Per Python configparser, allow both ; and # comments at the /* Per Python configparser, allow both ; and # comments at
start of a line */ the start of a line */
} }
#if INI_ALLOW_MULTILINE #if INI_ALLOW_MULTILINE
else if (*prev_name && *start && start > line) { else if (*prev_name && *start && start > line) {
/* Non-blank line with leading whitespace, treat as continuation /* Non-blank line with leading whitespace, treat as
of previous name's value (as per Python configparser). */ continuation of previous name's value (as per Python configparser). */
if (!handler(user, section, prev_name, start) && !error) if (!handler(user, section, prev_name, start) && !error)
error = lineno; error = lineno;
} }
#endif #endif
else if (*start == '[') { else if (*start == '[') {
/* A "[section]" line */ /* A "[section]" line */
end = find_chars_or_comment(start + 1, "]"); end = find_chars_or_comment(start + 1, "]");
if (*end == ']') { if (*end == ']') {
*end = '\0'; *end = '\0';
strncpy0(section, start + 1, sizeof(section)); strncpy0(section, start + 1, sizeof(section));
*prev_name = '\0'; *prev_name = '\0';
} else if (!error) { } else if (!error) {
/* No ']' found on section line */ /* No ']' found on section line */
error = lineno; error = lineno;
} }
} else if (*start) { } else if (*start) {
/* Not a comment, must be a name[=:]value pair */ /* Not a comment, must be a name[=:]value pair */
end = find_chars_or_comment(start, "=:"); end = find_chars_or_comment(start, "=:");
if (*end == '=' || *end == ':') { if (*end == '=' || *end == ':') {
*end = '\0'; *end = '\0';
name = rstrip(start); name = rstrip(start);
value = lskip(end + 1); value = lskip(end + 1);
#if INI_ALLOW_INLINE_COMMENTS #if INI_ALLOW_INLINE_COMMENTS
end = find_chars_or_comment(value, NULL); end = find_chars_or_comment(value, NULL);
if (*end) if (*end)
*end = '\0'; *end = '\0';
#endif #endif
rstrip(value); rstrip(value);
/* Valid name[=:]value pair found, call handler */ /* Valid name[=:]value pair found, call handler */
strncpy0(prev_name, name, sizeof(prev_name)); strncpy0(prev_name, name, sizeof(prev_name));
if (!handler(user, section, name, value) && !error) if (!handler(user, section, name, value) && !error)
error = lineno; error = lineno;
memset(value, 0, strlen(value)); memset(value, 0, strlen(value));
} else if (!error) { } else if (!error) {
/* No '=' or ':' found on name[=:]value line */ /* No '=' or ':' found on name[=:]value line */
error = lineno; error = lineno;
} }
} }
#if INI_STOP_ON_FIRST_ERROR #if INI_STOP_ON_FIRST_ERROR
if (error) if (error)
break; break;
#endif #endif
} }
#if !INI_USE_STACK #if !INI_USE_STACK
free(line); free(line);
#endif #endif
return error; return error;
} }
/* See documentation in header file. */ /* See documentation in header file. */
int int
ini_parse_file(FILE *file, ini_handler handler, void *user) ini_parse_file(FILE *file, ini_handler handler, void *user)
{ {
return ini_parse_stream((ini_reader)fgets, file, handler, user); return ini_parse_stream((ini_reader)fgets, file, handler, user);
} }
/* See documentation in header file. */ /* See documentation in header file. */
int int
ini_parse(const char *filename, ini_handler handler, void *user) ini_parse(const char *filename, ini_handler handler, void *user)
{ {
FILE *file; FILE *file;
int error; int error;
file = fopen(filename, "r"); file = fopen(filename, "r");
if (!file) if (!file)
return -1; return -1;
error = ini_parse_file(file, handler, user); error = ini_parse_file(file, handler, user);
fclose(file); fclose(file);
return error; return error;
} }

10
src/ini.h
View File

@@ -18,8 +18,10 @@ extern "C" {
#include <stdio.h> #include <stdio.h>
/* Typedef for prototype of handler function. */ /* Typedef for prototype of handler function. */
typedef int (*ini_handler)(void *user, const char *section, const char *name, typedef int (*ini_handler)(void *user,
const char *value); const char *section,
const char *name,
const char *value);
/* Typedef for prototype of fgets-style reader function. */ /* Typedef for prototype of fgets-style reader function. */
typedef char *(*ini_reader)(char *str, int num, void *stream); typedef char *(*ini_reader)(char *str, int num, void *stream);
@@ -45,8 +47,8 @@ int ini_parse_file(FILE *file, ini_handler handler, void *user);
/* Same as ini_parse(), but takes an ini_reader function pointer instead of /* Same as ini_parse(), but takes an ini_reader function pointer instead of
filename. Used for implementing custom or string-based I/O. */ filename. Used for implementing custom or string-based I/O. */
int ini_parse_stream(ini_reader reader, void *stream, ini_handler handler, int
void *user); ini_parse_stream(ini_reader reader, void *stream, ini_handler handler, void *user);
/* Nonzero to allow multi-line value parsing, in the style of Python's /* Nonzero to allow multi-line value parsing, in the style of Python's
configparser. If allowed, ini_parse() will call the handler with the same configparser. If allowed, ini_parse() will call the handler with the same

14
src/process_pipeline.c
View File

@@ -558,15 +558,15 @@ process_image_for_capture(const uint8_t *image, int count)
gain - 1, 0, gain_max, camera->iso_min, camera->iso_max); gain - 1, 0, gain_max, camera->iso_min, camera->iso_max);
TIFFSetField(tif, EXIFTAG_ISOSPEEDRATINGS, 1, &isospeed); TIFFSetField(tif, EXIFTAG_ISOSPEEDRATINGS, 1, &isospeed);
} }
if(!camera->has_flash){ if (!camera->has_flash) {
// No flash function // No flash function
TIFFSetField(tif, EXIFTAG_FLASH, 0x20); TIFFSetField(tif, EXIFTAG_FLASH, 0x20);
} else if (flash_enabled) { } else if (flash_enabled) {
// Flash present and fired // Flash present and fired
TIFFSetField(tif, EXIFTAG_FLASH, 0x1); TIFFSetField(tif, EXIFTAG_FLASH, 0x1);
} else { } else {
// Flash present but not fired // Flash present but not fired
TIFFSetField(tif, EXIFTAG_FLASH, 0x0); TIFFSetField(tif, EXIFTAG_FLASH, 0x0);
} }
TIFFSetField(tif, EXIFTAG_DATETIMEORIGINAL, datetime); TIFFSetField(tif, EXIFTAG_DATETIMEORIGINAL, datetime);

830
src/renderdoc/app.h
View File

File diff suppressed because it is too large Load Diff