Skip to content

Commit d9a62c4

Browse files
alalekalalek
committed
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2 parents 978f387 + 97eaddd commit d9a62c4

File tree

18 files changed

+53
-42
lines changed

18 files changed

+53
-42
lines changed

‎3rdparty/carotene/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if(CMAKE_COMPILER_IS_GNUCC)
2727
endif()
2828
endif()
2929

30-
add_library(carotene_objs OBJECT
30+
add_library(carotene_objs OBJECT EXCLUDE_FROM_ALL
3131
${carotene_headers}
3232
${carotene_sources}
3333
)
@@ -41,4 +41,4 @@ if(WITH_NEON)
4141
endif()
4242

4343
# we add dummy file to fix XCode build
44-
add_library(carotene STATIC EXCLUDE_FROM_ALL "$<TARGET_OBJECTS:carotene_objs>" "${CAROTENE_SOURCE_DIR}/dummy.cpp")
44+
add_library(carotene STATIC ${OPENCV_3RDPARTY_EXCLUDE_FROM_ALL} "$<TARGET_OBJECTS:carotene_objs>" "${CAROTENE_SOURCE_DIR}/dummy.cpp")

‎3rdparty/cpufeatures/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if(NOT DEFINED CPUFEATURES_SOURCES)
1414
endif()
1515

1616
include_directories(${CPUFEATURES_INCLUDE_DIRS})
17-
add_library(${OPENCV_CPUFEATURES_TARGET_NAME} STATIC ${CPUFEATURES_SOURCES})
17+
add_library(${OPENCV_CPUFEATURES_TARGET_NAME} STATIC ${OPENCV_3RDPARTY_EXCLUDE_FROM_ALL} ${CPUFEATURES_SOURCES})
1818

1919
set_target_properties(${OPENCV_CPUFEATURES_TARGET_NAME}
2020
PROPERTIES OUTPUT_NAME cpufeatures
@@ -29,7 +29,7 @@ if(ENABLE_SOLUTION_FOLDERS)
2929
endif()
3030

3131
if(NOT BUILD_SHARED_LIBS)
32-
ocv_install_target(${OPENCV_CPUFEATURES_TARGET_NAME} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)
32+
ocv_install_target(${OPENCV_CPUFEATURES_TARGET_NAME} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev OPTIONAL)
3333
endif()
3434

3535
ocv_install_3rdparty_licenses(cpufeatures LICENSE README.md)

‎3rdparty/ippicv/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ file(GLOB lib_hdrs ${IPP_IW_PATH}/include/*.h ${IPP_IW_PATH}/include/iw/*.h ${IP
1717
# Define the library target:
1818
# ----------------------------------------------------------------------------------
1919

20-
add_library(${IPP_IW_LIBRARY} STATIC ${lib_srcs} ${lib_hdrs})
20+
add_library(${IPP_IW_LIBRARY} STATIC ${OPENCV_3RDPARTY_EXCLUDE_FROM_ALL} ${lib_srcs} ${lib_hdrs})
2121

2222
if(UNIX)
2323
if(CV_GCC OR CV_CLANG OR CV_ICC)
@@ -41,5 +41,5 @@ if(ENABLE_SOLUTION_FOLDERS)
4141
endif()
4242

4343
if(NOT BUILD_SHARED_LIBS)
44-
ocv_install_target(${IPP_IW_LIBRARY} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)
44+
ocv_install_target(${IPP_IW_LIBRARY} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev OPTIONAL)
4545
endif()

‎3rdparty/ittnotify/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ set(ITT_SRCS
3737
src/ittnotify/jitprofiling.c
3838
)
3939

40-
add_library(${ITT_LIBRARY} STATIC ${ITT_SRCS} ${ITT_PUBLIC_HDRS} ${ITT_PRIVATE_HDRS})
40+
add_library(${ITT_LIBRARY} STATIC ${OPENCV_3RDPARTY_EXCLUDE_FROM_ALL} ${ITT_SRCS} ${ITT_PUBLIC_HDRS} ${ITT_PRIVATE_HDRS})
4141

4242
if(NOT WIN32)
4343
if(HAVE_DL_LIBRARY)
@@ -60,7 +60,7 @@ if(ENABLE_SOLUTION_FOLDERS)
6060
endif()
6161

6262
if(NOT BUILD_SHARED_LIBS)
63-
ocv_install_target(${ITT_LIBRARY} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)
63+
ocv_install_target(${ITT_LIBRARY} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev OPTIONAL)
6464
endif()
6565

6666
ocv_install_3rdparty_licenses(ittnotify src/ittnotify/LICENSE.BSD src/ittnotify/LICENSE.GPL)

‎3rdparty/libjasper/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ file(GLOB lib_ext_hdrs jasper/*.h)
1717
# Define the library target:
1818
# ----------------------------------------------------------------------------------
1919

20-
add_library(${JASPER_LIBRARY} STATIC ${lib_srcs} ${lib_hdrs} ${lib_ext_hdrs})
20+
add_library(${JASPER_LIBRARY} STATIC ${OPENCV_3RDPARTY_EXCLUDE_FROM_ALL} ${lib_srcs} ${lib_hdrs} ${lib_ext_hdrs})
2121

2222
if(WIN32 AND NOT MINGW)
2323
add_definitions(-DJAS_WIN_MSVC_BUILD)
@@ -46,7 +46,7 @@ if(ENABLE_SOLUTION_FOLDERS)
4646
endif()
4747

4848
if(NOT BUILD_SHARED_LIBS)
49-
ocv_install_target(${JASPER_LIBRARY} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)
49+
ocv_install_target(${JASPER_LIBRARY} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev OPTIONAL)
5050
endif()
5151

5252
ocv_install_3rdparty_licenses(jasper LICENSE README copyright)

‎3rdparty/libjpeg-turbo/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ set(JPEG_SOURCES ${JPEG_SOURCES} jsimd_none.c)
106106

107107
ocv_list_add_prefix(JPEG_SOURCES src/)
108108

109-
add_library(${JPEG_LIBRARY} STATIC ${JPEG_SOURCES} ${SIMD_OBJS})
109+
add_library(${JPEG_LIBRARY} STATIC ${OPENCV_3RDPARTY_EXCLUDE_FROM_ALL} ${JPEG_SOURCES} ${SIMD_OBJS})
110110

111111
set_target_properties(${JPEG_LIBRARY}
112112
PROPERTIES OUTPUT_NAME ${JPEG_LIBRARY}
@@ -121,7 +121,7 @@ if(ENABLE_SOLUTION_FOLDERS)
121121
endif()
122122

123123
if(NOT BUILD_SHARED_LIBS)
124-
ocv_install_target(${JPEG_LIBRARY} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)
124+
ocv_install_target(${JPEG_LIBRARY} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev OPTIONAL)
125125
endif()
126126

127127
ocv_install_3rdparty_licenses(libjpeg-turbo README.md LICENSE.md README.ijg)

‎3rdparty/libjpeg/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ endif()
1919
# Define the library target:
2020
# ----------------------------------------------------------------------------------
2121

22-
add_library(${JPEG_LIBRARY} STATIC ${lib_srcs} ${lib_hdrs})
22+
add_library(${JPEG_LIBRARY} STATIC ${OPENCV_3RDPARTY_EXCLUDE_FROM_ALL} ${lib_srcs} ${lib_hdrs})
2323

2424
if(CV_GCC OR CV_CLANG)
2525
set_source_files_properties(jcdctmgr.c PROPERTIES COMPILE_FLAGS "-O1")
@@ -42,7 +42,7 @@ if(ENABLE_SOLUTION_FOLDERS)
4242
endif()
4343

4444
if(NOT BUILD_SHARED_LIBS)
45-
ocv_install_target(${JPEG_LIBRARY} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)
45+
ocv_install_target(${JPEG_LIBRARY} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev OPTIONAL)
4646
endif()
4747

4848
ocv_install_3rdparty_licenses(libjpeg README)

‎3rdparty/libpng/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ if(MSVC)
7474
add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
7575
endif(MSVC)
7676

77-
add_library(${PNG_LIBRARY} STATIC ${lib_srcs} ${lib_hdrs})
77+
add_library(${PNG_LIBRARY} STATIC ${OPENCV_3RDPARTY_EXCLUDE_FROM_ALL} ${lib_srcs} ${lib_hdrs})
7878
target_link_libraries(${PNG_LIBRARY} ${ZLIB_LIBRARIES})
7979

8080
ocv_warnings_disable(CMAKE_C_FLAGS -Wundef -Wcast-align -Wimplicit-fallthrough -Wunused-parameter -Wsign-compare)
@@ -92,7 +92,7 @@ if(ENABLE_SOLUTION_FOLDERS)
9292
endif()
9393

9494
if(NOT BUILD_SHARED_LIBS)
95-
ocv_install_target(${PNG_LIBRARY} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)
95+
ocv_install_target(${PNG_LIBRARY} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev OPTIONAL)
9696
endif()
9797

9898
ocv_install_3rdparty_licenses(libpng LICENSE README)

‎3rdparty/libtiff/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4456 /wd4457 /wd4312) # vs2015
462462

463463
ocv_warnings_disable(CMAKE_C_FLAGS /wd4267 /wd4244 /wd4018 /wd4311 /wd4312)
464464

465-
add_library(${TIFF_LIBRARY} STATIC ${lib_srcs})
465+
add_library(${TIFF_LIBRARY} STATIC ${OPENCV_3RDPARTY_EXCLUDE_FROM_ALL} ${lib_srcs})
466466
target_link_libraries(${TIFF_LIBRARY} ${ZLIB_LIBRARIES})
467467

468468
set_target_properties(${TIFF_LIBRARY}
@@ -479,7 +479,7 @@ if(ENABLE_SOLUTION_FOLDERS)
479479
endif()
480480

481481
if(NOT BUILD_SHARED_LIBS)
482-
ocv_install_target(${TIFF_LIBRARY} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)
482+
ocv_install_target(${TIFF_LIBRARY} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev OPTIONAL)
483483
endif()
484484

485485
ocv_install_3rdparty_licenses(libtiff COPYRIGHT)

‎3rdparty/libwebp/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ endif()
3434

3535
add_definitions(-DWEBP_USE_THREAD)
3636

37-
add_library(${WEBP_LIBRARY} STATIC ${lib_srcs} ${lib_hdrs})
37+
add_library(${WEBP_LIBRARY} STATIC ${OPENCV_3RDPARTY_EXCLUDE_FROM_ALL} ${lib_srcs} ${lib_hdrs})
3838
if(ANDROID)
3939
target_link_libraries(${WEBP_LIBRARY} ${CPUFEATURES_LIBRARIES})
4040
endif()
@@ -59,6 +59,6 @@ if(ENABLE_SOLUTION_FOLDERS)
5959
endif()
6060

6161
if(NOT BUILD_SHARED_LIBS)
62-
ocv_install_target(${WEBP_LIBRARY} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)
62+
ocv_install_target(${WEBP_LIBRARY} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev OPTIONAL)
6363
endif()
6464

‎3rdparty/openexr/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ if(MSVC AND CV_ICC)
125125
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Qrestrict")
126126
endif()
127127

128-
add_library(IlmImf STATIC ${lib_hdrs} ${lib_srcs})
128+
add_library(IlmImf STATIC ${OPENCV_3RDPARTY_EXCLUDE_FROM_ALL} ${lib_hdrs} ${lib_srcs})
129129
target_link_libraries(IlmImf ${ZLIB_LIBRARIES})
130130

131131
set_target_properties(IlmImf
@@ -142,7 +142,7 @@ if(ENABLE_SOLUTION_FOLDERS)
142142
endif()
143143

144144
if(NOT BUILD_SHARED_LIBS)
145-
ocv_install_target(IlmImf EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)
145+
ocv_install_target(IlmImf EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev OPTIONAL)
146146
endif()
147147

148148
ocv_install_3rdparty_licenses(openexr LICENSE AUTHORS.ilmbase AUTHORS.openexr)

‎3rdparty/protobuf/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ append_if_exist(Protobuf_SRCS
141141
)
142142

143143
include_directories(BEFORE "${PROTOBUF_ROOT}/src") # ensure using if own headers: https://github.com/opencv/opencv/issues/13328
144-
add_library(libprotobuf STATIC ${Protobuf_SRCS})
144+
add_library(libprotobuf STATIC ${OPENCV_3RDPARTY_EXCLUDE_FROM_ALL} ${Protobuf_SRCS})
145145
target_include_directories(libprotobuf SYSTEM PUBLIC $<BUILD_INTERFACE:${PROTOBUF_ROOT}/src>)
146146
set_target_properties(libprotobuf
147147
PROPERTIES
@@ -157,7 +157,7 @@ get_protobuf_version(Protobuf_VERSION "${PROTOBUF_ROOT}/src")
157157
set(Protobuf_VERSION ${Protobuf_VERSION} CACHE INTERNAL "" FORCE)
158158

159159
if(NOT BUILD_SHARED_LIBS)
160-
ocv_install_target(libprotobuf EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)
160+
ocv_install_target(libprotobuf EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev OPTIONAL)
161161
endif()
162162

163163
ocv_install_3rdparty_licenses(protobuf LICENSE README.md)

‎3rdparty/quirc/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ocv_include_directories(${CURR_INCLUDE_DIR})
88
file(GLOB_RECURSE quirc_headers RELATIVE "${CMAKE_CURRENT_LIST_DIR}" "include/*.h")
99
file(GLOB_RECURSE quirc_sources RELATIVE "${CMAKE_CURRENT_LIST_DIR}" "src/*.c")
1010

11-
add_library(${PROJECT_NAME} STATIC ${quirc_headers} ${quirc_sources})
11+
add_library(${PROJECT_NAME} STATIC ${OPENCV_3RDPARTY_EXCLUDE_FROM_ALL} ${quirc_headers} ${quirc_sources})
1212
ocv_warnings_disable(CMAKE_C_FLAGS -Wunused-variable -Wshadow)
1313

1414
set_target_properties(${PROJECT_NAME}
@@ -24,7 +24,7 @@ if(ENABLE_SOLUTION_FOLDERS)
2424
endif()
2525

2626
if(NOT BUILD_SHARED_LIBS)
27-
ocv_install_target(${PROJECT_NAME} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)
27+
ocv_install_target(${PROJECT_NAME} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev OPTIONAL)
2828
endif()
2929

3030
ocv_install_3rdparty_licenses(${PROJECT_NAME} LICENSE)

‎3rdparty/tbb/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ set(tbb_version_file "version_string.ver")
108108
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${tbb_version_file}.cmakein" "${CMAKE_CURRENT_BINARY_DIR}/${tbb_version_file}" @ONLY)
109109
list(APPEND TBB_SOURCE_FILES "${CMAKE_CURRENT_BINARY_DIR}/${tbb_version_file}")
110110

111-
add_library(tbb ${TBB_SOURCE_FILES})
111+
add_library(tbb ${OPENCV_3RDPARTY_EXCLUDE_FROM_ALL} ${TBB_SOURCE_FILES})
112112
target_compile_definitions(tbb PUBLIC
113113
TBB_USE_GCC_BUILTINS=1
114114
__TBB_GCC_BUILTIN_ATOMICS_PRESENT=1
@@ -165,6 +165,7 @@ ocv_install_target(tbb EXPORT OpenCVModules
165165
RUNTIME DESTINATION ${OPENCV_BIN_INSTALL_PATH} COMPONENT libs
166166
LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT libs
167167
ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev
168+
OPTIONAL
168169
)
169170

170171
ocv_install_3rdparty_licenses(tbb "${tbb_src_dir}/LICENSE" "${tbb_src_dir}/README")

‎3rdparty/zlib/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ set(ZLIB_SRCS
7676
zutil.c
7777
)
7878

79-
add_library(${ZLIB_LIBRARY} STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
79+
add_library(${ZLIB_LIBRARY} STATIC ${OPENCV_3RDPARTY_EXCLUDE_FROM_ALL} ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
8080
set_target_properties(${ZLIB_LIBRARY} PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
8181

8282
ocv_warnings_disable(CMAKE_C_FLAGS -Wshorten-64-to-32 -Wattributes -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wshift-negative-value

‎cmake/OpenCVUtils.cmake

+6
Original file line numberDiff line numberDiff line change
@@ -1881,3 +1881,9 @@ function(ocv_update_file filepath content)
18811881
file(WRITE "${filepath}" "${content}")
18821882
endif()
18831883
endfunction()
1884+
1885+
if(NOT BUILD_SHARED_LIBS AND (CMAKE_VERSION VERSION_LESS "3.14.0"))
1886+
ocv_update(OPENCV_3RDPARTY_EXCLUDE_FROM_ALL "") # avoid CMake warnings: https://gitlab.kitware.com/cmake/cmake/-/issues/18938
1887+
else()
1888+
ocv_update(OPENCV_3RDPARTY_EXCLUDE_FROM_ALL "EXCLUDE_FROM_ALL")
1889+
endif()

‎doc/pattern_tools/gen_pattern.py

+14-10
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ def main():
9292
dest="square_size", type=float)
9393
parser.add_argument("-R", "--radius_rate", help="circles_radius = square_size/radius_rate", default="5.0",
9494
action="store", dest="radius_rate", type=float)
95-
parser.add_argument("-w", "--page_width", help="page width in units", default="216", action="store",
95+
parser.add_argument("-w", "--page_width", help="page width in units", default=argparse.SUPPRESS, action="store",
9696
dest="page_width", type=float)
97-
parser.add_argument("-h", "--page_height", help="page height in units", default="279", action="store",
98-
dest="page_width", type=float)
99-
parser.add_argument("-a", "--page_size", help="page size, supersedes -h -w arguments", default="A4", action="store",
97+
parser.add_argument("-h", "--page_height", help="page height in units", default=argparse.SUPPRESS, action="store",
98+
dest="page_height", type=float)
99+
parser.add_argument("-a", "--page_size", help="page size, superseded if -h and -w are set", default="A4", action="store",
100100
dest="page_size", choices=["A0", "A1", "A2", "A3", "A4", "A5"])
101101
args = parser.parse_args()
102102

@@ -111,12 +111,16 @@ def main():
111111
units = args.units
112112
square_size = args.square_size
113113
radius_rate = args.radius_rate
114-
page_size = args.page_size
115-
# page size dict (ISO standard, mm) for easy lookup. format - size: [width, height]
116-
page_sizes = {"A0": [840, 1188], "A1": [594, 840], "A2": [420, 594], "A3": [297, 420], "A4": [210, 297],
117-
"A5": [148, 210]}
118-
page_width = page_sizes[page_size.upper()][0]
119-
page_height = page_sizes[page_size.upper()][1]
114+
if 'page_width' and 'page_height' in args:
115+
page_width = args.page_width
116+
page_height = args.page_height
117+
else:
118+
page_size = args.page_size
119+
# page size dict (ISO standard, mm) for easy lookup. format - size: [width, height]
120+
page_sizes = {"A0": [840, 1188], "A1": [594, 840], "A2": [420, 594], "A3": [297, 420], "A4": [210, 297],
121+
"A5": [148, 210]}
122+
page_width = page_sizes[page_size][0]
123+
page_height = page_sizes[page_size][1]
120124
pm = PatternMaker(columns, rows, output, units, square_size, radius_rate, page_width, page_height)
121125
# dict for easy lookup of pattern type
122126
mp = {"circles": pm.make_circles_pattern, "acircles": pm.make_acircles_pattern,

‎modules/objdetect/src/qrcode.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -984,7 +984,7 @@ class QRDecode
984984
bool computeClosestPoints(const vector<Point> &result_integer_hull);
985985
bool computeSidesPoints(const vector<Point> &result_integer_hull);
986986
vector<Point> getPointsNearUnstablePoint(const vector<Point> &side, int start, int end, int step);
987-
bool findAndAddStablePoint(const vector<Point> &result_integer_hull);
987+
bool findAndAddStablePoint();
988988
bool findIndexesCurvedSides();
989989
bool findIncompleteIndexesCurvedSides();
990990
Mat getPatternsMask();
@@ -1265,7 +1265,7 @@ vector<Point> QRDecode::getPointsNearUnstablePoint(const vector<Point> &side, in
12651265
return points;
12661266
}
12671267

1268-
bool QRDecode::findAndAddStablePoint(const vector<Point> &result_integer_hull)
1268+
bool QRDecode::findAndAddStablePoint()
12691269
{
12701270
size_t idx_unstable_point = unstable_pair.first;
12711271
Point unstable_point = unstable_pair.second;
@@ -1376,7 +1376,7 @@ bool QRDecode::findAndAddStablePoint(const vector<Point> &result_integer_hull)
13761376

13771377
bool add_stable_point = true;
13781378

1379-
for (size_t i = 0; i < result_integer_hull.size(); i++)
1379+
for (size_t i = 0; i < original_points.size(); i++)
13801380
{
13811381
if(arePointsNearest(stable_point, original_points[i], 3.0))
13821382
{
@@ -2202,7 +2202,7 @@ bool QRDecode::preparingCurvedQRCodes()
22022202
return false;
22032203
if (!computeSidesPoints(result_integer_hull))
22042204
return false;
2205-
if (!findAndAddStablePoint(result_integer_hull))
2205+
if (!findAndAddStablePoint())
22062206
return false;
22072207
if (!findIndexesCurvedSides())
22082208
return false;

0 commit comments

Comments
 (0)