Skip to content

Commit 2a73606

Browse files
bpoplauschibpoplauschi
authored
Merge pull request #2 from SDWebImage/remove_sd_webp_macro
Remove the extra SD_WEBP macro define. Since now we move to a dedicated repo
2 parents 69aedef + f7f0e0a commit 2a73606

File tree

7 files changed

+33
-43
lines changed

7 files changed

+33
-43
lines changed

‎Example/SDWebImageWebPCoderExample.xcodeproj/project.pbxproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -169,15 +169,11 @@
169169
buildActionMask = 2147483647;
170170
files = (
171171
);
172-
inputFileListPaths = (
173-
);
174172
inputPaths = (
175173
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
176174
"${PODS_ROOT}/Manifest.lock",
177175
);
178176
name = "[CP] Check Pods Manifest.lock";
179-
outputFileListPaths = (
180-
);
181177
outputPaths = (
182178
"$(DERIVED_FILE_DIR)/Pods-SDWebImageWebPCoderExample-checkManifestLockResult.txt",
183179
);
@@ -191,17 +187,13 @@
191187
buildActionMask = 2147483647;
192188
files = (
193189
);
194-
inputFileListPaths = (
195-
);
196190
inputPaths = (
197191
"${SRCROOT}/Pods/Target Support Files/Pods-SDWebImageWebPCoderExample/Pods-SDWebImageWebPCoderExample-frameworks.sh",
198192
"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
199193
"${BUILT_PRODUCTS_DIR}/SDWebImageWebPCoder/SDWebImageWebPCoder.framework",
200194
"${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework",
201195
);
202196
name = "[CP] Embed Pods Frameworks";
203-
outputFileListPaths = (
204-
);
205197
outputPaths = (
206198
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
207199
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImageWebPCoder.framework",

‎SDWebImageWebPCoder.xcodeproj/project.pbxproj

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -485,17 +485,13 @@
485485
buildActionMask = 2147483647;
486486
files = (
487487
);
488-
inputFileListPaths = (
489-
);
490488
inputPaths = (
491489
"${SRCROOT}/SDWebImageWebPCoderTests/Pods/Target Support Files/Pods-SDWebImageWebPCoderTests/Pods-SDWebImageWebPCoderTests-frameworks.sh",
492490
"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
493491
"${BUILT_PRODUCTS_DIR}/SDWebImageWebPCoder/SDWebImageWebPCoder.framework",
494492
"${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework",
495493
);
496494
name = "[CP] Embed Pods Frameworks";
497-
outputFileListPaths = (
498-
);
499495
outputPaths = (
500496
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
501497
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImageWebPCoder.framework",
@@ -511,15 +507,11 @@
511507
buildActionMask = 2147483647;
512508
files = (
513509
);
514-
inputFileListPaths = (
515-
);
516510
inputPaths = (
517511
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
518512
"${PODS_ROOT}/Manifest.lock",
519513
);
520514
name = "[CP] Check Pods Manifest.lock";
521-
outputFileListPaths = (
522-
);
523515
outputPaths = (
524516
"$(DERIVED_FILE_DIR)/Pods-SDWebImageWebPCoderTests-checkManifestLockResult.txt",
525517
);
@@ -624,11 +616,16 @@
624616
GCC_OPTIMIZATION_LEVEL = 0;
625617
GCC_PREPROCESSOR_DEFINITIONS = (
626618
"DEBUG=1",
627-
"SD_WEBP=1",
628619
"$(inherited)",
629620
);
630-
"GCC_PREPROCESSOR_DEFINITIONS[sdk=watchos*]" = "WEBP_USE_INTRINSICS=1 $(inherited)";
631-
"GCC_PREPROCESSOR_DEFINITIONS[sdk=watchsimulator*]" = "WEBP_USE_INTRINSICS=1 $(inherited)";
621+
"GCC_PREPROCESSOR_DEFINITIONS[sdk=watchos*]" = (
622+
"WEBP_USE_INTRINSICS=1",
623+
"$(inherited)",
624+
);
625+
"GCC_PREPROCESSOR_DEFINITIONS[sdk=watchsimulator*]" = (
626+
"WEBP_USE_INTRINSICS=1",
627+
"$(inherited)",
628+
);
632629
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
633630
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
634631
GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -695,12 +692,15 @@
695692
ENABLE_STRICT_OBJC_MSGSEND = YES;
696693
GCC_C_LANGUAGE_STANDARD = gnu11;
697694
GCC_NO_COMMON_BLOCKS = YES;
698-
GCC_PREPROCESSOR_DEFINITIONS = (
699-
"SD_WEBP=1",
695+
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
696+
"GCC_PREPROCESSOR_DEFINITIONS[sdk=watchos*]" = (
697+
"WEBP_USE_INTRINSICS=1",
698+
"$(inherited)",
699+
);
700+
"GCC_PREPROCESSOR_DEFINITIONS[sdk=watchsimulator*]" = (
701+
"WEBP_USE_INTRINSICS=1",
700702
"$(inherited)",
701703
);
702-
"GCC_PREPROCESSOR_DEFINITIONS[sdk=watchos*]" = "WEBP_USE_INTRINSICS=1 $(inherited)";
703-
"GCC_PREPROCESSOR_DEFINITIONS[sdk=watchsimulator*]" = "WEBP_USE_INTRINSICS=1 $(inherited)";
704704
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
705705
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
706706
GCC_WARN_UNDECLARED_SELECTOR = YES;

‎SDWebImageWebPCoder.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎SDWebImageWebPCoder/Classes/SDImageWebPCoder.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
* file that was distributed with this source code.
77
*/
88

9-
#ifdef SD_WEBP
10-
119
#import <Foundation/Foundation.h>
1210
#import <SDWebImage/SDImageCoder.h>
1311

@@ -19,5 +17,3 @@
1917
@property (nonatomic, class, readonly, nonnull) SDImageWebPCoder *sharedCoder;
2018

2119
@end
22-
23-
#endif

‎SDWebImageWebPCoder/Classes/SDImageWebPCoder.m

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
* file that was distributed with this source code.
77
*/
88

9-
#ifdef SD_WEBP
10-
119
#import "SDImageWebPCoder.h"
1210
#import <SDWebImage/SDImageCoderHelper.h>
1311
#if __has_include(<SDWebImage/NSImage+Compatibility.h>)
@@ -30,6 +28,14 @@
3028

3129
#import <Accelerate/Accelerate.h>
3230

31+
#ifndef SD_LOCK
32+
#define SD_LOCK(lock) dispatch_semaphore_wait(lock, DISPATCH_TIME_FOREVER);
33+
#endif
34+
35+
#ifndef SD_UNLOCK
36+
#define SD_UNLOCK(lock) dispatch_semaphore_signal(lock);
37+
#endif
38+
3339
@interface SDWebPCoderFrame : NSObject
3440

3541
@property (nonatomic, assign) NSUInteger index; // Frame index (zero based)
@@ -748,9 +754,9 @@ - (UIImage *)animatedImageFrameAtIndex:(NSUInteger)index {
748754
if (index >= _frameCount) {
749755
return nil;
750756
}
751-
LOCKBLOCK({
752-
image = [self safeAnimatedImageFrameAtIndex:index];
753-
});
757+
SD_LOCK(_lock);
758+
image = [self safeAnimatedImageFrameAtIndex:index];
759+
SD_UNLOCK(_lock);
754760
return image;
755761
}
756762

@@ -826,6 +832,3 @@ - (UIImage *)safeAnimatedImageFrameAtIndex:(NSUInteger)index {
826832
}
827833

828834
@end
829-
830-
#endif
831-

‎SDWebImageWebPCoder/Classes/UIImage+WebP.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
* file that was distributed with this source code.
77
*/
88

9-
#ifdef SD_WEBP
10-
119
#import <SDWebImage/SDWebImageCompat.h>
1210

1311
// This category is just use as a convenience method. For more detail control, use methods in `UIImage+MultiFormat.h` or directlly use `SDImageCoder`
@@ -23,5 +21,3 @@
2321
+ (nullable UIImage *)sd_imageWithWebPData:(nullable NSData *)data;
2422

2523
@end
26-
27-
#endif

‎SDWebImageWebPCoder/Classes/UIImage+WebP.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
* file that was distributed with this source code.
77
*/
88

9-
#ifdef SD_WEBP
10-
119
#import "UIImage+WebP.h"
1210
#import "SDImageWebPCoder.h"
1311

@@ -21,5 +19,3 @@ + (nullable UIImage *)sd_imageWithWebPData:(nullable NSData *)data {
2119
}
2220

2321
@end
24-
25-
#endif

0 commit comments

Comments
 (0)