commit: d2cd6dbc4a29dbb6c239c47d38cf161b3a603f83 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Sat Aug 15 09:17:06 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Aug 16 07:19:38 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2cd6dbc
media-libs/libheif: run tests on <1.7.0 Package-Manager: Portage-2.3.99, Repoman-2.3.23 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> Closes: https://github.com/gentoo/gentoo/pull/17122/commits/d17ef92b2d7cb5e5b36f64f3e383da6820a3d5c0 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/libheif/files/heif_test.go | 155 ++++++++++++++++++++++++++++++++ media-libs/libheif/libheif-1.5.1.ebuild | 13 ++- media-libs/libheif/libheif-1.6.1.ebuild | 12 ++- media-libs/libheif/libheif-1.6.2.ebuild | 12 ++- 4 files changed, 188 insertions(+), 4 deletions(-) diff --git a/media-libs/libheif/files/heif_test.go b/media-libs/libheif/files/heif_test.go new file mode 100644 index 00000000000..187d773dea6 --- /dev/null +++ b/media-libs/libheif/files/heif_test.go @@ -0,0 +1,155 @@ +/* + * GO interface to libheif + * Copyright (c) 2018 struktur AG, Joachim Bauch <ba...@struktur.de> + * + * This file is part of heif, an example application using libheif. + * + * heif is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * heif is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with heif. If not, see <http://www.gnu.org/licenses/>. + */ + +package heif + +import ( + "fmt" + "image" + "io/ioutil" + "os" + "path" + "testing" +) + +func TestGetVersion(t *testing.T) { + version := GetVersion() + if version == "" { + t.Fatal("Version is missing") + } +} + +func CheckHeifImage(t *testing.T, handle *ImageHandle, thumbnail bool) { + handle.GetWidth() + handle.GetHeight() + handle.HasAlphaChannel() + handle.HasDepthImage() + count := handle.GetNumberOfDepthImages() + if ids := handle.GetListOfDepthImageIDs(); len(ids) != count { + t.Errorf("Expected %d depth image ids, got %d", count, len(ids)) + } + if !thumbnail { + count = handle.GetNumberOfThumbnails() + ids := handle.GetListOfThumbnailIDs() + if len(ids) != count { + t.Errorf("Expected %d thumbnail image ids, got %d", count, len(ids)) + } + for _, id := range ids { + if thumb, err := handle.GetThumbnail(id); err != nil { + t.Errorf("Could not get thumbnail %d: %s", id, err) + } else { + CheckHeifImage(t, thumb, true) + } + } + } + + if img, err := handle.DecodeImage(ColorspaceUndefined, ChromaUndefined, nil); err != nil { + t.Errorf("Could not decode image: %s", err) + } else { + img.GetColorspace() + img.GetChromaFormat() + } +} + +func CheckHeifFile(t *testing.T, ctx *Context) { + if count := ctx.GetNumberOfTopLevelImages(); count != 2 { + t.Errorf("Expected %d top level images, got %d", 2, count) + } + if ids := ctx.GetListOfTopLevelImageIDs(); len(ids) != 2 { + t.Errorf("Expected %d top level image ids, got %+v", 2, ids) + } + if _, err := ctx.GetPrimaryImageID(); err != nil { + t.Errorf("Expected a primary image, got %s", err) + } + if handle, err := ctx.GetPrimaryImageHandle(); err != nil { + t.Errorf("Could not get primary image handle: %s", err) + } else { + if !handle.IsPrimaryImage() { + t.Error("Expected primary image") + } + CheckHeifImage(t, handle, false) + } +} + +func TestReadFromFile(t *testing.T) { + ctx, err := NewContext() + if err != nil { + t.Fatalf("Can't create context: %s", err) + } + + filename := path.Join("..", "..", "examples", "example.heic") + if err := ctx.ReadFromFile(filename); err != nil { + t.Fatalf("Can't read from %s: %s", filename, err) + } + + CheckHeifFile(t, ctx) +} + +func TestReadFromMemory(t *testing.T) { + ctx, err := NewContext() + if err != nil { + t.Fatalf("Can't create context: %s", err) + } + + filename := path.Join("..", "..", "examples", "example.heic") + data, err := ioutil.ReadFile(filename) + if err != nil { + t.Fatalf("Can't read file %s: %s", filename, err) + } + if err := ctx.ReadFromMemory(data); err != nil { + t.Fatalf("Can't read from memory: %s", err) + } + data = nil // Make sure future processing works if "data" is GC'd + + CheckHeifFile(t, ctx) +} + +func TestReadImage(t *testing.T) { + filename := path.Join("..", "..", "examples", "example.heic") + fp, err := os.Open(filename) + if err != nil { + t.Fatalf("Could not open %s: %s", filename, err) + } + defer fp.Close() + + config, format1, err := image.DecodeConfig(fp) + if err != nil { + t.Fatalf("Could not load image config from %s: %s", filename, err) + } + if format1 != "heif" { + t.Errorf("Expected format heif, got %s", format1) + } + if _, err := fp.Seek(0, 0); err != nil { + t.Fatalf("Could not seek to start of %s: %s", filename, err) + } + + img, format2, err := image.Decode(fp) + if err != nil { + t.Fatalf("Could not load image from %s: %s", filename, err) + } + if format2 != "heif" { + t.Errorf("Expected format heif, got %s", format2) + } + + r := img.Bounds() + if config.Width != (r.Max.X-r.Min.X) || config.Height != (r.Max.Y-r.Min.Y) { + fmt.Printf("Image size %+v does not match config %+v\n", r, config) + } +} diff --git a/media-libs/libheif/libheif-1.5.1.ebuild b/media-libs/libheif/libheif-1.5.1.ebuild index e737b4ce1e4..ea2fa1ddafb 100644 --- a/media-libs/libheif/libheif-1.5.1.ebuild +++ b/media-libs/libheif/libheif-1.5.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 inherit autotools xdg-utils multilib-minimal @@ -34,6 +34,10 @@ RDEPEND="${DEPEND}" src_prepare() { default + # heif_test.go is not included in the tarball + # https://github.com/strukturag/libheif/issues/289 + cp "${FILESDIR}/heif_test.go" "${S}/go/heif" || die + sed -i -e 's:-Werror::' \ configure.ac || die @@ -51,6 +55,11 @@ multilib_src_configure() { ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } +multilib_src_test() { + default + emake -C go test +} + multilib_src_install_all() { find "${ED}" -name '*.la' -delete || die if ! use static-libs ; then diff --git a/media-libs/libheif/libheif-1.6.1.ebuild b/media-libs/libheif/libheif-1.6.1.ebuild index 07885456ea4..68966c34be8 100644 --- a/media-libs/libheif/libheif-1.6.1.ebuild +++ b/media-libs/libheif/libheif-1.6.1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 inherit autotools xdg-utils multilib-minimal @@ -19,6 +19,7 @@ HOMEPAGE="https://github.com/strukturag/libheif"; LICENSE="GPL-3" SLOT="0/1.6" IUSE="static-libs test +threads" + RESTRICT="!test? ( test )" BDEPEND="test? ( dev-lang/go )" @@ -34,6 +35,10 @@ RDEPEND="${DEPEND}" src_prepare() { default + # heif_test.go is not included in the tarball + # https://github.com/strukturag/libheif/issues/289 + cp "${FILESDIR}/heif_test.go" "${S}/go/heif" || die + sed -i -e 's:-Werror::' configure.ac || die eautoreconf @@ -50,6 +55,11 @@ multilib_src_configure() { ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } +multilib_src_test() { + default + emake -C go test +} + multilib_src_install_all() { find "${ED}" -name '*.la' -delete || die if ! use static-libs ; then diff --git a/media-libs/libheif/libheif-1.6.2.ebuild b/media-libs/libheif/libheif-1.6.2.ebuild index f82ec6214c6..3644fcb74e4 100644 --- a/media-libs/libheif/libheif-1.6.2.ebuild +++ b/media-libs/libheif/libheif-1.6.2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 inherit autotools xdg-utils multilib-minimal @@ -19,6 +19,7 @@ HOMEPAGE="https://github.com/strukturag/libheif"; LICENSE="GPL-3" SLOT="0/1.6" IUSE="static-libs test +threads" + RESTRICT="!test? ( test )" BDEPEND="test? ( dev-lang/go )" @@ -34,6 +35,10 @@ RDEPEND="${DEPEND}" src_prepare() { default + # heif_test.go is not included in the tarball + # https://github.com/strukturag/libheif/issues/289 + cp "${FILESDIR}/heif_test.go" "${S}/go/heif" || die + sed -i -e 's:-Werror::' configure.ac || die eautoreconf @@ -50,6 +55,11 @@ multilib_src_configure() { ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } +multilib_src_test() { + default + emake -C go test +} + multilib_src_install_all() { find "${ED}" -name '*.la' -delete || die if ! use static-libs ; then
