From: Michael Giba <redacted>
Date: Thu, 21 Aug 2025 10:06:46 +0000 (-0500)
Subject: ci : fix -Werror=return-type in clip.cpp so ci/run.sh can run without issue (#15221)
X-Git-Tag: upstream/0.0.6527~299
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=b108e429043ee5c9fc8fa4957a0a52c3e490d5c9;p=pkg%2Fggml%2Fsources%2Fllama.cpp

ci : fix -Werror=return-type in clip.cpp so ci/run.sh can run without issue (#15221)

* Fix -Werror=return-type so ci/run.sh can run

* Update tools/mtmd/clip.cpp

Co-authored-by: Diego Devesa <redacted>

* Remove false now that we have abort

---------

Co-authored-by: Diego Devesa <redacted>
---

diff --git a/tools/mtmd/clip.cpp b/tools/mtmd/clip.cpp
index a32fe84f..1676c328 100644
--- a/tools/mtmd/clip.cpp
+++ b/tools/mtmd/clip.cpp
@@ -3581,10 +3581,10 @@ bool clip_image_preprocess(struct clip_ctx * ctx, const clip_image_u8 * img, str
         }
 
         return true;
-
+    } else {
+        GGML_ABORT("Unknown image preprocessing type");
     }
 
-    GGML_ASSERT(false && "Unknown image preprocessing type");
 }
 
 ggml_tensor * clip_get_newline_tensor(const struct clip_ctx * ctx) {