Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

(5.x) Merge 4.x#25840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
asmorkalov merged 49 commits intoopencv:5.xfromasmorkalov:5.x-merge-4.x
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from1 commit
Commits
Show all changes
49 commits
Select commitHold shift + click to select a range
6623c62
Fixed result buffer overflow in intersectConvexConvex_ for non-convex…
asmorkalovJun 6, 2024
88c6c7d
Handle BGRA sterams in GStreamer backend
asmorkalovMay 17, 2024
7ff531b
Merge pull request #25759 from savuor:rv/equalizeHist_tests
savuorJun 15, 2024
0a12c7d
Merge pull request #25725 from asmorkalov:as/intersectConvexConvex_fix
asmorkalovJun 16, 2024
4bf95ac
Merge pull request #25602 from asmorkalov:as/gstreamer_alpha_channel
asmorkalovJun 16, 2024
24907f3
Merge pull request #25757 from dkurt:d.kurtaev/opencv_js_tests_old_emsdk
dkurtJun 17, 2024
860b688
Enable build with both old and new layouts of IPP
eplankinJun 17, 2024
b9d2ecb
Remove unused brow variable
FantasqueXJun 17, 2024
6081997
Svgfig library update to version 1.0.1 as it uses BSD-3 license.
asmorkalovJun 18, 2024
0fac5d5
Merge pull request #25778 from asmorkalov:as/svgfig_update
asmorkalovJun 18, 2024
e3884a9
Merge pull request #25771 from fengyuentau:vittrack_black_input
fengyuentauJun 18, 2024
553c111
Fixed input buffer read overflow in vectorized G-API convertTo implem…
asmorkalovJun 18, 2024
766f3f5
Merge pull request #25746 from savuor:rv/hwasan_flag_release
savuorJun 18, 2024
d1b643a
Merge pull request #25780 from asmorkalov:as/gapi_arm_overflow
asmorkalovJun 19, 2024
e7108f4
Extended bilateralFilter test to cover more branches.
asmorkalovJun 19, 2024
a102b24
Added LUT for FP16 and accuracy test.
asmorkalovJun 19, 2024
0cba702
Merge pull request #25787 from asmorkalov:as/lut_fp16
asmorkalovJun 20, 2024
57984e6
Merge pull request #25788 from asmorkalov:as/bilateralFilter_test
asmorkalovJun 20, 2024
7ef42d7
Merge pull request #25751 from simonkampe:fix-eigen-rowmajor
simonkampeJun 20, 2024
5dc1b39
Merge pull request #25791 from ujjayant-kadian:uk/extend-gapi-onnx-pa…
ujjayant-kadianJun 21, 2024
acd16e3
Merge pull request #25773 from eplankin:eplankin/fix_layout
asmorkalovJun 21, 2024
3f13ce7
Merge pull request #25779 from fengyuentau:dnn/fix_onnx_depthtospace
fengyuentauJun 21, 2024
d8c7deb
cmake: support 10+ minor version(10,11,...)
KumataroJun 22, 2024
2028998
Merge pull request #25803 from Kumataro/fix25802
asmorkalovJun 22, 2024
8be2056
Replace use of "eval()" with "getattr()".
TFiFiEJun 22, 2024
11c69bb
Merge pull request #25775 from richard28039:4.x
richard28039Jun 24, 2024
76a1d26
Merge pull request #25805 from TFiFiE:patch-1
asmorkalovJun 25, 2024
2179186
Remove unused variables in rgb2hsv_b simd
FantasqueXJun 26, 2024
efa4d91
Merge pull request #25661 from itlab-vision:framebuffer
kozinoveJun 26, 2024
204d62a
Merge pull request #25815 from FantasqueX:remove-unused-variable-1
asmorkalovJun 27, 2024
4450226
Merge pull request #25789 from asmorkalov:as/HAL_meanStdDev_tails
asmorkalovJun 27, 2024
ee2b0f9
Relax equalizeHist test for some HAL implementations.
asmorkalovJun 27, 2024
284a794
Merge pull request #25816 from FantasqueX:remove-unused-brow-1
asmorkalovJun 28, 2024
7867267
Merge pull request #25793 from MaximMilashchenko:hal_rvv
MaximMilashchenkoJun 28, 2024
4500eb9
Drop redundant dependency from download_models.py
asmorkalovJun 28, 2024
aab7239
Merge pull request #25826 from asmorkalov:as/clean_download_models_deps
asmorkalovJun 28, 2024
3101694
Exclude cap_ios.h from installation where it's not needed.
asmorkalovJun 28, 2024
855f6cf
Merge pull request #25827 from asmorkalov:as/exclude_ios_platform_header
asmorkalovJun 28, 2024
be00247
Merge pull request #25820 from asmorkalov:as/HAL_non_strict_equalizeHist
asmorkalovJun 28, 2024
b7c9221
Force contributors to define Apache 2.0 license for the new PRs.
asmorkalovJun 28, 2024
1e5407a
Fix #25833: The correct way to disable top-most state is with HWND_NO…
dan-masekJun 29, 2024
bbf65a1
Fix file descriptor leak in HDR decoder
tyler92Jun 30, 2024
ce1d840
Fix: compilation Issue on ARM64 (msys2 clangarm)
thiru31Jun 29, 2024
996ed0a
Merge pull request #25829 from asmorkalov:as/force_legal_requirements
asmorkalovJul 1, 2024
25609ef
Merge pull request #25838 from tyler92:fix-fd-leak
asmorkalovJul 1, 2024
34ed88d
Merge pull request #25836 from dan-masek:fix_win32_topmost_toggle
asmorkalovJul 1, 2024
930af15
Merge pull request #25834 from thiru31:4.x
asmorkalovJul 1, 2024
39a7b3d
Merge pull request #25813 from kaingwade:orbbec-astra
kaingwadeJul 1, 2024
3abd9f2
Merge branch 4.x
asmorkalovJul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
PrevPrevious commit
NextNext commit
Enable build with both old and new layouts of IPP
  • Loading branch information
