mirrors/opencv
2
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-09-25 04:09:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29773 from mulhamfetna:fix/29458-harfbuzz-raster-symbol-check

Browse Source 
cmake: check every hb_raster_* symbol used before selecting system HarfBuzz
This commit is contained in:
Alexander Smorkalov
2026-08-28 10:49:08 +03:00
committed by GitHub
parent d757c2942d bfd89ecb8f
commit 397e70d044
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/OpenCVFindHarfBuzz.cmake
+21 -4
View File
@@ -37,8 +37,15 @@ if(WITH_HARFBUZZ)
set(_hb_libs "${HARFBUZZ_LIBRARIES}")
endif()
# Verify the header and symbol actually compile and link with the chosen
# Verify the header and symbols actually compile and link with the chosen
# libraries; otherwise fall back to the bundled copy.
# Reference every hb_raster_* entry point used by
# modules/imgproc/src/drawing_text.cpp: a system HarfBuzz may declare the
# whole hb-raster API in its header while exporting only part of it, which
# passes a narrower probe and then fails at link time. The array is
# volatile so the initializers are not optimized away at -O3 (a function
# address is never null, so the compiler would otherwise fold the test
# away and emit no relocations, letting a partial library pass).
ocv_clear_vars(HAVE_HARFBUZZ)
set(CMAKE_REQUIRED_INCLUDES "${_hb_inc}")
set(CMAKE_REQUIRED_LIBRARIES "${_hb_libs}")
@@ -46,9 +53,19 @@ if(WITH_HARFBUZZ)
#include <hb.h>
#include <hb-raster.h>
int main() {
hb_raster_draw_t* rd = hb_raster_draw_create_or_fail();
hb_raster_draw_render(rd);
return rd ? 0 : 1;
void (*volatile fns[])() = {
(void(*)())&hb_raster_draw_create_or_fail,
(void(*)())&hb_raster_draw_destroy,
(void(*)())&hb_raster_draw_set_scale_factor,
(void(*)())&hb_raster_draw_set_extents,
(void(*)())&hb_raster_draw_set_glyph_extents,
(void(*)())&hb_raster_draw_glyph,
(void(*)())&hb_raster_draw_render,
(void(*)())&hb_raster_draw_recycle_image,
(void(*)())&hb_raster_image_get_extents,
(void(*)())&hb_raster_image_get_buffer,
};
return fns[0] ? 0 : 1;
}" HARFBUZZ_HAS_RASTER)
unset(CMAKE_REQUIRED_INCLUDES)
unset(CMAKE_REQUIRED_LIBRARIES)