Skip to content

Commit 27372a5

Browse files
ledyba-zledyba-z
committed
Rename functions, because there are two "Create"!
1 parent dba7a0d commit 27372a5

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

‎Example/Tests/Tests.m

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,11 @@ -(void)testAllColorSpaceSupportsOutput
164164
for(avifNclxTransferCharacteristics transfer = 0; transfer < kNumTransfers; ++transfer) {
165165
CGColorSpaceRef space = NULL;
166166

167-
space = SDCreateAVIFCreateColorSpaceRGB(primaries, transfer);
167+
space = SDAVIFCreateColorSpaceRGB(primaries, transfer);
168168
XCTAssertTrue(CGColorSpaceSupportsOutput(space));
169169
CGColorSpaceRelease(space);
170170

171-
space = SDCreateAVIFCreateColorSpaceMono(primaries, transfer);
171+
space = SDAVIFCreateColorSpaceMono(primaries, transfer);
172172
XCTAssertTrue(CGColorSpaceSupportsOutput(space));
173173
CGColorSpaceRelease(space);
174174
}
@@ -190,7 +190,7 @@ -(void)testCalcNCLXColorSpaceFromAVIFImage
190190
CGColorSpaceRef space = NULL;
191191
BOOL shouldRelease = FALSE;
192192

