Skip to content

Commit 64dd70a

Browse files
dreampiggydreampiggy
authored
Merge pull request #90 from SDWebImage/bugfix/webp_encoding_colorspace_mac
Fix the WebP encoding which loss the image's input color space
2 parents 7e70ec8 + 01f9d34 commit 64dd70a

File tree

22 files changed

+1556
-14
lines changed

22 files changed

+1556
-14
lines changed

‎.github/workflows/CI.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ jobs:
4949
matrix:
5050
iosDestination: ["platform=iOS Simulator,name=iPhone 13 Pro"]
5151
macOSDestination: ["platform=macOS,arch=x86_64"]
52-
tvOSDestination: ["platform=tvOS Simulator,name=Apple TV 4K"]
5352
steps:
5453
- name: Checkout
5554
uses: actions/checkout@v3
@@ -76,11 +75,18 @@ jobs:
7675
set -o pipefail
7776
xcodebuild test -workspace "${{ env.WORKSPACE_NAME }}" -scheme "SDWebImageWebPCoderTests" -destination "${{ matrix.iosDestination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO
7877
mv ~/Library/Developer/Xcode/DerivedData/ ./DerivedData/iOS
78+
79+
- name: Test - ${{ matrix.macOSDestination }}
80+
run: |
81+
set -o pipefail
82+
xcodebuild test -workspace "${{ env.WORKSPACE_NAME }}" -scheme "SDWebImageWebPCoderTests-macOS" -destination "${{ matrix.macOSDestination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO
83+
mv ~/Library/Developer/Xcode/DerivedData/ ./DerivedData/macOS
7984
8085
- name: Code Coverage
8186
run: |
8287
set -o pipefail
8388
export PATH="/usr/local/opt/curl/bin:$PATH"
8489
curl --version
8590
bash <(curl -s https://codecov.io/bash) -v -D './DerivedData/iOS' -J '^SDWebImageWebPCoder$' -c -X gcov -F ios
91+
bash <(curl -s https://codecov.io/bash) -v -D './DerivedData/macOS' -J '^SDWebImageWebPCoder$' -c -X gcov -F macos
8692

‎Cartfile.resolved

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "SDWebImage/SDWebImage" "5.10.0"
2-
github "SDWebImage/libwebp-Xcode" "1.1.0"
1+
github "SDWebImage/SDWebImage" "5.18.4"
2+
github "SDWebImage/libwebp-Xcode" "1.3.2"

‎Example/SDWebImageWebPCoderExample-macOS/AppDelegate.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* This file is part of the SDWebImage package.
3+
* (c) DreamPiggy <[email protected]>
4+
*
5+
* For the full copyright and license information, please view the LICENSE
6+
* file that was distributed with this source code.
7+
*/
8+
9+
#import <Cocoa/Cocoa.h>
10+
11+
@interface AppDelegate : NSObject <NSApplicationDelegate>
12+
13+
14+
@end
15+

‎Example/SDWebImageWebPCoderExample-macOS/AppDelegate.m

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/*
2+
* This file is part of the SDWebImage package.
3+
* (c) DreamPiggy <[email protected]>
4+
*
5+
* For the full copyright and license information, please view the LICENSE
6+
* file that was distributed with this source code.
7+
*/
8+
9+
#import "AppDelegate.h"
10+
11+
@interface AppDelegate ()
12+
13+
14+
@end
15+
16+
@implementation AppDelegate
17+
18+
- (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
19+
// Insert code here to initialize your application
20+
}
21+
22+
23+
- (void)applicationWillTerminate:(NSNotification *)aNotification {
24+
// Insert code here to tear down your application
25+
}
26+
27+
28+
- (BOOL)applicationSupportsSecureRestorableState:(NSApplication *)app {
29+
return YES;
30+
}
31+
32+
33+
@end

‎Example/SDWebImageWebPCoderExample-macOS/Assets.xcassets/AccentColor.colorset/Contents.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"colors" : [
3+
{
4+
"idiom" : "universal"
5+
}
6+
],
7+
"info" : {
8+
"author" : "xcode",
9+
"version" : 1
10+
}
11+
}

‎Example/SDWebImageWebPCoderExample-macOS/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "mac",
5+
"scale" : "1x",
6+
"size" : "16x16"
7+
},
8+
{
9+
"idiom" : "mac",
10+
"scale" : "2x",
11+
"size" : "16x16"
12+
},
13+
{
14+
"idiom" : "mac",
15+
"scale" : "1x",
16+
"size" : "32x32"
17+
},
18+
{
19+
"idiom" : "mac",
20+
"scale" : "2x",
21+
"size" : "32x32"
22+
},
23+
{
24+
"idiom" : "mac",
25+
"scale" : "1x",
26+
"size" : "128x128"
27+
},
28+
{
29+
"idiom" : "mac",
30+
"scale" : "2x",
31+
"size" : "128x128"
32+
},
33+
{
34+
"idiom" : "mac",
35+
"scale" : "1x",
36+
"size" : "256x256"
37+
},
38+
{
39+
"idiom" : "mac",
40+
"scale" : "2x",
41+
"size" : "256x256"
42+
},
43+
{
44+
"idiom" : "mac",
45+
"scale" : "1x",
46+
"size" : "512x512"
47+
},
48+
{
49+
"idiom" : "mac",
50+
"scale" : "2x",
51+
"size" : "512x512"
52+
}
53+
],
54+
"info" : {
55+
"author" : "xcode",
56+
"version" : 1
57+
}
58+
}

‎Example/SDWebImageWebPCoderExample-macOS/Assets.xcassets/Contents.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"author" : "xcode",
4+
"version" : 1
5+
}
6+
}

‎Example/SDWebImageWebPCoderExample-macOS/Base.lproj/Main.storyboard

Lines changed: 717 additions & 0 deletions
Large diffs are not rendered by default.

‎Example/SDWebImageWebPCoderExample-macOS/Info.plist

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>NSAppTransportSecurity</key>
6+
<dict>
7+
<key>NSAllowsArbitraryLoads</key>
8+
<true/>
9+
</dict>
10+
</dict>
11+
</plist>

‎Example/SDWebImageWebPCoderExample-macOS/SDWebImageWebPCoderExample_macOS.entitlements

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict/>
5+
</plist>

0 commit comments

Comments
 (0)