Skip to content

Commit b0308a7

Browse files
dreampiggydreampiggy
committed
Update to v1.2.3
vendored sharpyuv is also available from CocoaPods
1 parent e19508a commit b0308a7

File tree

4 files changed

+59
-4
lines changed

4 files changed

+59
-4
lines changed

‎Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ let package = Package(
2525
name: "libwebp",
2626
dependencies: [],
2727
path: ".",
28-
sources: ["libwebp/src"],
28+
sources: ["libwebp/src", "libwebp/sharpyuv"],
2929
publicHeadersPath: "include",
3030
cSettings: [.headerSearchPath("libwebp")])
3131
]

‎libwebp

Submodule libwebp updated 103 files

‎libwebp.podspec

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@ Pod::Spec.new do |s|
1818
s.pod_target_xcconfig = {
1919
'USER_HEADER_SEARCH_PATHS' => '$(inherited) ${PODS_ROOT}/libwebp/ ${PODS_TARGET_SRCROOT}/'
2020
}
21-
s.preserve_path = 'src'
22-
s.default_subspecs = 'webp', 'demux', 'mux'
21+
s.preserve_paths = 'src', 'sharpyuv'
22+
s.default_subspecs = 'webp', 'demux', 'mux', 'sharpyuv'
2323

2424
# webp decoding && encoding
2525
s.subspec 'webp' do |ss|
26+
ss.dependency 'libwebp/sharpyuv'
2627
ss.source_files = 'src/webp/decode.h', 'src/webp/encode.h', 'src/webp/types.h', 'src/webp/mux_types.h', 'src/webp/format_constants.h', 'src/utils/*.{h,c}', 'src/dsp/*.{h,c}', 'src/dec/*.{h,c}', 'src/enc/*.{h,c}'
2728
ss.public_header_files = 'src/webp/decode.h', 'src/webp/encode.h', 'src/webp/types.h', 'src/webp/mux_types.h', 'src/webp/format_constants.h'
2829
end
@@ -41,6 +42,12 @@ Pod::Spec.new do |s|
4142
ss.public_header_files = 'src/webp/mux.h'
4243
end
4344

45+
# sharpyuv converter
46+
s.subspec 'sharpyuv' do |ss|
47+
ss.source_files = 'sharpyuv/*.{h,c}'
48+
ss.public_header_files = 'sharpyuv/*.h'
49+
end
50+
4451
# fix #include <inttypes.h> cause 'Include of non-modular header inside framework module error'
4552
s.prepare_command = <<-CMD
4653
sed -i.bak 's/<inttypes.h>/<stdint.h>/g' './src/webp/types.h'

