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

michaelgiba · slaren · web-flow · commit b108e429043e · 2025-08-21T12:06:46.000+02:00
* Fix -Werror=return-type so ci/run.sh can run

* Update tools/mtmd/clip.cpp

Co-authored-by: Diego Devesa &lt;slarengh@gmail.com&gt;

* Remove false now that we have abort

---------

Co-authored-by: Diego Devesa &lt;slarengh@gmail.com&gt;
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -3581,10 +3581,10 @@ bool clip_image_preprocess(struct clip_ctx * ctx, const clip_image_u8 * img, str`
`3581`	`3581`	`}`
`3582`	`3582`
`3583`	`3583`	`return true;`
`3584`		`-`
	`3584`	`+ } else {`
	`3585`	`+ GGML_ABORT("Unknown image preprocessing type");`
`3585`	`3586`	`}`
`3586`	`3587`
`3587`		`- GGML_ASSERT(false && "Unknown image preprocessing type");`
`3588`	`3588`	`}`
`3589`	`3589`
`3590`	`3590`	`ggml_tensor * clip_get_newline_tensor(const struct clip_ctx * ctx) {`