missing include in flann headers (Bug #920)

Added by Vincent Rabaud about 14 years ago. Updated almost 14 years ago.

Status:Done Start date:
Priority:High Due date:
Assignee:Marius Muja % Done:

0%
Category:flann
Target version:-
Affected version: Operating System:
Difficulty: HW Platform:
Pull request:

Description

The kdtree_index.h does not know what logger() is unless #include <opencv2/flann/logger.h> is called before that. Maybe that include should be part of general.h ?

Associated revisions

Revision 23a9b7bb
Added by Vadim Pisarevsky almost 14 years ago

fixed several warnings from Xcode 4 LLVM compiler; fixed bug #920

Revision fbb25787
Added by Roman Donchenko almost 12 years ago

Merge pull request #920 from asmorkalov:android_move

Revision bae85660
Added by Roman Donchenko almost 12 years ago

Merge remote-tracking branch 'origin/2.4'

Pull requests:
#943 from jet47:cuda-5.5-support
#944 from jet47:cmake-2.8.11-cuda-fix
#912 from SpecLad:contributing
#934 from SpecLad:parallel-for
#931 from jet47:gpu-test-fixes
#932 from bitwangyaoyao:2.4_fixBFM
#918 from bitwangyaoyao:2.4_samples
#924 from pengx17:2.4_arithm_fix
#925 from pengx17:2.4_canny_tmp_fix
#927 from bitwangyaoyao:2.4_perf
#930 from pengx17:2.4_haar_ext
#928 from apavlenko:bugfix_3027
#920 from asmorkalov:android_move
#910 from pengx17:2.4_oclgfft
#913 from janm399:2.4
#916 from bitwangyaoyao:2.4_fixPyrLK
#919 from abidrahmank:2.4
#923 from pengx17:2.4_macfix

Conflicts:
modules/calib3d/src/stereobm.cpp
modules/features2d/src/detectors.cpp
modules/gpu/src/error.cpp
modules/gpu/src/precomp.hpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/morph.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/precomp.cpp
modules/ocl/perf/precomp.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/pyrlk.cpp
modules/video/src/bgfg_gaussmix2.cpp
modules/video/src/lkpyramid.cpp
platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh
platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh
platforms/scripts/ABI_compat_generator.py
samples/ocl/facedetect.cpp

History

#1
Updated by Ilya Lysenkov almost 14 years ago

This is already fixed in trunk (missing include is at the line 39 of general.h)

  • Status changed from Open to Done
  • (deleted custom field) set to obsolete

Also available in: Atom PDF