summaryrefslogtreecommitdiff
path: root/examples/server/server.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'examples/server/server.cpp')
-rw-r--r--examples/server/server.cpp15
1 files changed, 12 insertions, 3 deletions
diff --git a/examples/server/server.cpp b/examples/server/server.cpp
index 1699eb76..6e343403 100644
--- a/examples/server/server.cpp
+++ b/examples/server/server.cpp
@@ -968,13 +968,20 @@ struct llama_server_context
{
continue;
}
- clip_image_f32 * img_res = clip_image_f32_init();
- if (!clip_image_preprocess(clp_ctx, img.img_data, img_res, /*pad2square =*/ true))
+ clip_image_f32_batch img_res_v;
+ img_res_v.size = 0;
+ img_res_v.data = nullptr;
+ if (!clip_image_preprocess(clp_ctx, img.img_data, img_res_v))
{
LOG_TEE("Error processing the given image");
clip_free(clp_ctx);
+ clip_image_f32_free(img_res_v.data);
return false;
}
+
+ // note: assumes only one image was returned by clip_image_preprocess
+ clip_image_f32 * img_res = img_res_v.data;
+
img.image_tokens = clip_n_patches(clp_ctx);
img.image_embedding = (float *)malloc(clip_embd_nbytes(clp_ctx));
if (!img.image_embedding)
@@ -989,7 +996,9 @@ struct llama_server_context
LOG_TEE("Unable to encode image\n");
return false;
}
- clip_image_f32_free(img_res);
+
+ clip_image_f32_free(img_res_v.data);
+
img.request_encode_image = false;
}