@eplankin
eplankin committedJun 17, 2024
commit860b688cdd35bc089fea9f812b4c9fb0ecd09bbb
2 changes: 1 addition & 1 deletion3rdparty/ippicv/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ if(HAVE_IPP_ICV)
add_definitions(-DICV_BASE)
endif()

file(GLOB lib_srcs ${IPP_IW_PATH}/src/*.c)
file(GLOB lib_srcs ${IPP_IW_PATH}/src/*.c ${IPP_IW_PATH}/src/*.cpp)
file(GLOB lib_hdrs ${IPP_IW_PATH}/include/*.h ${IPP_IW_PATH}/include/iw/*.h ${IPP_IW_PATH}/include/iw++/*.hpp)

# ----------------------------------------------------------------------------------
Expand Down
19 changes: 16 additions & 3 deletionscmake/OpenCVFindIPP.cmake
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,9 +87,14 @@ macro(ipp_detect_version)
get_filename_component(IPP_INCLUDE_DIRS ${IPP_VERSION_FILE} PATH)

set(__msg)
set(IPP_NEW_LAYOUT 0)
if(EXISTS ${IPP_ROOT_DIR}/include/ippicv_redefs.h)
set(__msg " (ICV version)")
set(HAVE_IPP_ICV 1)
elseif(EXISTS ${IPP_ROOT_DIR}/include/ipp/ipp.h)
set(IPP_NEW_LAYOUT 1)
# workaround to enable both layouts
add_definitions(-DIPP_PRESERVE_OLD_LAYOUT)
elseif(EXISTS ${IPP_ROOT_DIR}/include/ipp.h)
# nothing
else()
Expand DownExpand Up@@ -117,10 +122,18 @@ macro(ipp_detect_version)

if(APPLE AND NOT HAVE_IPP_ICV)
_ipp_set_library_dir(${IPP_ROOT_DIR}/lib)
elseif(IPP_X64)
_ipp_set_library_dir(${IPP_ROOT_DIR}/lib/intel64)
elseif (IPP_NEW_LAYOUT)
if(IPP_X64)
_ipp_set_library_dir(${IPP_ROOT_DIR}/lib)
else()
_ipp_set_library_dir(${IPP_ROOT_DIR}/lib32)
endif()
else()
_ipp_set_library_dir(${IPP_ROOT_DIR}/lib/ia32)
if(IPP_X64)
_ipp_set_library_dir(${IPP_ROOT_DIR}/lib/intel64)
else()
_ipp_set_library_dir(${IPP_ROOT_DIR}/lib/ia32)
endif()
endif()

macro(_ipp_add_library name)
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp