New Upstream Snapshot - qoi
Ready changes
Summary
Merged new upstream version: 0+git20221213 (was: 0+git20220615+ds).
Resulting package
Built on 2022-12-30T12:23 (took 3m30s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots libqoi-devapt install -t fresh-snapshots qoi-dbgsymapt install -t fresh-snapshots qoi
Lintian Result
Diff
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 9234e61..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-images/
-stb_image.h
-stb_image_write.h
-qoibench
-qoiconv
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..aaaa5f7
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Dominic Szablewski
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/Makefile b/Makefile
index b570e8b..4dc4f9a 100644
--- a/Makefile
+++ b/Makefile
@@ -10,12 +10,12 @@ all: $(TARGET_BENCH) $(TARGET_CONV)
bench: $(TARGET_BENCH)
-$(TARGET_BENCH):$(TARGET_BENCH).c $(LFLAGS_BENCH)
- $(CC) $(CFLAGS_BENCH) $(TARGET_BENCH).c -o $(TARGET_BENCH) $(LFLAGS_BENCH)
+$(TARGET_BENCH):$(TARGET_BENCH).c
+ $(CC) $(CFLAGS_BENCH) $(CFLAGS) $(TARGET_BENCH).c -o $(TARGET_BENCH) $(LFLAGS_BENCH)
conv: $(TARGET_CONV)
$(TARGET_CONV):$(TARGET_CONV).c
- $(CC) $(CFLAGS_CONV) $(TARGET_CONV).c -o $(TARGET_CONV)
+ $(CC) $(CFLAGS_CONV) $(CFLAGS) $(TARGET_CONV).c -o $(TARGET_CONV)
.PHONY: clean
clean:
diff --git a/README.md b/README.md
index 8d4ad23..1dcf231 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,16 @@ converts between png <> qoi
a simple wrapper to benchmark stbi, libpng and qoi
+## MIME Type, File Extension
+
+The recommended MIME type for QOI images is `image/qoi`. While QOI is not yet
+officially registered with IANA, I believe QOI has found enough adoption to
+prevent any future image format from choosing the same name, thus making a
+MIME type collision highly unlikely ([see #167](https://github.com/phoboslab/qoi/issues/167)).
+
+The recommended file extension for QOI images is `.qoi`
+
+
## Limitations
The QOI file format allows for huge images with up to 18 exa-pixels. A streaming
@@ -57,82 +67,93 @@ either, as this "reference implementation" tries to be as easy to read as possib
## Tools
-- https://github.com/floooh/qoiview - native QOI viewer
-- https://github.com/pfusik/qoi-ci/releases/tag/qoi-ci-1.1.1 - QOI Plugin installer for GIMP, Imagine, Paint.NET and XnView MP
-- https://github.com/iOrange/QoiFileTypeNet/releases/tag/v0.2 - QOI Plugin for Paint.NET
-- https://github.com/iOrange/QOIThumbnailProvider - Add thumbnails for QOI images in Windows Explorer
-- https://github.com/Tom94/tev - another native QOI viewer (allows pixel peeping and comparison with other image formats)
-- https://apps.apple.com/br/app/qoiconverterx/id1602159820 QOI <=> PNG converter available on the Mac App Store
-- https://github.com/kaetemi/qoi-max - QOI Bitmap I/O Plugin for 3ds Max
-- https://raylibtech.itch.io/rtexviewer - texture viewer, supports QOI
-- https://raylibtech.itch.io/rtexpacker - texture packer, supports QOI
-- https://github.com/DmitriySalnikov/godot_qoi - QOI GDNative Addon for Godot Engine
-- https://gitlab.com/dan9er/farbfeld-convert-qoi - QOI <=> farbfeld converter
-- https://github.com/xiaozhuai/jetbrains-qoi - [QOI Support](https://plugins.jetbrains.com/plugin/19352-qoi-support) for Jetbrains' IDE.
-
+- [floooh/qoiview](https://github.com/floooh/qoiview) - native QOI viewer
+- [pfusik/qoi-ci](https://github.com/pfusik/qoi-ci/releases) - QOI Plugin installer for Windows Explorer, Finder, GNOME, GIMP, Imagine, Paint.NET and XnView
+- [iOrange/QoiFileTypeNet](https://github.com/iOrange/QoiFileTypeNet/releases) - QOI Plugin for Paint.NET
+- [iOrange/QOIThumbnailProvider](https://github.com/iOrange/QOIThumbnailProvider) - Add thumbnails for QOI images in Windows Explorer
+- [Tom94/tev](https://github.com/Tom94/tev) - another native QOI viewer (allows pixel peeping and comparison with other image formats)
+- [qoiconverterx](https://apps.apple.com/br/app/qoiconverterx/id1602159820) QOI <=> PNG converter available on the Mac App Store
+- [kaetemi/qoi-ma](https://github.com/kaetemi/qoi-max) - QOI Bitmap I/O Plugin for 3ds Max
+- [rtexviewer](https://raylibtech.itch.io/rtexviewer) - texture viewer, supports QOI
+- [rtexpacker](https://raylibtech.itch.io/rtexpacker) - texture packer, supports QOI
+- [DmitriySalnikov/godot_qoi](https://github.com/DmitriySalnikov/godot_qoi) - QOI GDNative Addon for Godot Engine
+- [dan9er/farbfeld-convert-qoi](https://gitlab.com/dan9er/farbfeld-convert-qoi) - QOI <=> farbfeld converter
+- [Ben1138/unity-qo](https://github.com/Ben1138/unity-qoi) - QOI support for the Unity3D Game Engine
+- [xiaozhuai/jetbrains-qo](https://github.com/xiaozhuai/jetbrains-qoi) - [QOI Support](https://plugins.jetbrains.com/plugin/19352-qoi-support) for Jetbrains' IDE.
+- [serge-ivamov/QOIql](https://github.com/serge-ivamov/QOIql) - MacOS QuickLook plugin for QOI
+- [tobozo/kde-thumbnailer-qoi](https://github.com/tobozo/kde-thumbnailer-qoi) - QOI Thumbnailer for KDE
+- [walksanatora/qoi-thumbnailer-nemo](https://github.com/walksanatora/qoi-thumbnailer-nemo) - QOI Thumbnailer for Nemo
+- [hzeller/timg](https://github.com/hzeller/timg) - a terminal image viewer with QOI support
+- [LuisAlfredo92/Super-QOI-converter](https://github.com/LuisAlfredo92/Super-QOI-converter "LuisAlfredo92/Super-QOI-converter") - A program to convert JPG, JPEG, BMP, and PNG to QOI
+ - [Console version](https://github.com/LuisAlfredo92/Super-QOI-converter-Console- "Console version"): Available for Linux, OSX and Windows
+ - [GUI version](https://github.com/LuisAlfredo92/Super-QOI-converter-GUI- "GUI version"): Available only for windows
## Implementations & Bindings of QOI
-- https://github.com/pfusik/qoi-ci (Ć, transpiled to C, C++, C#, Java, JavaScript, Python and Swift)
-- https://github.com/kodonnell/qoi (Python)
-- https://github.com/JaffaKetchup/dqoi (Dart, with Flutter support)
-- https://github.com/Cr4xy/lua-qoi (Lua)
-- https://github.com/superzazu/SDL_QOI (C, SDL2 bindings)
-- https://github.com/saharNooby/qoi-java (Java)
-- https://github.com/MasterQ32/zig-qoi (Zig)
-- https://github.com/rbino/qoix (Elixir)
-- https://github.com/NUlliiON/QoiSharp (C#)
-- https://github.com/aldanor/qoi-rust (Rust)
-- https://github.com/zakarumych/rapid-qoi (Rust)
-- https://github.com/takeyourhatoff/qoi (Go)
-- https://github.com/DosWorld/pasqoi (Pascal)
-- https://github.com/elihwyma/Swift-QOI (Swift)
-- https://github.com/xfmoulet/qoi (Go)
-- https://erratique.ch/software/qoic (OCaml)
-- https://github.com/arian/go-qoi (Go)
-- https://github.com/kchapelier/qoijs (JavaScript)
-- https://github.com/KristofferC/QOI.jl (Julia)
-- https://github.com/shadowMitia/libqoi/ (C++)
-- https://github.com/MKCG/php-qoi (PHP)
-- https://github.com/LightHouseSoftware/qoiformats (D)
-- https://github.com/mhoward540/qoi-nim (Nim)
-- https://github.com/wx257osn2/qoixx (C++)
-- https://github.com/Tiefseetauchner/lr-paint (Processing)
-- https://github.com/amstan/qoi-fpga (FPGA: verilog)
-- https://github.com/musabkilic/qoi-decoder (Python)
-- https://github.com/mathpn/py-qoi (Python)
-- https://github.com/JohannesFriedrich/qoi4R (R)
-- https://github.com/shraiwi/mini-qoi (C, streaming decoder)
-- https://github.com/10maurycy10/libqoi/ (Rust)
-- https://github.com/0xd34df00d/hsqoi (Haskell)
-- https://github.com/418Coffee/qoi-v (V)
-- https://github.com/Imagine-Programming/QoiImagePlugin (PureBasic)
-- https://github.com/Fabien-Chouteau/qoi-spark (Ada/SPARK formally proven)
+- [pfusik/qoi-ci](https://github.com/pfusik/qoi-ci) - Ć, transpiled to C, C++, C#, Java, JavaScript, Python and Swift
+- [kodonnell/qoi](https://github.com/kodonnell/qoi) - Python
+- [JaffaKetchup/dqoi](https://github.com/JaffaKetchup/dqoi) - Dart, with Flutter support
+- [Cr4xy/lua-qoi](https://github.com/Cr4xy/lua-qoi) - Lua
+- [superzazu/SDL_QOI](https://github.com/superzazu/SDL_QOI) - C, SDL2 bindings
+- [saharNooby/qoi-java](https://github.com/saharNooby/qoi-java) - Java
+- [MasterQ32/zig-qoi](https://github.com/MasterQ32/zig-qoi) - Zig
+- [rbino/qoix](https://github.com/rbino/qoix) - Elixir
+- [NUlliiON/QoiSharp](https://github.com/NUlliiON/QoiSharp) - C#
+- [aldanor/qoi-rust](https://github.com/aldanor/qoi-rust) - Rust
+- [zakarumych/rapid-qoi](https://github.com/zakarumych/rapid-qoi) - Rust
+- [takeyourhatoff/qoi](https://github.com/takeyourhatoff/qoi) - Go
+- [DosWorld/pasqoi](https://github.com/DosWorld/pasqoi) - Pascal
+- [elihwyma/Swift-QOI](https://github.com/elihwyma/Swift-QOI) - Swift
+- [xfmoulet/qoi](https://github.com/xfmoulet/qoi) - Go
+- [erratique.ch/qoic](https://erratique.ch/software/qoic) - OCaml
+- [arian/go-qoi](https://github.com/arian/go-qoi) - Go
+- [kchapelier/qoijs](https://github.com/kchapelier/qoijs) - JavaScript
+- [KristofferC/QOI.jl](https://github.com/KristofferC/QOI.jl) - Julia
+- [shadowMitia/libqoi](https://github.com/shadowMitia/libqoi) - C++
+- [MKCG/php-qoi](https://github.com/MKCG/php-qoi) - PHP
+- [LightHouseSoftware/qoiformats](https://github.com/LightHouseSoftware/qoiformats) - D
+- [mhoward540/qoi-nim](https://github.com/mhoward540/qoi-nim) - Nim
+- [wx257osn2/qoixx](https://github.com/wx257osn2/qoixx) - C++
+- [Tiefseetauchner/lr-paint](https://github.com/Tiefseetauchner/lr-paint) - Processing
+- [amstan/qoi-fpga](https://github.com/amstan/qoi-fpga) - FPGA: verilog
+- [musabkilic/qoi-decoder](https://github.com/musabkilic/qoi-decoder) - Python
+- [mathpn/py-qoi](https://github.com/mathpn/py-qoi) - Python
+- [JohannesFriedrich/qoi4R](https://github.com/JohannesFriedrich/qoi4R) - R
+- [shraiwi/mini-qoi](https://github.com/shraiwi/mini-qoi) - C, streaming decoder
+- [10maurycy10/libqoi/](https://github.com/10maurycy10/libqoi/) - Rust
+- [0xd34df00d/hsqoi](https://github.com/0xd34df00d/hsqoi) - Haskell
+- [418Coffee/qoi-v](https://github.com/418Coffee/qoi-v) - V
+- [Imagine-Programming/QoiImagePlugin](https://github.com/Imagine-Programming/QoiImagePlugin) - PureBasic
+- [Fabien-Chouteau/qoi-spark](https://github.com/Fabien-Chouteau/qoi-spark) - Ada/SPARK formally proven
+- [mzgreen/qoi-kotlin](https://github.com/mzgreen/qoi-kotlin) - Kotlin Multiplatform
+- [Aftersol/Simplified-QOI-Codec](https://github.com/Aftersol/Simplified-QOI-Codec) - C99, streaming encoder and decoder, freestanding
+- [AuburnSounds/gamut](https://github.com/AuburnSounds/gamut) - D
+- [AngusJohnson/TQoiImage](https://github.com/AngusJohnson/TQoiImage) - Delphi
+- [MarkJeronimus/qoi-java-spi](https://github.com/MarkJeronimus/qoi-java-spi) - Java SPI
+- [aumouvantsillage/qoi-racket](https://github.com/aumouvantsillage/qoi-racket) - Racket
+- [rubikscraft/qoi-stream](https://github.com/rubikscraft/qoi-stream) - C99, one byte at a time streaming encoder and decoder
+- [rubikscraft/qoi-img](https://github.com/rubikscraft/qoi-img) - NodeJS typescript, bindings to both [QOIxx](https://github.com/wx257osn2/qoixx) and [qoi-stream](https://github.com/rubikscraft/qoi-stream)
## QOI Support in Other Software
-- [Amiga OS QOI datatype](https://github.com/dgaw/qoi-datatype) adds support for decoding QOI images to the Amiga operating system.
-- [SerenityOS](https://github.com/SerenityOS/serenity) supports decoding QOI system wide through a custom [cpp implementation in LibGfx](https://github.com/SerenityOS/serenity/blob/master/Userland/Libraries/LibGfx/QOILoader.h)
-- [Raylib](https://github.com/raysan5/raylib) supports decoding and encoding QOI textures through its [rtextures module](https://github.com/raysan5/raylib/blob/master/src/rtextures.c)
-- [Rebol3](https://github.com/Oldes/Rebol3/issues/39) supports decoding and encoding QOI using a native codec
-- [c-ray](https://github.com/vkoskiv/c-ray) supports QOI natively
-- [SAIL](https://sail.software) image decoding library, supports decoding and encoding QOI images
-- [Orx](https://github.com/orx/orx) 2D game engine, supports QOI natively
-- [IrfanView](https://www.irfanview.com) supports decoding and encoding QOI through its Formats plugin
-- [ImageMagick](https://github.com/ImageMagick/ImageMagick) supports decoding and encoding QOI, since 7.1.0-20
-- [barebox](https://barebox.org) bootloader, supports decoding QOI images for splash logo, since v2022.03.0
-- [KorGE](https://korge.org) & KorIM Kotlin 2D game engine and imaging library, supports decoding and encoding QOI natively since 2.7.0
-- [DOjS](https://github.com/SuperIlu/DOjS) DOS JavaScript Canvas implementation supports loading QOI files
-- [XnView MP](https://www.xnview.com/en/xnviewmp/) supports decoding QOI since 1.00
+- [Amiga OS QOI datatype](https://github.com/dgaw/qoi-datatype) - adds support for decoding QOI images to the Amiga operating system.
+- [SerenityOS](https://github.com/SerenityOS/serenity) - supports decoding QOI system wide through a custom [cpp implementation in LibGfx](https://github.com/SerenityOS/serenity/blob/master/Userland/Libraries/LibGfx/QOILoader.h)
+- [Raylib](https://github.com/raysan5/raylib) - supports decoding and encoding QOI textures through its [rtextures module](https://github.com/raysan5/raylib/blob/master/src/rtextures.c)
+- [Rebol3](https://github.com/Oldes/Rebol3/issues/39) - supports decoding and encoding QOI using a native codec
+- [c-ray](https://github.com/vkoskiv/c-ray) - supports QOI natively
+- [SAIL](https://sail.software) - image decoding library, supports decoding and encoding QOI images
+- [Orx](https://github.com/orx/orx) - 2D game engine, supports QOI natively
+- [IrfanView](https://www.irfanview.com) - supports decoding and encoding QOI through its Formats plugin
+- [ImageMagick](https://github.com/ImageMagick/ImageMagick) - supports decoding and encoding QOI, since 7.1.0-20
+- [barebox](https://barebox.org) - bootloader, supports decoding QOI images for splash logo, since v2022.03.0
+- [KorGE](https://korge.org) - & KorIM Kotlin 2D game engine and imaging library, supports decoding and encoding QOI natively since 2.7.0
+- [DOjS](https://github.com/SuperIlu/DOjS) - DOS JavaScript Canvas implementation supports loading QOI files
+- [XnView MP](https://www.xnview.com/en/xnviewmp/) - supports decoding QOI since 1.00
## Packages
-[AUR](https://aur.archlinux.org/pkgbase/qoi-git/) - system-wide qoi.h, qoiconv and qoibench install as split packages.
-
-
-## Implementations not yet conforming to the final specification
-
-These implementations are based on the pre-release version of QOI. Resulting files are not compatible with the current version.
+- [AUR](https://aur.archlinux.org/pkgbase/qoi-git/) - system-wide qoi.h, qoiconv and qoibench install as split packages.
+- [Debian](https://packages.debian.org/bookworm/source/qoi) - packages for binaries and qoi.h
+- [Ubuntu](https://launchpad.net/ubuntu/+source/qoi) - packages for binaries and qoi.h
-- https://github.com/ChevyRay/qoi_rs (Rust)
-- https://github.com/panzi/jsqoi (TypeScript)
+Packages for other systems [tracked at Repology](https://repology.org/project/qoi/versions).
diff --git a/debian/changelog b/debian/changelog
index 04faaac..00e8ecd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qoi (0+git20221213-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk> Fri, 30 Dec 2022 12:21:00 -0000
+
qoi (0+git20220615+ds-3) unstable; urgency=medium
* Really source only upload.
diff --git a/debian/patches/drop-o3-add-debug b/debian/patches/drop-o3-add-debug
index e0b3a13..219614f 100644
--- a/debian/patches/drop-o3-add-debug
+++ b/debian/patches/drop-o3-add-debug
@@ -24,8 +24,10 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2022-06-15
---- qoi-0+git20220615+ds.orig/Makefile
-+++ qoi-0+git20220615+ds/Makefile
+Index: qoi.git/Makefile
+===================================================================
+--- qoi.git.orig/Makefile
++++ qoi.git/Makefile
@@ -1,7 +1,7 @@
CC ?= gcc
-CFLAGS_BENCH ?= -std=gnu99 -O3 -I/usr/include/stb
diff --git a/debian/patches/stb-path b/debian/patches/stb-path
index a01dc1d..02e6cb6 100644
--- a/debian/patches/stb-path
+++ b/debian/patches/stb-path
@@ -23,8 +23,10 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2022-06-15
---- qoi-0+git20220615+ds.orig/Makefile
-+++ qoi-0+git20220615+ds/Makefile
+Index: qoi.git/Makefile
+===================================================================
+--- qoi.git.orig/Makefile
++++ qoi.git/Makefile
@@ -1,7 +1,7 @@
CC ?= gcc
-CFLAGS_BENCH ?= -std=gnu99 -O3
diff --git a/qoi.h b/qoi.h
index 31d4ce5..6734ac4 100644
--- a/qoi.h
+++ b/qoi.h
@@ -1,30 +1,10 @@
/*
-QOI - The "Quite OK Image" format for fast, lossless image compression
-
-Dominic Szablewski - https://phoboslab.org
-
+Copyright (c) 2021, Dominic Szablewski - https://phoboslab.org
+SPDX-License-Identifier: MIT
--- LICENSE: The MIT License(MIT)
-
-Copyright(c) 2021 Dominic Szablewski
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files(the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and / or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions :
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+QOI - The "Quite OK Image" format for fast, lossless image compression
-- About
diff --git a/qoibench.c b/qoibench.c
index 81fed6d..05762c6 100644
--- a/qoibench.c
+++ b/qoibench.c
@@ -1,34 +1,15 @@
/*
+Copyright (c) 2021, Dominic Szablewski - https://phoboslab.org
+SPDX-License-Identifier: MIT
+
+
Simple benchmark suite for png, stbi and qoi
Requires libpng, "stb_image.h" and "stb_image_write.h"
Compile with:
gcc qoibench.c -std=gnu99 -lpng -O3 -o qoibench
-Dominic Szablewski - https://phoboslab.org
-
-
--- LICENSE: The MIT License(MIT)
-
-Copyright(c) 2021 Dominic Szablewski
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files(the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and / or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions :
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
*/
#include <stdio.h>
@@ -431,7 +412,7 @@ benchmark_result_t benchmark_image(const char *path) {
}, &encoded_qoi_size);
if (!pixels || !encoded_qoi || !encoded_png) {
- ERROR("Error decoding %s", path);
+ ERROR("Error encoding %s", path);
}
// Verify QOI Output
diff --git a/qoiconv.c b/qoiconv.c
index f5fa93b..caef2ee 100644
--- a/qoiconv.c
+++ b/qoiconv.c
@@ -1,5 +1,9 @@
/*
+Copyright (c) 2021, Dominic Szablewski - https://phoboslab.org
+SPDX-License-Identifier: MIT
+
+
Command line tool to convert between png <> qoi format
Requires:
@@ -10,29 +14,6 @@ Requires:
Compile with:
gcc qoiconv.c -std=c99 -O3 -o qoiconv
-Dominic Szablewski - https://phoboslab.org
-
-
--- LICENSE: The MIT License(MIT)
-
-Copyright(c) 2021 Dominic Szablewski
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files(the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and / or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions :
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
*/
diff --git a/qoifuzz.c b/qoifuzz.c
index 1b5c792..69954d1 100644
--- a/qoifuzz.c
+++ b/qoifuzz.c
@@ -1,33 +1,14 @@
/*
+Copyright (c) 2021, Dominic Szablewski - https://phoboslab.org
+SPDX-License-Identifier: MIT
+
+
clang fuzzing harness for qoi_decode
Compile and run with:
clang -fsanitize=address,fuzzer -g -O0 qoifuzz.c && ./a.out
-Dominic Szablewski - https://phoboslab.org
-
-
--- LICENSE: The MIT License(MIT)
-
-Copyright(c) 2021 Dominic Szablewski
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files(the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and / or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions :
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
*/
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/lib/debug/.build-id/a7/43577fa822ea1873391fb21fdf48a65c309dcc.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/be/f86193832dd9d433d4cbdb0ba31ca71c859085.debug
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/lib/debug/.build-id/a8/78b4153b36af24a27f1ea828e968fe72e7e3ff.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/ac/dec23cf532167ed739dcfff94e135ee77faf0f.debug
No differences were encountered between the control files of package libqoi-dev
Control files of package qoi: lines which differ (wdiff format)
Depends: libc6 (>= 2.17), 2.34), libpng16-16 (>= 1.6.2-1)
Control files of package qoi-dbgsym: lines which differ (wdiff format)
Build-Ids: a878b4153b36af24a27f1ea828e968fe72e7e3ff acdec23cf532167ed739dcfff94e135ee77faf0f a743577fa822ea1873391fb21fdf48a65c309dcc bef86193832dd9d433d4cbdb0ba31ca71c859085