1 files changed, 40 insertions, 4 deletions
diff --git a/src/util/asset_manager.cc b/src/util/asset_manager.cc
index 26a82bf..264ddda 100644
--- a/src/util/asset_manager.cc
+++ b/src/util/asset_manager.cc
@@ -2,6 +2,7 @@
 // It implements the generic asset retrieval logic with runtime caching.
 
 #include "util/asset_manager.h"
+#include "util/ans.h"
 #include "util/asset_manager_utils.h"
 #include "util/check_return.h"
 #if defined(USE_TEST_ASSETS)
@@ -114,6 +115,34 @@ const uint8_t* GetAsset(AssetId asset_id, size_t* out_size) {
 
   AssetRecord cached_record = source_record;
 
+  if (source_record.compression == AssetCompression::ANS_ASCII) {
+    // Decompress on first access. Buffer is null-terminated for C-string use.
+    const size_t uncomp = source_record.uncompressed_size;
+    uint8_t* buffer = new (std::nothrow) uint8_t[uncomp + 1];
+    CHECK_RETURN_BEGIN(!buffer, nullptr)
+    if (out_size) *out_size = 0;
+    ERROR_MSG("Failed to allocate buffer for ANS-compressed asset id=%u",
+              index);
+    return nullptr;
+    CHECK_RETURN_END
+    size_t got = 0;
+    if (!ans::Decode(source_record.data, source_record.size, buffer, uncomp,
+                     &got, GetAnsAsciiHistogram()) ||
+        got != uncomp) {
+      delete[] buffer;
+      if (out_size) *out_size = 0;
+      ERROR_MSG("ANS decode failed for asset id=%u", index);
+      return nullptr;
+    }
+    buffer[uncomp] = 0;
+    cached_record.data = buffer;
+    cached_record.size = uncomp;
+    cached_record.uncompressed_size = uncomp;
+    g_asset_cache[index] = cached_record;
+    if (out_size) *out_size = uncomp;
+    return buffer;
+  }
+
   if (source_record.type == AssetType::PROC ||
       source_record.type == AssetType::PROC_GPU) {
     // Dynamically generate the asset
@@ -224,6 +253,12 @@ void DropAsset(AssetId asset_id, const uint8_t* asset) {
     delete[] g_asset_cache[index].data;
     g_asset_cache[index] = {}; // Zero out the struct to force re-generation
   }
+  // Heap-allocated decompressed buffer (compression != NONE): cache owns it.
+  if (g_asset_cache[index].data == asset &&
+      g_asset_cache[index].compression != AssetCompression::NONE) {
+    delete[] g_asset_cache[index].data;
+    g_asset_cache[index] = {};
+  }
 #if !defined(STRIP_ALL)
   if (g_asset_cache[index].data == asset &&
       (g_asset_cache[index].type == AssetType::SPEC ||
@@ -245,10 +280,11 @@ bool ReloadAssetsFromFile(const char* config_path) {
 
   // Clear cache to force reload
   for (size_t i = 0; i < (size_t)AssetId::ASSET_LAST_ID; ++i) {
-    if ((g_asset_cache[i].type == AssetType::PROC ||
-         g_asset_cache[i].type == AssetType::PROC_GPU) &&
-        g_asset_cache[i].data) {
-      delete[] g_asset_cache[i].data;
+    const AssetRecord& e = g_asset_cache[i];
+    if (e.data &&
+        (e.type == AssetType::PROC || e.type == AssetType::PROC_GPU ||
+         e.compression != AssetCompression::NONE)) {
+      delete[] e.data;
     }
     g_asset_cache[i] = {};
   }