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 libwebp 1.2.1 #41

Open
wants to merge 4 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
  •  
  •  
  •  
1 change: 1 addition & 0 deletions capi.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright 2014 <chaishushan{AT}gmail.com>. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
// version libwebp 1.2.1

// +build cgo

Expand Down
5 changes: 3 additions & 2 deletions capi.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@
// Go1.6:
// https://github.com/golang/proposal/blob/master/design/12416-cgo-pointers.md
//
// libwebp version 1.2.1

package webp

/*
#cgo CFLAGS: -I./internal/libwebp-1.0.2/
#cgo CFLAGS: -I./internal/libwebp-1.0.2/src/
#cgo CFLAGS: -I./internal/libwebp-1.2.1/
#cgo CFLAGS: -I./internal/libwebp-1.2.1/src/
#cgo CFLAGS: -I./internal/include/
#cgo CFLAGS: -Wno-pointer-sign -DWEBP_USE_THREAD
#cgo !windows LDFLAGS: -lm
Expand Down
7 changes: 5 additions & 2 deletions gen_helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ func main() {
printOldGenFiles()
}

const wver="1.2.1"
func clearOldGenFiles() {
ss, err := filepath.Glob("z_*.c")
if err != nil {
Expand All @@ -38,8 +39,10 @@ func clearOldGenFiles() {
}

func genIncludeFiles() {
ss := parseCMakeListsTxt("internal/libwebp-1.0.2/CMakeLists.txt", "WEBP_SRC_DIR", "*.c")
muxSS, err := findFiles("internal/libwebp-1.0.2/src/mux", "*.c")
s1:=fmt.Sprintf("internal/libwebp-%s/CMakeLists.txt",wver)
s2:=fmt.Sprintf("internal/libwebp-%s/src/mux",wver)
ss := parseCMakeListsTxt(s1, "WEBP_SRC_DIR", "*.c")
muxSS, err := findFiles(s2, "*.c")
if err != nil {
log.Fatal(err)
}
Expand Down
6 changes: 6 additions & 0 deletions internal/libwebp-1.2.1/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.gitattributes export-ignore
.gitignore export-ignore
.mailmap export-ignore
*.bat text eol=crlf
*.pdf -text -diff
*.ppm -text -diff
54 changes: 54 additions & 0 deletions internal/libwebp-1.2.1/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
*.l[ao]
*.[ao]
*.pc
.DS_Store
.deps
.libs
/aclocal.m4
/ar-lib
/autom4te.cache
/compile
/config.*
/configure
/depcomp
/dist
/install-sh
/libtool
/ltmain.sh
/missing
/mkinstalldirs
/stamp-h1
Makefile
Makefile.in
examples/anim_diff
examples/anim_dump
examples/[cdv]webp
examples/gif2webp
examples/img2webp
examples/webpinfo
examples/webpmux
src/webp/config.h*
src/webp/stamp-h1
/output
/doc/output
*.idb
*.pdb
/iosbuild
/xcframeworkbuild
/WebP*.*framework
CMakeCache.txt
CMakeFiles/
cmake_install.cmake
.gradle
/build
extras/get_disto
extras/vwebp_sdl
extras/webp_quality
tests/fuzzer/advanced_api_fuzzer
tests/fuzzer/animation_api_fuzzer
tests/fuzzer/animdecoder_fuzzer
tests/fuzzer/animencoder_fuzzer
tests/fuzzer/demux_api_fuzzer
tests/fuzzer/enc_dec_fuzzer
tests/fuzzer/mux_demux_api_fuzzer
tests/fuzzer/simple_api_fuzzer
14 changes: 14 additions & 0 deletions internal/libwebp-1.2.1/.mailmap
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Johann Koenig <johann.koenig@duck.com>
Johann Koenig <johann.koenig@duck.com> <johannkoenig@google.com>
Mikołaj Zalewski <mikolajz@google.com>
Pascal Massimino <pascal.massimino@gmail.com>
Pascal Massimino <pascal.massimino@gmail.com> <skal@google.com>
Vikas Arora <vikasa@google.com>
<vikasa@google.com> <vikasa@gmail.com>
<vikasa@google.com> <vikaas.arora@gmail.com>
<slobodan.prijic@imgtec.com> <Slobodan.Prijic@imgtec.com>
<vrabaud@google.com> <vincent.rabaud@gmail.com>
Tamar Levy <tamar.levy@intel.com>
<qrczak@google.com> <qrczak>
Hui Su <huisu@google.com>
James Zern <jzern@google.com>
Loading