‎libwebp.xcodeproj/project.pbxproj

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
3236021C2899930C00C844E7 /* sharpyuv_gamma.c in Sources */ = {isa = PBXBuildFile; fileRef = 323602112899930B00C844E7 /* sharpyuv_gamma.c */; };
11+
3236021D2899930C00C844E7 /* sharpyuv_sse2.c in Sources */ = {isa = PBXBuildFile; fileRef = 323602122899930B00C844E7 /* sharpyuv_sse2.c */; };
12+
3236021E2899930C00C844E7 /* sharpyuv.c in Sources */ = {isa = PBXBuildFile; fileRef = 323602132899930B00C844E7 /* sharpyuv.c */; };
13+
3236021F2899930C00C844E7 /* sharpyuv_csp.h in Headers */ = {isa = PBXBuildFile; fileRef = 323602142899930B00C844E7 /* sharpyuv_csp.h */; };
14+
323602202899930C00C844E7 /* sharpyuv_neon.c in Sources */ = {isa = PBXBuildFile; fileRef = 323602152899930B00C844E7 /* sharpyuv_neon.c */; };
15+
323602212899930C00C844E7 /* sharpyuv_dsp.h in Headers */ = {isa = PBXBuildFile; fileRef = 323602162899930B00C844E7 /* sharpyuv_dsp.h */; };
16+
323602232899930C00C844E7 /* sharpyuv_gamma.h in Headers */ = {isa = PBXBuildFile; fileRef = 323602182899930B00C844E7 /* sharpyuv_gamma.h */; };
17+
323602242899930C00C844E7 /* sharpyuv.h in Headers */ = {isa = PBXBuildFile; fileRef = 323602192899930B00C844E7 /* sharpyuv.h */; };
18+
323602252899930C00C844E7 /* sharpyuv_csp.c in Sources */ = {isa = PBXBuildFile; fileRef = 3236021A2899930B00C844E7 /* sharpyuv_csp.c */; };
19+
323602262899930C00C844E7 /* sharpyuv_dsp.c in Sources */ = {isa = PBXBuildFile; fileRef = 3236021B2899930B00C844E7 /* sharpyuv_dsp.c */; };
1020
3258CB9E228BEAFE00C85E93 /* cost_neon.c in Sources */ = {isa = PBXBuildFile; fileRef = 3258CB9D228BEAFE00C85E93 /* cost_neon.c */; };
1121
3258CBA0228BEB3800C85E93 /* quant.h in Headers */ = {isa = PBXBuildFile; fileRef = 3258CB9F228BEB3800C85E93 /* quant.h */; };
1222
804BDE09213568F500BA3395 /* libwebp.h in Headers */ = {isa = PBXBuildFile; fileRef = 804BDE07213568F500BA3395 /* libwebp.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -181,6 +191,16 @@
181191
/* End PBXContainerItemProxy section */
182192

183193
/* Begin PBXFileReference section */
194+
323602112899930B00C844E7 /* sharpyuv_gamma.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sharpyuv_gamma.c; sourceTree = "<group>"; };
195+
323602122899930B00C844E7 /* sharpyuv_sse2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sharpyuv_sse2.c; sourceTree = "<group>"; };
196+
323602132899930B00C844E7 /* sharpyuv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sharpyuv.c; sourceTree = "<group>"; };
197+
323602142899930B00C844E7 /* sharpyuv_csp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sharpyuv_csp.h; sourceTree = "<group>"; };
198+
323602152899930B00C844E7 /* sharpyuv_neon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sharpyuv_neon.c; sourceTree = "<group>"; };
199+
323602162899930B00C844E7 /* sharpyuv_dsp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sharpyuv_dsp.h; sourceTree = "<group>"; };
200+
323602182899930B00C844E7 /* sharpyuv_gamma.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sharpyuv_gamma.h; sourceTree = "<group>"; };
201+
323602192899930B00C844E7 /* sharpyuv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sharpyuv.h; sourceTree = "<group>"; };
202+
3236021A2899930B00C844E7 /* sharpyuv_csp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sharpyuv_csp.c; sourceTree = "<group>"; };
203+
3236021B2899930B00C844E7 /* sharpyuv_dsp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sharpyuv_dsp.c; sourceTree = "<group>"; };
184204
3258CB9D228BEAFE00C85E93 /* cost_neon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cost_neon.c; sourceTree = "<group>"; };
185205
3258CB9F228BEB3800C85E93 /* quant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = quant.h; sourceTree = "<group>"; };
186206
804BDE04213568F500BA3395 /* libwebp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = libwebp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -366,6 +386,23 @@
366386
/* End PBXFrameworksBuildPhase section */
367387

368388
/* Begin PBXGroup section */
389+
323602102899930B00C844E7 /* sharpyuv */ = {
390+
isa = PBXGroup;
391+
children = (
392+
323602112899930B00C844E7 /* sharpyuv_gamma.c */,
393+
323602122899930B00C844E7 /* sharpyuv_sse2.c */,
394+
323602132899930B00C844E7 /* sharpyuv.c */,
395+
323602142899930B00C844E7 /* sharpyuv_csp.h */,
396+
323602152899930B00C844E7 /* sharpyuv_neon.c */,
397+
323602162899930B00C844E7 /* sharpyuv_dsp.h */,
398+
323602182899930B00C844E7 /* sharpyuv_gamma.h */,
399+
323602192899930B00C844E7 /* sharpyuv.h */,
400+
3236021A2899930B00C844E7 /* sharpyuv_csp.c */,
401+
3236021B2899930B00C844E7 /* sharpyuv_dsp.c */,
402+
);
403+
path = sharpyuv;
404+
sourceTree = "<group>";
405+
};
369406
804BDDFA213568F500BA3395 = {
370407
isa = PBXGroup;
371408
children = (
@@ -399,6 +436,7 @@
399436
804BDE1021356AEB00BA3395 /* libwebp */ = {
400437
isa = PBXGroup;
401438
children = (
439+
323602102899930B00C844E7 /* sharpyuv */,
402440
804BDE1221356B2D00BA3395 /* src */,
403441
);
404442
path = libwebp;
@@ -650,11 +688,14 @@
650688
80C1D53D2135871B007974F5 /* common_sse41.h in Headers */,
651689
804BDE09213568F500BA3395 /* libwebp.h in Headers */,
652690
804BDF9321356BC100BA3395 /* color_cache_utils.h in Headers */,
691+
3236021F2899930C00C844E7 /* sharpyuv_csp.h in Headers */,
653692
804BE0A121356C2600BA3395 /* vp8i_dec.h in Headers */,
654693
804BE07F21356C0A00BA3395 /* common_sse2.h in Headers */,
655694
804BDF9521356BC100BA3395 /* endian_inl_utils.h in Headers */,
656695
804BDFAE21356BCC00BA3395 /* mux.h in Headers */,
696+
323602212899930C00C844E7 /* sharpyuv_dsp.h in Headers */,
657697
804BDFAB21356BCC00BA3395 /* types.h in Headers */,
698+
323602232899930C00C844E7 /* sharpyuv_gamma.h in Headers */,
658699
804BDFA221356BC100BA3395 /* utils.h in Headers */,
659700
804BDFB821356BDB00BA3395 /* animi.h in Headers */,
660701
804BE04021356C0A00BA3395 /* mips_macro.h in Headers */,
@@ -675,6 +716,7 @@
675716
804BDFBA21356BDB00BA3395 /* muxi.h in Headers */,
676717
804BDFA321356BC100BA3395 /* quant_levels_dec_utils.h in Headers */,
677718
804BDFED21356BEC00BA3395 /* backward_references_enc.h in Headers */,
719+
323602242899930C00C844E7 /* sharpyuv.h in Headers */,
678720
804BDF9C21356BC100BA3395 /* quant_levels_utils.h in Headers */,
679721
804BE04A21356C0A00BA3395 /* neon.h in Headers */,
680722
804BE04721356C0A00BA3395 /* lossless.h in Headers */,
@@ -804,6 +846,7 @@
804846
804BDF9E21356BC100BA3395 /* random_utils.c in Sources */,
805847
804BE08721356C1B00BA3395 /* demux.c in Sources */,
806848
804BE07121356C0A00BA3395 /* lossless_sse2.c in Sources */,
849+
323602252899930C00C844E7 /* sharpyuv_csp.c in Sources */,
807850
804BDFF021356BEC00BA3395 /* backward_references_cost_enc.c in Sources */,
808851
804BDFBC21356BDB00BA3395 /* anim_encode.c in Sources */,
809852
804BE05221356C0A00BA3395 /* alpha_processing_sse2.c in Sources */,
@@ -824,6 +867,7 @@
824867
804BE0A421356C2600BA3395 /* quant_dec.c in Sources */,
825868
804BE05621356C0A00BA3395 /* filters_neon.c in Sources */,
826869
804BE07D21356C0A00BA3395 /* dec_msa.c in Sources */,
870+
323602202899930C00C844E7 /* sharpyuv_neon.c in Sources */,
827871
804BDF9B21356BC100BA3395 /* huffman_encode_utils.c in Sources */,
828872
804BDF9721356BC100BA3395 /* utils.c in Sources */,
829873
804BDF9621356BC100BA3395 /* thread_utils.c in Sources */,
@@ -836,6 +880,7 @@
836880
3258CB9E228BEAFE00C85E93 /* cost_neon.c in Sources */,
837881
804BE0A621356C2600BA3395 /* frame_dec.c in Sources */,
838882
804BE06221356C0A00BA3395 /* lossless_neon.c in Sources */,
883+
3236021C2899930C00C844E7 /* sharpyuv_gamma.c in Sources */,
839884
804BE07821356C0A00BA3395 /* rescaler_mips32.c in Sources */,
840885
804BE04421356C0A00BA3395 /* upsampling_mips_dsp_r2.c in Sources */,
841886
804BDF9221356BC100BA3395 /* huffman_utils.c in Sources */,
@@ -851,17 +896,20 @@
851896
804BE04321356C0A00BA3395 /* lossless_msa.c in Sources */,
852897
804BE07221356C0A00BA3395 /* rescaler_sse2.c in Sources */,
853898
804BE05021356C0A00BA3395 /* enc_mips_dsp_r2.c in Sources */,
899+
323602262899930C00C844E7 /* sharpyuv_dsp.c in Sources */,
854900
804BE0A021356C2600BA3395 /* tree_dec.c in Sources */,
855901
804BDFE121356BEC00BA3395 /* filter_enc.c in Sources */,
856902
804BE04621356C0A00BA3395 /* enc_neon.c in Sources */,
857903
804BE03F21356C0A00BA3395 /* lossless_enc_mips32.c in Sources */,
858904
804BDF9421356BC100BA3395 /* rescaler_utils.c in Sources */,
905+
3236021D2899930C00C844E7 /* sharpyuv_sse2.c in Sources */,
859906
804BE05D21356C0A00BA3395 /* lossless_enc_msa.c in Sources */,
860907
804BDFE321356BEC00BA3395 /* vp8l_enc.c in Sources */,
861908
804BE05F21356C0A00BA3395 /* lossless_enc_sse2.c in Sources */,
862909
804BE09B21356C2600BA3395 /* idec_dec.c in Sources */,
863910
804BDFE521356BEC00BA3395 /* cost_enc.c in Sources */,
864911
804BE07721356C0A00BA3395 /* lossless_enc_sse41.c in Sources */,
912+
3236021E2899930C00C844E7 /* sharpyuv.c in Sources */,
865913
804BE09E21356C2600BA3395 /* buffer_dec.c in Sources */,
866914
804BE07921356C0A00BA3395 /* upsampling_msa.c in Sources */,
867915
804BDFF221356BEC00BA3395 /* webp_enc.c in Sources */,

0 commit comments

Comments
 (0)