193-
SDCalcColorSpaceRGBAVIF(img, &space, &shouldRelease);
193+
SDAVIFCalcColorSpaceRGB(img, &space, &shouldRelease);
194194
XCTAssertTrue(CGColorSpaceSupportsOutput(space));
195195
if(shouldRelease) {
196196
CGColorSpaceRelease(space);
@@ -204,7 +204,7 @@ -(void)testCalcNCLXColorSpaceFromAVIFImage
204204
img->yuvPlanes[AVIF_CHAN_V] = NULL;
205205
img->yuvRowBytes[AVIF_CHAN_V] = 0;
206206

207-
SDCalcColorSpaceMonoAVIF(img, &space, &shouldRelease);
207+
SDAVIFCalcColorSpaceMono(img, &space, &shouldRelease);
208208
XCTAssertTrue(CGColorSpaceSupportsOutput(space));
209209
if(shouldRelease) {
210210
CGColorSpaceRelease(space);
@@ -227,7 +227,7 @@ -(void)testCalcICCColorSpaceFromAVIFImage
227227
CGColorSpaceRef space = NULL;
228228
BOOL shouldRelease = FALSE;
229229

230-
SDCalcColorSpaceRGBAVIF(img, &space, &shouldRelease);
230+
SDAVIFCalcColorSpaceRGB(img, &space, &shouldRelease);
231231
XCTAssertTrue(CGColorSpaceSupportsOutput(space));
232232
if(shouldRelease) {
233233
CGColorSpaceRelease(space);
@@ -241,7 +241,7 @@ -(void)testCalcICCColorSpaceFromAVIFImage
241241
img->yuvPlanes[AVIF_CHAN_V] = NULL;
242242
img->yuvRowBytes[AVIF_CHAN_V] = 0;
243243

244-
SDCalcColorSpaceMonoAVIF(img, &space, &shouldRelease);
244+
SDAVIFCalcColorSpaceMono(img, &space, &shouldRelease);
245245
XCTAssertTrue(CGColorSpaceSupportsOutput(space));
246246
if(shouldRelease) {
247247
CGColorSpaceRelease(space);

‎SDWebImageAVIFCoder/Classes/ColorSpace.m

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ static void CalcTransferFunction(uint16_t const transferCharacteristics, vImageT
161161
break;
162162
}
163163
}
164-
CGColorSpaceRef SDCreateAVIFCreateColorSpaceMono(avifNclxColourPrimaries const colorPrimaries, avifNclxTransferCharacteristics const transferCharacteristics) {
164+
CGColorSpaceRef SDAVIFCreateColorSpaceMono(avifNclxColourPrimaries const colorPrimaries, avifNclxTransferCharacteristics const transferCharacteristics) {
165165
if (@available(macOS 10.10, iOS 8.0, tvOS 8.0, *)) {
166166
vImage_Error err;
167167
vImageWhitePoint white;
@@ -182,7 +182,7 @@ CGColorSpaceRef SDCreateAVIFCreateColorSpaceMono(avifNclxColourPrimaries const c
182182
}
183183
}
184184

185-
CGColorSpaceRef SDCreateAVIFCreateColorSpaceRGB(avifNclxColourPrimaries const colorPrimaries, avifNclxTransferCharacteristics const transferCharacteristics) {
185+
CGColorSpaceRef SDAVIFCreateColorSpaceRGB(avifNclxColourPrimaries const colorPrimaries, avifNclxTransferCharacteristics const transferCharacteristics) {
186186
if (@available(macOS 10.10, iOS 8.0, tvOS 8.0, *)) {
187187
vImage_Error err;
188188
vImageRGBPrimaries primaries;
@@ -203,7 +203,7 @@ CGColorSpaceRef SDCreateAVIFCreateColorSpaceRGB(avifNclxColourPrimaries const co
203203
}
204204
}
205205

206-
void SDCalcColorSpaceMonoAVIF(avifImage * avif, CGColorSpaceRef* ref, BOOL* shouldRelease) {
206+
void SDAVIFCalcColorSpaceMono(avifImage * avif, CGColorSpaceRef* ref, BOOL* shouldRelease) {
207207
static CGColorSpaceRef defaultColorSpace;
208208
{
209209
static dispatch_once_t onceToken;
@@ -249,7 +249,7 @@ void SDCalcColorSpaceMonoAVIF(avifImage * avif, CGColorSpaceRef* ref, BOOL* shou
249249
static CGColorSpaceRef sRGB = NULL;
250250
static dispatch_once_t onceToken;
251251
dispatch_once(&onceToken, ^{
252-
sRGB = SDCreateAVIFCreateColorSpaceMono(colorPrimaries, transferCharacteristics);
252+
sRGB = SDAVIFCreateColorSpaceMono(colorPrimaries, transferCharacteristics);
253253
if(sRGB == NULL) {
254254
sRGB = defaultColorSpace;
255255
}
@@ -263,7 +263,7 @@ void SDCalcColorSpaceMonoAVIF(avifImage * avif, CGColorSpaceRef* ref, BOOL* shou
263263
static CGColorSpaceRef bt709 = NULL;
264264
static dispatch_once_t onceToken;
265265
dispatch_once(&onceToken, ^{
266-
bt709 = SDCreateAVIFCreateColorSpaceMono(colorPrimaries, transferCharacteristics);
266+
bt709 = SDAVIFCreateColorSpaceMono(colorPrimaries, transferCharacteristics);
267267
if(bt709 == NULL) {
268268
bt709 = defaultColorSpace;
269269
}
@@ -278,7 +278,7 @@ void SDCalcColorSpaceMonoAVIF(avifImage * avif, CGColorSpaceRef* ref, BOOL* shou
278278
static CGColorSpaceRef bt2020 = NULL;
279279
static dispatch_once_t onceToken;
280280
dispatch_once(&onceToken, ^{
281-
bt2020 = SDCreateAVIFCreateColorSpaceMono(colorPrimaries, transferCharacteristics);
281+
bt2020 = SDAVIFCreateColorSpaceMono(colorPrimaries, transferCharacteristics);
282282
if(bt2020 == NULL) {
283283
bt2020 = defaultColorSpace;
284284
}
@@ -292,7 +292,7 @@ void SDCalcColorSpaceMonoAVIF(avifImage * avif, CGColorSpaceRef* ref, BOOL* shou
292292
static CGColorSpaceRef p3 = NULL;
293293
static dispatch_once_t onceToken;
294294
dispatch_once(&onceToken, ^{
295-
p3 = SDCreateAVIFCreateColorSpaceMono(colorPrimaries, transferCharacteristics);
295+
p3 = SDAVIFCreateColorSpaceMono(colorPrimaries, transferCharacteristics);
296296
if(p3 == NULL) {
297297
p3 = defaultColorSpace;
298298
}
@@ -302,7 +302,7 @@ void SDCalcColorSpaceMonoAVIF(avifImage * avif, CGColorSpaceRef* ref, BOOL* shou
302302
return;
303303
}
304304

305-
*ref = SDCreateAVIFCreateColorSpaceMono(colorPrimaries, transferCharacteristics);
305+
*ref = SDAVIFCreateColorSpaceMono(colorPrimaries, transferCharacteristics);
306306
if(*ref != NULL) {
307307
*shouldRelease = TRUE;
308308
} else {
@@ -311,7 +311,7 @@ void SDCalcColorSpaceMonoAVIF(avifImage * avif, CGColorSpaceRef* ref, BOOL* shou
311311
}
312312
}
313313

314-
void SDCalcColorSpaceRGBAVIF(avifImage * avif, CGColorSpaceRef* ref, BOOL* shouldRelease) {
314+
void SDAVIFCalcColorSpaceRGB(avifImage * avif, CGColorSpaceRef* ref, BOOL* shouldRelease) {
315315
static CGColorSpaceRef defaultColorSpace = NULL;
316316
{
317317
static dispatch_once_t onceToken;
@@ -520,7 +520,7 @@ void SDCalcColorSpaceRGBAVIF(avifImage * avif, CGColorSpaceRef* ref, BOOL* shoul
520520
return;
521521
}
522522

523-
*ref = SDCreateAVIFCreateColorSpaceRGB(colorPrimaries, transferCharacteristics);
523+
*ref = SDAVIFCreateColorSpaceRGB(colorPrimaries, transferCharacteristics);
524524
if(*ref != NULL) {
525525
*shouldRelease = TRUE;
526526
} else {

‎SDWebImageAVIFCoder/Classes/Conversion.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ static CGImageRef CreateImageFromBuffer(avifImage * avif, vImage_Buffer* result)
3232
CGColorSpaceRef colorSpace = NULL;
3333
BOOL shouldReleaseColorSpace = FALSE;
3434
if(monochrome){
35-
SDCalcColorSpaceMonoAVIF(avif, &colorSpace, &shouldReleaseColorSpace);
35+
SDAVIFCalcColorSpaceMono(avif, &colorSpace, &shouldReleaseColorSpace);
3636
}else{
37-
SDCalcColorSpaceRGBAVIF(avif, &colorSpace, &shouldReleaseColorSpace);
37+
SDAVIFCalcColorSpaceRGB(avif, &colorSpace, &shouldReleaseColorSpace);
3838
}
3939

4040
CGColorRenderingIntent renderingIntent = kCGRenderingIntentDefault;

‎SDWebImageAVIFCoder/Classes/Private/ColorSpace.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#import "avif/avif.h"
1313
#endif
1414

15-
extern CGColorSpaceRef _Nullable SDCreateAVIFCreateColorSpaceMono(avifNclxColourPrimaries const colorPrimaries, avifNclxTransferCharacteristics const transferCharacteristics) __attribute__((visibility("hidden")));
16-
extern CGColorSpaceRef _Nullable SDCreateAVIFCreateColorSpaceRGB(avifNclxColourPrimaries const colorPrimaries, avifNclxTransferCharacteristics const transferCharacteristics) __attribute__((visibility("hidden")));
15+
extern CGColorSpaceRef _Nullable SDAVIFCreateColorSpaceMono(avifNclxColourPrimaries const colorPrimaries, avifNclxTransferCharacteristics const transferCharacteristics) __attribute__((visibility("hidden")));
16+
extern CGColorSpaceRef _Nullable SDAVIFCreateColorSpaceRGB(avifNclxColourPrimaries const colorPrimaries, avifNclxTransferCharacteristics const transferCharacteristics) __attribute__((visibility("hidden")));
1717

18-
void SDCalcColorSpaceMonoAVIF(avifImage * _Nonnull avif, CGColorSpaceRef _Nullable * _Nonnull ref, BOOL* _Nonnull shouldRelease);
19-
void SDCalcColorSpaceRGBAVIF(avifImage * _Nonnull avif, CGColorSpaceRef _Nullable * _Nonnull ref, BOOL* _Nonnull shouldRelease);
18+
void SDAVIFCalcColorSpaceMono(avifImage * _Nonnull avif, CGColorSpaceRef _Nullable * _Nonnull ref, BOOL* _Nonnull shouldRelease);
19+
void SDAVIFCalcColorSpaceRGB(avifImage * _Nonnull avif, CGColorSpaceRef _Nullable * _Nonnull ref, BOOL* _Nonnull shouldRelease);

0 commit comments

Comments
 (0)