Skip to content

Commit 369b99f

Browse files
BladeRunner-A2CSid127
authored andcommitted
DRG_sprout: Run clang-format treewide
Signed-off-by: BladeRunner-A2C <[email protected]>
1 parent 7c1c756 commit 369b99f

File tree

5 files changed

+854
-1096
lines changed

5 files changed

+854
-1096
lines changed

.clang-format

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
BasedOnStyle: Google
2+
Standard: Cpp11
3+
AccessModifierOffset: -2
4+
AllowShortFunctionsOnASingleLine: Inline
5+
ColumnLimit: 100
6+
CommentPragmas: NOLINT:.*
7+
DerivePointerAlignment: false
8+
IncludeBlocks: Preserve
9+
IndentWidth: 4
10+
ContinuationIndentWidth: 8
11+
PointerAlignment: Left
12+
TabWidth: 4
13+
UseTab: Never

camera/megvii_shim.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
*/
1616

1717
namespace android {
18-
extern "C" void mg_facepp() {}
19-
}
18+
extern "C" void mg_facepp() {}
19+
} // namespace android

dpm/strdup16to8.cpp

+13-20
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
* Convert a UTF-16 string to UTF-8.
2626
*
2727
*/
28-
char * strndup16to8 (const char16_t* s, size_t n)
29-
{
28+
char* strndup16to8(const char16_t* s, size_t n) {
3029
if (s == NULL) {
3130
return NULL;
3231
}
@@ -37,14 +36,12 @@ char * strndup16to8 (const char16_t* s, size_t n)
3736
* too since it is an overflow value for our
3837
* strnlen16to8 implementation.
3938
*/
40-
if (len >= SIZE_MAX-1)
41-
return NULL;
39+
if (len >= SIZE_MAX - 1) return NULL;
4240

4341
char* ret = static_cast<char*>(malloc(len + 1));
44-
if (ret == NULL)
45-
return NULL;
42+
if (ret == NULL) return NULL;
4643

47-
strncpy16to8 (ret, s, n);
44+
strncpy16to8(ret, s, n);
4845

4946
return ret;
5047
}
@@ -53,8 +50,7 @@ char * strndup16to8 (const char16_t* s, size_t n)
5350
* Given a UTF-16 string, compute the length of the corresponding UTF-8
5451
* string in bytes.
5552
*/
56-
extern size_t strnlen16to8(const char16_t* utf16Str, size_t len)
57-
{
53+
extern size_t strnlen16to8(const char16_t* utf16Str, size_t len) {
5854
size_t utf8Len = 0;
5955

6056
/* A small note on integer overflow. The result can
@@ -81,7 +77,7 @@ extern size_t strnlen16to8(const char16_t* utf16Str, size_t len)
8177

8278
/* Fast path for the usual case where 3*len is < SIZE_MAX-1.
8379
*/
84-
if (len < (SIZE_MAX-1)/3) {
80+
if (len < (SIZE_MAX - 1) / 3) {
8581
while (len != 0) {
8682
len--;
8783
unsigned int uic = *utf16Str++;
@@ -99,8 +95,8 @@ extern size_t strnlen16to8(const char16_t* utf16Str, size_t len)
9995
/* The slower but paranoid version */
10096
while (len != 0) {
10197
len--;
102-
unsigned int uic = *utf16Str++;
103-
size_t utf8Cur = utf8Len;
98+
unsigned int uic = *utf16Str++;
99+
size_t utf8Cur = utf8Len;
104100

105101
if (uic > 0x07ff)
106102
utf8Len += 3;
@@ -110,17 +106,15 @@ extern size_t strnlen16to8(const char16_t* utf16Str, size_t len)
110106
utf8Len++;
111107

112108
if (utf8Len < utf8Cur) /* overflow detected */
113-
return SIZE_MAX-1;
109+
return SIZE_MAX - 1;
114110
}
115111

116112
/* don't return SIZE_MAX to avoid common user bug */
117-
if (utf8Len == SIZE_MAX)
118-
utf8Len = SIZE_MAX-1;
113+
if (utf8Len == SIZE_MAX) utf8Len = SIZE_MAX - 1;
119114

120115
return utf8Len;
121116
}
122117

123-
124118
/**
125119
* Convert a Java-Style UTF-16 string + length to a JNI-Style UTF-8 string.
126120
*
@@ -133,8 +127,7 @@ extern size_t strnlen16to8(const char16_t* utf16Str, size_t len)
133127
* Please note, a terminated \0 is always added, so your result will always
134128
* be "strlen16to8() + 1" bytes long.
135129
*/
136-
extern char* strncpy16to8(char* utf8Str, const char16_t* utf16Str, size_t len)
137-
{
130+
extern char* strncpy16to8(char* utf8Str, const char16_t* utf16Str, size_t len) {
138131
char* utf8cur = utf8Str;
139132

140133
/* Note on overflows: We assume the user did check the result of
@@ -161,7 +154,7 @@ extern char* strncpy16to8(char* utf8Str, const char16_t* utf16Str, size_t len)
161154
}
162155
}
163156

164-
*utf8cur = '\0';
157+
*utf8cur = '\0';
165158

166-
return utf8Str;
159+
return utf8Str;
167160
}

dpm/strdup8to16.cpp

+20-26
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@
3131
#define UTF8_SEQ_LENGTH(ch) (((0xe5000000 >> (((ch) >> 3) & 0x1e)) & 3) + 1)
3232

3333
/* note: macro expands to multiple lines */
34-
#define UTF8_SHIFT_AND_MASK(unicode, byte) \
35-
(unicode)<<=6; (unicode) |= (0x3f & (byte));
34+
#define UTF8_SHIFT_AND_MASK(unicode, byte) \
35+
(unicode) <<= 6; \
36+
(unicode) |= (0x3f & (byte));
3637

3738
#define UNICODE_UPPER_LIMIT 0x10fffd
3839

@@ -41,23 +42,21 @@
4142
* length of the UTF-16 string (which may contain embedded \0's)
4243
*/
4344

44-
extern char16_t * strdup8to16 (const char* s, size_t *out_len)
45-
{
46-
char16_t *ret;
45+
extern char16_t* strdup8to16(const char* s, size_t* out_len) {
46+
char16_t* ret;
4747
size_t len;
4848

4949
if (s == NULL) return NULL;
5050

5151
len = strlen8to16(s);
5252

5353
// fail on overflow
54-
if (len && SIZE_MAX/len < sizeof(char16_t))
55-
return NULL;
54+
if (len && SIZE_MAX / len < sizeof(char16_t)) return NULL;
5655

5756
// no plus-one here. UTF-16 strings are not null terminated
58-
ret = (char16_t *) malloc (sizeof(char16_t) * len);
57+
ret = (char16_t*)malloc(sizeof(char16_t) * len);
5958

60-
return strcpy8to16 (ret, s, out_len);
59+
return strcpy8to16(ret, s, out_len);
6160
}
6261

6362
/**
@@ -66,8 +65,7 @@ extern char16_t * strdup8to16 (const char* s, size_t *out_len)
6665
* The value returned is the number of UTF-16 characters required
6766
* to represent this string.
6867
*/
69-
extern size_t strlen8to16 (const char* utf8Str)
70-
{
68+
extern size_t strlen8to16(const char* utf8Str) {
7169
size_t len = 0;
7270
int ic;
7371
int expected = 0;
@@ -99,8 +97,6 @@ extern size_t strlen8to16 (const char* utf8Str)
9997
return len;
10098
}
10199

102-
103-
104100
/*
105101
* Retrieve the next UTF-32 character from a UTF-8 string.
106102
*
@@ -110,8 +106,7 @@ extern size_t strlen8to16 (const char* utf8Str)
110106
*
111107
* Advances "*pUtf8Ptr" to the start of the next character.
112108
*/
113-
static inline uint32_t getUtf32FromUtf8(const char** pUtf8Ptr)
114-
{
109+
static inline uint32_t getUtf32FromUtf8(const char** pUtf8Ptr) {
115110
uint32_t ret;
116111
int seq_len;
117112
int i;
@@ -128,12 +123,12 @@ static inline uint32_t getUtf32FromUtf8(const char** pUtf8Ptr)
128123
/* note we tolerate invalid leader 11111xxx here */
129124
seq_len = UTF8_SEQ_LENGTH(**pUtf8Ptr);
130125

131-
ret = (**pUtf8Ptr) & leaderMask [seq_len - 1];
126+
ret = (**pUtf8Ptr) & leaderMask[seq_len - 1];
132127

133128
if (**pUtf8Ptr == '\0') return ret;
134129

135130
(*pUtf8Ptr)++;
136-
for (i = 1; i < seq_len ; i++, (*pUtf8Ptr)++) {
131+
for (i = 1; i < seq_len; i++, (*pUtf8Ptr)++) {
137132
if ((**pUtf8Ptr) == '\0') return UTF16_REPLACEMENT_CHAR;
138133
if (((**pUtf8Ptr) & 0xc0) != 0x80) return UTF16_REPLACEMENT_CHAR;
139134

@@ -143,30 +138,29 @@ static inline uint32_t getUtf32FromUtf8(const char** pUtf8Ptr)
143138
return ret;
144139
}
145140

146-
147141
/**
148142
* out_len is an out parameter (which may not be null) containing the
149143
* length of the UTF-16 string (which may contain embedded \0's)
150144
*/
151145

152-
extern char16_t * strcpy8to16 (char16_t *utf16Str, const char*utf8Str,
153-
size_t *out_len)
154-
{
155-
char16_t *dest = utf16Str;
146+
extern char16_t* strcpy8to16(char16_t* utf16Str, const char* utf8Str, size_t* out_len) {
147+
char16_t* dest = utf16Str;
156148

157149
while (*utf8Str != '\0') {
158150
uint32_t ret;
159151

160152
ret = getUtf32FromUtf8(&utf8Str);
161153

162154
if (ret <= 0xffff) {
163-
*dest++ = (char16_t) ret;
164-
} else if (ret <= UNICODE_UPPER_LIMIT) {
155+
*dest++ = (char16_t)ret;
156+
} else if (ret <= UNICODE_UPPER_LIMIT) {
165157
/* Create surrogate pairs */
166-
/* See http://en.wikipedia.org/wiki/UTF-16/UCS-2#Method_for_code_points_in_Plane_1.2C_Plane_2 */
158+
/* See
159+
* http://en.wikipedia.org/wiki/UTF-16/UCS-2#Method_for_code_points_in_Plane_1.2C_Plane_2
160+
*/
167161

168162
*dest++ = 0xd800 | ((ret - 0x10000) >> 10);
169-
*dest++ = 0xdc00 | ((ret - 0x10000) & 0x3ff);
163+
*dest++ = 0xdc00 | ((ret - 0x10000) & 0x3ff);
170164
} else {
171165
*dest++ = UTF16_REPLACEMENT_CHAR;
172166
}

0 commit comments

Comments
 (0)