Skip to content

Commit 872bdb1

Browse files
committed
💚
1 parent 149a3b7 commit 872bdb1

File tree

5 files changed

+23
-28
lines changed

5 files changed

+23
-28
lines changed

package/android/cpp/rnskia-android/SkiaOpenGLSurfaceFactory.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ sk_sp<SkSurface> SkiaOpenGLSurfaceFactory::makeOffscreenSurface(int width,
3131
// Create texture
3232
auto texture =
3333
ThreadContextHolder::ThreadSkiaOpenGLContext.directContext
34-
->createBackendTexture(width, height, colorType, skgpu::Mipmapped::kNo,
35-
GrRenderable::kYes);
34+
->createBackendTexture(width, height, colorType,
35+
skgpu::Mipmapped::kNo, GrRenderable::kYes);
3636

3737
struct ReleaseContext {
3838
SkiaOpenGLContext *context;

package/cpp/api/JsiSkDataFactory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class JsiSkDataFactory : public JsiSkHostObject {
7676
// Create data object and decode
7777
auto data = SkData::MakeUninitialized(len);
7878
err = Base64::Decode(&base64.utf8(runtime).c_str()[0], size,
79-
data->writable_data(), &len);
79+
data->writable_data(), &len);
8080
if (err != Base64::Error::kNone) {
8181
throw jsi::JSError(runtime, "Error decoding base64 string");
8282
return jsi::Value::undefined();

package/cpp/api/JsiSkImage.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#include <string>
55
#include <utility>
66

7-
#include "third_party/base64.h"
87
#include "JsiSkHostObjects.h"
98
#include "JsiSkImageInfo.h"
109
#include "JsiSkMatrix.h"
1110
#include "JsiSkShader.h"
11+
#include "third_party/base64.h"
1212

1313
#include "RNSkTypedArray.h"
1414

@@ -136,7 +136,7 @@ class JsiSkImage : public JsiSkWrappingSkPtrHostObject<SkImage> {
136136
auto len = Base64::Encode(data->bytes(), data->size(), nullptr);
137137
auto buffer = std::string(len, 0);
138138
Base64::Encode(data->bytes(), data->size(),
139-
reinterpret_cast<void *>(&buffer[0]));
139+
reinterpret_cast<void *>(&buffer[0]));
140140
return jsi::String::createFromAscii(runtime, buffer);
141141
}
142142

package/cpp/api/third_party/base64.cpp

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@
1111
#define DecodePad -2
1212
#define EncodePad 64
1313

14-
static const char kDefaultEncode[] =
15-
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
16-
"abcdefghijklmnopqrstuvwxyz"
17-
"0123456789+/=";
14+
static const char kDefaultEncode[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
15+
"abcdefghijklmnopqrstuvwxyz"
16+
"0123456789+/=";
1817

1918
static const signed char kDecodeData[] = {
2019
62, -1, -1, -1, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1,
@@ -25,17 +24,15 @@ static const signed char kDecodeData[] = {
2524

2625
namespace RNSkia {
2726

28-
Base64::Error Base64::Decode(const void* srcv,
29-
size_t srcLength,
30-
void* dstv,
31-
size_t* dstLength) {
32-
const unsigned char* src = static_cast<const unsigned char*>(srcv);
33-
unsigned char* dst = static_cast<unsigned char*>(dstv);
27+
Base64::Error Base64::Decode(const void *srcv, size_t srcLength, void *dstv,
28+
size_t *dstLength) {
29+
const unsigned char *src = static_cast<const unsigned char *>(srcv);
30+
unsigned char *dst = static_cast<unsigned char *>(dstv);
3431

3532
int i = 0;
3633
bool padTwo = false;
3734
bool padThree = false;
38-
char unsigned const* const end = src + srcLength;
35+
char unsigned const *const end = src + srcLength;
3936
while (src < end) {
4037
unsigned char bytes[4] = {0, 0, 0, 0};
4138
int byte = 0;
@@ -46,7 +43,7 @@ Base64::Error Base64::Decode(const void* srcv,
4643
return Error::kNone;
4744
}
4845
if (srcByte <= ' ') {
49-
continue; // treat as white space
46+
continue; // treat as white space
5047
}
5148
if (srcByte < '+' || srcByte > 'z') {
5249
return Error::kBadChar;
@@ -114,14 +111,14 @@ Base64::Error Base64::Decode(const void* srcv,
114111
return Error::kNone;
115112
}
116113

117-
size_t Base64::Encode(const void* srcv, size_t length, void* dstv) {
118-
const unsigned char* src = static_cast<const unsigned char*>(srcv);
119-
unsigned char* dst = static_cast<unsigned char*>(dstv);
114+
size_t Base64::Encode(const void *srcv, size_t length, void *dstv) {
115+
const unsigned char *src = static_cast<const unsigned char *>(srcv);
116+
unsigned char *dst = static_cast<unsigned char *>(dstv);
120117

121-
const char* encode = kDefaultEncode;
118+
const char *encode = kDefaultEncode;
122119
if (dst) {
123120
size_t remainder = length % 3;
124-
char unsigned const* const end = &src[length - remainder];
121+
char unsigned const *const end = &src[length - remainder];
125122
while (src < end) {
126123
unsigned a = *src++;
127124
unsigned b = *src++;

package/cpp/api/third_party/base64.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
namespace RNSkia {
1212

1313
struct Base64 {
14-
public:
14+
public:
1515
enum class Error {
1616
kNone,
1717
kBadPadding,
@@ -29,7 +29,7 @@ struct Base64 {
2929
3030
@return the required length of dst for encoding.
3131
*/
32-
static size_t Encode(const void* src, size_t length, void* dst);
32+
static size_t Encode(const void *src, size_t length, void *dst);
3333

3434
/**
3535
Base64 decodes src into dst.
@@ -43,10 +43,8 @@ struct Base64 {
4343
@param dstLength assigned the length dst is required to be. Must not be
4444
nullptr.
4545
*/
46-
[[nodiscard]] static Error Decode(const void* src,
47-
size_t srcLength,
48-
void* dst,
49-
size_t* dstLength);
46+
[[nodiscard]] static Error Decode(const void *src, size_t srcLength,
47+
void *dst, size_t *dstLength);
5048
};
5149

5250
} // namespace RNSkia

0 commit comments

Comments
 (0)