Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to webp 1.4.0 Closes #74 #41 #55 #61 #60 #73

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file removed .DS_Store
Binary file not shown.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
/output.webp
.idea
.DS_Store
1 change: 1 addition & 0 deletions bench/z_benchmark_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

// generated by go run gen.go -output z_benchmark_test.go; DO NOT EDIT

//go:build go1.6
// +build go1.6

package webp_bench
Expand Down
4 changes: 2 additions & 2 deletions capi.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
package webp

/*
#cgo CFLAGS: -I./internal/libwebp-1.0.3/
#cgo CFLAGS: -I./internal/libwebp-1.0.3/src/
#cgo CFLAGS: -I./internal/libwebp-1.4.0/
#cgo CFLAGS: -I./internal/libwebp-1.4.0/src/
#cgo CFLAGS: -I./internal/include/
#cgo CFLAGS: -Wno-pointer-sign -DWEBP_USE_THREAD
#cgo !windows LDFLAGS: -lm
Expand Down
14 changes: 11 additions & 3 deletions gen_helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,20 @@ func clearOldGenFiles() {
}

func genIncludeFiles() {
ss := parseCMakeListsTxt("internal/libwebp-1.0.3/CMakeLists.txt", "WEBP_SRC_DIR", "*.c")
muxSS, err := findFiles("internal/libwebp-1.0.3/src/mux", "*.c")
ss := parseCMakeListsTxt("internal/libwebp-1.4.0/CMakeLists.txt", "WEBP_SRC_DIR", "*.c")

files, err := findFiles("internal/libwebp-1.4.0/src/mux", "*.c")
if err != nil {
log.Fatal(err)
}
ss = append(ss, files...)

files, err = findFiles("internal/libwebp-1.4.0/sharpyuv", "*.c")
if err != nil {
log.Fatal(err)
}
ss = append(ss, muxSS...)
ss = append(ss, files...)

for i := 0; i < len(ss); i++ {
relpath := ss[i][23:] // drop `./`
newname := "z_libwebp_" + strings.Replace(relpath, "/", "_", -1)
Expand Down
Binary file removed internal/.DS_Store
Binary file not shown.
2 changes: 0 additions & 2 deletions internal/libwebp-0.5.0/.gitignore

This file was deleted.

32 changes: 0 additions & 32 deletions internal/libwebp-0.5.0/AUTHORS

This file was deleted.

253 changes: 0 additions & 253 deletions internal/libwebp-0.5.0/Android.mk

This file was deleted.

Loading