feat(image): remove stb_image and libwebp in favor of wuffs

CMakeLists.txt

@@ -29,7 +29,6 @@ pkg_check_modules(HARFBUZZ REQUIRED harfbuzz)
 pkg_check_modules(FONTCONFIG REQUIRED fontconfig)
 pkg_check_modules(XKBCOMMON REQUIRED xkbcommon)
 pkg_check_modules(LIBPIPEWIRE REQUIRED libpipewire-0.3)
-pkg_check_modules(LIBWEBP REQUIRED libwebp)
 find_package(CURL REQUIRED)
 find_library(PAM_LIBRARY NAMES pam REQUIRED)
 
@@ -329,6 +328,7 @@ add_executable(noctalia
     src/render/animation/animation_manager.cpp
     src/render/core/shader_program.cpp
     src/render/core/texture_manager.cpp
+    src/render/core/wuffs_image_decoder.cpp
     src/render/image_loaders.cpp
     src/render/programs/image_program.cpp
     src/render/programs/linear_gradient_program.cpp
@@ -431,9 +431,9 @@ add_dependencies(noctalia noctalia_wayland_protocols)
 
 target_include_directories(noctalia PRIVATE
     src
-    third_party/stb
     third_party/nanosvg
     third_party/tomlplusplus
+    third_party/wuffs
     "${GENERATED_PROTOCOL_DIR}"
     ${WAYLAND_CLIENT_INCLUDE_DIRS}
     ${EGL_INCLUDE_DIRS}
@@ -443,7 +443,6 @@ target_include_directories(noctalia PRIVATE
     ${HARFBUZZ_INCLUDE_DIRS}
     ${FONTCONFIG_INCLUDE_DIRS}
     ${XKBCOMMON_INCLUDE_DIRS}
-    ${LIBWEBP_INCLUDE_DIRS}
 )
 # PipeWire/SPA headers use GCC extensions (compound-literals, statement-
 # expressions) that trigger -Wpedantic/-Wconversion. Mark them as system
@@ -469,7 +468,6 @@ target_link_libraries(noctalia PRIVATE
     ${FONTCONFIG_LIBRARIES}
     ${XKBCOMMON_LIBRARIES}
     ${LIBPIPEWIRE_LIBRARIES}
-    ${LIBWEBP_LIBRARIES}
     CURL::libcurl
     ${PAM_LIBRARY}
 )
@@ -482,7 +480,6 @@ target_compile_options(noctalia PRIVATE
     ${HARFBUZZ_CFLAGS_OTHER}
     ${FONTCONFIG_CFLAGS_OTHER}
     ${LIBPIPEWIRE_CFLAGS_OTHER}
-    ${LIBWEBP_CFLAGS_OTHER}
 )
 
 target_compile_options(noctalia PRIVATE

README.md

@@ -21,7 +21,7 @@ A lightweight Wayland shell and bar with no Qt or GTK dependency.
 | Cursor | `wp-cursor-shape-v1` |
 | Rendering | `EGL`, `OpenGL ES 3`, `wayland-egl` |
 | Text | `freetype`, `harfbuzz`, `msdfgen` (vendored), `fontconfig` |
-| Images | `stb_image` (vendored), `nanosvg` (vendored) |
+| Images | `Wuffs` (vendored), `nanosvg` (vendored) |
 | IPC | `sdbus-c++` |
 | Audio | `libpipewire` |
 | Config | `tomlplusplus` (vendored) |
@@ -57,7 +57,7 @@ sudo apt install cmake g++ just \
   libsdbus-c++-dev libasan8 libubsan1 libcurl4-openssl-dev
 ```
 
-Vendored (no system package needed): `msdfgen`, `stb`, `nanosvg`, `tomlplusplus`.
+Vendored (no system package needed): `msdfgen`, `Wuffs`, `nanosvg`, `tomlplusplus`.
 
 ## Build
 
@@ -140,7 +140,7 @@ src/
 third_party/
   msdfgen/       MSDF glyph generation (git submodule)
   tomlplusplus/  TOML parser (vendored)
-  stb/           Image loading (vendored)
+  wuffs/         Raster image decoding (vendored)
   nanosvg/       SVG rasterization (vendored)
 ```
 

src/render/core/texture_manager.cpp

@@ -10,12 +10,11 @@
 #pragma GCC diagnostic ignored "-Wshadow"
 #include <nanosvg.h>
 #include <nanosvgrast.h>
-#include <stb_image.h>
-#include <webp/decode.h>
 #pragma GCC diagnostic pop
 
+#include "render/core/wuffs_image_decoder.h"
+
 #include <algorithm>
-#include <cstdlib>
 #include <cstring>
 #include <fstream>
 #include <stdexcept>
@@ -53,35 +52,15 @@ TextureHandle TextureManager::decodeEncodedRaster(const std::uint8_t* data, std:
     return {};
   }
 
-  int w = 0;
-  int h = 0;
-  int channels = 0;
-  if (auto* pixels = stbi_load_from_memory(data, static_cast<int>(size), &w, &h, &channels, 4)) {
-    auto handle = uploadRgba(pixels, w, h);
-    stbi_image_free(pixels);
-    return handle;
+  std::string errorMessage;
+  if (auto decoded = decodeRasterImage(data, size, &errorMessage)) {
+    return uploadRgba(decoded->pixels.data(), decoded->width, decoded->height);
   }
 
-  int webpWidth = 0;
-  int webpHeight = 0;
-  if (WebPGetInfo(data, size, &webpWidth, &webpHeight) == 0) {
-    if (debugPath != nullptr) {
-      logWarn("failed to decode image: {}", *debugPath);
-    }
-    return {};
+  if (debugPath != nullptr) {
+    logWarn("failed to decode image: {} ({})", *debugPath, errorMessage);
   }
-
-  std::uint8_t* pixels = WebPDecodeRGBA(data, size, &webpWidth, &webpHeight);
-  if (pixels == nullptr) {
-    if (debugPath != nullptr) {
-      logWarn("failed to decode WebP image: {}", *debugPath);
-    }
-    return {};
-  }
-
-  auto handle = uploadRgba(pixels, webpWidth, webpHeight);
-  WebPFree(pixels);
-  return handle;
+  return {};
 }
 
 TextureManager::~TextureManager() { cleanup(); }
@@ -128,7 +107,7 @@ TextureHandle TextureManager::loadFromFile(const std::string& path, int targetSi
     return uploadRgba(pixels.data(), w, h);
   }
 
-  // PNG/JPEG via stb_image
+  // Raster images via Wuffs' stb-compatible decoder.
   auto fileData = readFile(path);
   if (fileData.empty()) {
     logWarn("failed to read image: {}", path);

src/render/core/wuffs_image_decoder.cpp

@@ -0,0 +1,56 @@
+#include "render/core/wuffs_image_decoder.h"
+
+#include <cstring>
+#include <utility>
+
+#define WUFFS_IMPLEMENTATION
+#include "wuffs-unsupported-snapshot.c"
+
+namespace {
+
+class RgbaDecodeCallbacks final : public wuffs_aux::DecodeImageCallbacks {
+public:
+  wuffs_base__pixel_format SelectPixfmt(
+      const wuffs_base__image_config& imageConfig) override {
+    (void)imageConfig;
+    return wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL);
+  }
+};
+
+} // namespace
+
+std::optional<DecodedRasterImage>
+decodeRasterImage(const std::uint8_t* data, std::size_t size, std::string* errorMessage) {
+  if ((data == nullptr) || (size == 0)) {
+    if (errorMessage != nullptr) {
+      *errorMessage = "empty image buffer";
+    }
+    return std::nullopt;
+  }
+
+  auto input = wuffs_aux::sync_io::MemoryInput(data, size);
+  auto callbacks = RgbaDecodeCallbacks();
+  auto result = wuffs_aux::DecodeImage(callbacks, input);
+  if (!result.error_message.empty()) {
+    if (errorMessage != nullptr) {
+      *errorMessage = result.error_message;
+    }
+    return std::nullopt;
+  }
+
+  auto plane = result.pixbuf.plane(0);
+  if ((plane.ptr == nullptr) || (plane.width == 0) || (plane.height == 0)) {
+    if (errorMessage != nullptr) {
+      *errorMessage = "decoded image has no pixel data";
+    }
+    return std::nullopt;
+  }
+
+  DecodedRasterImage decoded;
+  decoded.width = static_cast<int>(result.pixbuf.pixcfg.width());
+  decoded.height = static_cast<int>(result.pixbuf.pixcfg.height());
+  decoded.pixels.resize(plane.width * plane.height);
+  std::memcpy(decoded.pixels.data(), plane.ptr, decoded.pixels.size());
+  return decoded;
+}
+

src/render/core/wuffs_image_decoder.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+#include <optional>
+#include <string>
+#include <vector>
+
+struct DecodedRasterImage {
+  std::vector<std::uint8_t> pixels;
+  int width = 0;
+  int height = 0;
+};
+
+[[nodiscard]] std::optional<DecodedRasterImage>
+decodeRasterImage(const std::uint8_t* data, std::size_t size, std::string* errorMessage = nullptr);
+

src/render/image_loaders.cpp

@@ -6,12 +6,6 @@
 #pragma GCC diagnostic ignored "-Wshadow"
 #pragma GCC diagnostic ignored "-Wunused-function"
 
-#define STB_IMAGE_IMPLEMENTATION
-#define STBI_ONLY_PNG
-#define STBI_ONLY_JPEG
-#define STBI_NO_STDIO
-#include <stb_image.h>
-
 #define NANOSVG_IMPLEMENTATION
 #include <nanosvg.h>
 

third_party/stb/LICENSE

@@ -1,37 +0,0 @@
-This software is available under 2 licenses -- choose whichever you prefer.
-------------------------------------------------------------------------------
-ALTERNATIVE A - MIT License
-Copyright (c) 2017 Sean Barrett
-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.
-------------------------------------------------------------------------------
-ALTERNATIVE B - Public Domain (www.unlicense.org)
-This is free and unencumbered software released into the public domain.
-Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
-software, either in source code form or as a compiled binary, for any purpose,
-commercial or non-commercial, and by any means.
-In jurisdictions that recognize copyright laws, the author or authors of this
-software dedicate any and all copyright interest in the software to the public
-domain. We make this dedication for the benefit of the public at large and to
-the detriment of our heirs and successors. We intend this dedication to be an
-overt act of relinquishment in perpetuity of all present and future rights to
-this software under copyright law.
-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 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.

third_party/wuffs/LICENSE-APACHE

@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

third_party/wuffs/LICENSE-MIT

@@ -0,0 +1,25 @@
+Copyright 2023 The Wuffs Authors
+
+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.