Skip to content

Merge 3.4 #2100

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 19, 2019
Merged

Merge 3.4 #2100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa4ef14
cmake: use ocv_check_modules()
alalek Apr 15, 2019
c7f2e2a
Merge pull request #2074 from bitsun:master
bitsun Apr 16, 2019
7bba4cf
Merge pull request #2093 from alalek:cmake_fix_pkgconfig_libs
alalek Apr 16, 2019
fd10a46
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
alalek Apr 18, 2019
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
29 changes: 14 additions & 15 deletions modules/freetype/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,24 @@ if(APPLE_FRAMEWORK)
ocv_module_disable(freetype)
endif()

if(PKG_CONFIG_FOUND)
pkg_search_module(FREETYPE freetype2)
pkg_search_module(HARFBUZZ harfbuzz)
endif()
ocv_check_modules(FREETYPE freetype2)
ocv_check_modules(HARFBUZZ harfbuzz)

if(NOT FREETYPE_FOUND)
message(STATUS "freetype2: NO")
else()
message(STATUS "freetype2: YES")
endif()
if(OPENCV_INITIAL_PASS)
if(NOT FREETYPE_FOUND)
message(STATUS "freetype2: NO")
else()
message(STATUS "freetype2: YES (ver ${FREETYPE_VERSION})")
endif()

if(NOT HARFBUZZ_FOUND)
message(STATUS "harfbuzz: NO")
else()
message(STATUS "harfbuzz: YES")
if(NOT HARFBUZZ_FOUND)
message(STATUS "harfbuzz: NO")
else()
message(STATUS "harfbuzz: YES (ver ${HARFBUZZ_VERSION})")
endif()
endif()


if( FREETYPE_FOUND AND HARFBUZZ_FOUND )
if(FREETYPE_FOUND AND HARFBUZZ_FOUND)
ocv_define_module(freetype opencv_core opencv_imgproc WRAP python)
ocv_target_link_libraries(${the_module} ${FREETYPE_LIBRARIES} ${HARFBUZZ_LIBRARIES})
ocv_include_directories( ${FREETYPE_INCLUDE_DIRS} ${HARFBUZZ_INCLUDE_DIRS} )
Expand Down
1 change: 0 additions & 1 deletion modules/optflow/src/rlof/rlof_localflow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include "../precomp.hpp"

#include "opencv2/calib3d.hpp" // findHomography
#include "opencv2/highgui.hpp"
#include "rlof_localflow.h"
#include "berlof_invoker.hpp"
#include "rlof_invoker.hpp"
Expand Down
12 changes: 9 additions & 3 deletions modules/text/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,16 @@ set(the_description "Text Detection and Recognition")
ocv_define_module(text opencv_ml opencv_imgproc opencv_core opencv_features2d opencv_dnn OPTIONAL opencv_highgui WRAP python java)

if(NOT CMAKE_CROSSCOMPILING OR OPENCV_FIND_TESSERACT)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
find_package(Tesseract QUIET)
find_package(Tesseract QUIET) # Prefer CMake's standard locations (including Tesseract_DIR)
if(NOT Tesseract_FOUND)
include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindTesseract.cmake") # OpenCV's fallback
endif()
if(Tesseract_FOUND)
message(STATUS "Tesseract: YES")
if(Tesseract_VERSION)
message(STATUS "Tesseract: YES (ver ${Tesseract_VERSION})")
else()
message(STATUS "Tesseract: YES (ver unknown)")
endif()
set(HAVE_TESSERACT 1)
ocv_include_directories(${Tesseract_INCLUDE_DIRS})
ocv_target_link_libraries(${the_module} ${Tesseract_LIBRARIES})
Expand Down
4 changes: 1 addition & 3 deletions modules/text/cmake/FindTesseract.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Tesseract OCR
if(COMMAND pkg_check_modules)
pkg_check_modules(Tesseract tesseract lept)
endif()
ocv_check_modules(Tesseract tesseract) # lept is excluded (not a direct dependency)
if(NOT Tesseract_FOUND)
find_path(Tesseract_INCLUDE_DIR tesseract/baseapi.h
HINTS
Expand Down
7 changes: 4 additions & 3 deletions modules/xfeatures2d/src/boostdesc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,9 +364,10 @@ static void rectifyPatch( const Mat& image, const KeyPoint& kp,
}
else
{
float M_[] = {
1.f, 0.f, -1.f * patchSize/2.0f + kp.pt.x,
0.f, 1.f, -1.f * patchSize/2.0f + kp.pt.y
const float s = scale_factor * (float)kp.size / (float)patchSize;
float M_[] = {
s, 0.f, -s * patchSize/2.0f + kp.pt.x,
0.f, s, -s * patchSize/2.0f + kp.pt.y
};
M = Mat( 2, 3, CV_32FC1, M_ ).clone();
}
Expand Down