Andrey Kamaev
|
47f72b538f
|
Added new performance tests for calcOpticalFlowPyrLK and buildOpticalFlowPyramid; extracted private header from lkpyramid.cpp
|
2012-05-21 13:07:53 +00:00 |
|
Andrey Kamaev
|
ac8f61ee91
|
Fixed Linux build
|
2012-05-21 08:53:38 +00:00 |
|
Andrey Kamaev
|
decd6c0fab
|
Restored QuartzCore framework for OS X
|
2012-05-20 19:05:36 +00:00 |
|
Andrey Kamaev
|
0716ebb7a6
|
Refactored highgui libraries search (tested on Windows only)
|
2012-05-20 18:49:57 +00:00 |
|
Andrey Kamaev
|
c9027fecc0
|
Fixed few MinGW build problems
|
2012-05-20 18:45:19 +00:00 |
|
Maria Dimashova
|
4d36be8794
|
skip of table header in MLData (#1962)
|
2012-05-19 14:34:36 +00:00 |
|
Andrey Kamaev
|
9961658eab
|
Fixing compile on some MinGW platforms
|
2012-05-19 10:44:43 +00:00 |
|
Maria Dimashova
|
28297c0224
|
fixed Mat::diag (#1939)
|
2012-05-18 14:38:54 +00:00 |
|
Andrey Kamaev
|
80f1b1478d
|
Fixed parameter name and copy condition
|
2012-05-18 13:29:49 +00:00 |
|
Andrey Kamaev
|
e309c51430
|
Fixed phaseCorrelate result for not power of 2 size images #1812 (thanks to Jeff Mast)
|
2012-05-18 08:33:19 +00:00 |
|
Andrey Kamaev
|
639bf3ee8f
|
Fixed accumulateWeighted with mask for multichannel matrices #1959
|
2012-05-18 06:08:14 +00:00 |
|
Andrey Kamaev
|
def87eae19
|
Fixed MinGW build after r8358
|
2012-05-17 20:19:48 +00:00 |
|
Anatoly Baksheev
|
b82b4a640d
|
fixed possible compilation error for macos
|
2012-05-17 14:55:29 +00:00 |
|
Andrey Kamaev
|
0ba3236ce0
|
Fixed Algorithm usage example #1904
|
2012-05-17 10:52:07 +00:00 |
|
Andrey Kamaev
|
8f3273bf07
|
Refactored per-computed pyramid handling in calcOpticalFlowPyrLK #1321
|
2012-05-17 10:29:53 +00:00 |
|
Vadim Pisarevsky
|
00c30681bc
|
Added Snap-to-Screen Edge feature in the case of multiple monitors (patch by Adi Shavit)
|
2012-05-16 16:13:24 +00:00 |
|
Andrey Kamaev
|
5f9e295adf
|
Added test and workaround for #1942
|
2012-05-16 15:11:17 +00:00 |
|
Andrey Kamaev
|
a877ecdcf0
|
Added option to pass pre-computed pyramid to piramidal LK optical flow #1321
|
2012-05-16 14:52:46 +00:00 |
|
Vadim Pisarevsky
|
f620f1ce57
|
fixed building avfoundation on MacOSX with iOS targets
|
2012-05-15 15:34:53 +00:00 |
|
Vadim Pisarevsky
|
8a5b6ced1a
|
fixed background update in GMM2 algorithm (ticket #1931)
|
2012-05-15 14:25:07 +00:00 |
|
Andrey Kamaev
|
8d135e8ea1
|
Shortened CMake script for opencv_world. Fixed opencv_world link with non-Visual Studio generators on Windows.
|
2012-05-13 09:34:33 +00:00 |
|
Vadim Pisarevsky
|
6dde56faf4
|
fixed building opencv_world with VS2010
|
2012-05-12 16:27:40 +00:00 |
|
Andrey Kamaev
|
3ec3c59197
|
Updated sanity threshold for convertTo perf test
|
2012-05-12 15:12:21 +00:00 |
|
Vadim Pisarevsky
|
9bbcebd6b0
|
added opencv_world module that combines all the other [selected by user] OpenCV modules, except for opencv_python and opencv_gpu.
|
2012-05-12 13:54:26 +00:00 |
|
Andrey Kamaev
|
8408499c94
|
Updated dot profuct function table
|
2012-05-12 11:44:54 +00:00 |
|
Vladislav Vinogradov
|
9df6e51a5b
|
added gpu::compare with scalars (Feature #1754)
|
2012-05-12 09:45:21 +00:00 |
|
Vadim Pisarevsky
|
52797a55e2
|
added support for vector<Mat_<>> in InputArray, OutputArray, split & merge
|
2012-05-11 13:36:48 +00:00 |
|
Vadim Pisarevsky
|
7a7dae3627
|
fixed problem with Mat::copyTo() with Mat_<> arguments (ticket #1918)
|
2012-05-11 12:40:20 +00:00 |
|
Vadim Pisarevsky
|
e794622776
|
propagated 2 fixed from 2.4 to trunk
|
2012-05-11 11:48:26 +00:00 |
|
Vladislav Vinogradov
|
2dafc9a853
|
fixed build under MacOS (disabled video decoding, it's not supported)
|
2012-05-11 11:48:15 +00:00 |
|
Alexander Reshetnikov
|
57e26bde9f
|
Accelerating the completion of video bypass (bug #1893)
|
2012-05-05 17:28:05 +00:00 |
|
Alexander Reshetnikov
|
3ec43a11ed
|
Fixed read error in VideoCapture for images (bug #1892); minor fix of ffmpeg wrapper warning
|
2012-05-05 14:43:03 +00:00 |
|
Anatoly Baksheev
|
fe91d1ca57
|
compilation for Macos
|
2012-05-04 12:11:01 +00:00 |
|
Vladislav Vinogradov
|
c65b7a9980
|
removed #include "cap_ffmpeg_impl_v2.hpp"
|
2012-05-03 08:34:14 +00:00 |
|
Andrey Kamaev
|
860172c626
|
run.py - fixed java tests launch on Windows
|
2012-05-03 07:50:24 +00:00 |
|
Anatoly Baksheev
|
a79c52a28f
|
updated printCudaDeviceInfo to support Kepler
|
2012-05-02 21:55:38 +00:00 |
|
Andrey Kamaev
|
3a1f85d4e8
|
Remerged the 2.4.0 branch
|
2012-05-02 20:20:14 +00:00 |
|
Vladislav Vinogradov
|
77717e1abc
|
fixed opencv_ffmpeg.dll name in gpu video encoding/decoding
|
2012-05-02 13:23:11 +00:00 |
|
Vladislav Vinogradov
|
ca57239618
|
fixed some problems after r8280 (lost code)
|
2012-05-02 13:07:30 +00:00 |
|
Vadim Pisarevsky
|
d5a0088bbe
|
merged 2.4 into trunk
|
2012-04-30 14:33:52 +00:00 |
|
Vladislav Vinogradov
|
3f1c6d7357
|
fixed PyrLKOpticalFlow.dense (final result size)
|
2012-04-28 13:12:14 +00:00 |
|
Vladislav Vinogradov
|
917063b7f7
|
reverted r8003 (CascadeClassifier_GPU)
|
2012-04-28 08:41:10 +00:00 |
|
Vladislav Vinogradov
|
76dc827648
|
added BruteForceMatcher_GPU (for legacy)
|
2012-04-28 07:41:21 +00:00 |
|
Alexey Spizhevoy
|
30431b94d9
|
Replaced CV_RANSAC in findHomography with CV_LMEDS (videostab)
|
2012-04-27 12:38:33 +00:00 |
|
Gary Bradski
|
54f92013b0
|
fix to Detector::write so that it doesn't abort on read
|
2012-04-27 04:05:33 +00:00 |
|
Alexey Spizhevoy
|
2799f51bf9
|
Minor changes in videostab module
|
2012-04-26 11:56:30 +00:00 |
|
Alexey Spizhevoy
|
02d34bdac2
|
Refactored videostab module
|
2012-04-26 09:01:15 +00:00 |
|
Alexander Kapustin
|
79e2070606
|
5 functions from addWeighted_func family were Neon Optimized
|
2012-04-26 08:18:01 +00:00 |
|
Alexander Kapustin
|
3e899f6fd7
|
File perf_addWeited.cpp added
|
2012-04-26 07:20:13 +00:00 |
|
Alexey Spizhevoy
|
2270c2f5bd
|
Refactored videostab module
|
2012-04-26 07:11:01 +00:00 |
|
Alexandre Benoit
|
9dfb1f77a0
|
fixed a dicide by zero potential problem
|
2012-04-25 13:56:09 +00:00 |
|
Alexey Spizhevoy
|
71391eb76f
|
Added LP based global motion estimation (videostab)
|
2012-04-25 13:21:38 +00:00 |
|
Vladislav Vinogradov
|
11eacb9d14
|
Bug #1823 : fixed patch size calculation in PyrLKOpticalFlow
|
2012-04-25 07:03:32 +00:00 |
|
Vladislav Vinogradov
|
4ddde66b48
|
fixed build without ffmpeg (gpu module)
|
2012-04-24 14:15:38 +00:00 |
|
Vladislav Vinogradov
|
1fba38d01c
|
updated gpu docs (BFMatcher_GPU)
|
2012-04-24 13:35:58 +00:00 |
|
Vladislav Vinogradov
|
5bafb372af
|
fixed bug in ORB_GPU, behavior in the absence of keypoints found (Bug #1831)
|
2012-04-24 13:18:34 +00:00 |
|
Vladislav Vinogradov
|
70f8b8b5ec
|
fixed GPU_NVidia/NCV.Visualization test
|
2012-04-24 12:36:15 +00:00 |
|
Alexey Spizhevoy
|
95efec7539
|
Added local outlier rejector. Added rigid motion estimator. Refactored videostab module.
|
2012-04-24 12:23:23 +00:00 |
|
Vladislav Vinogradov
|
6e830cf8f8
|
added additional tests to gpu::BFMatcher
|
2012-04-24 11:21:23 +00:00 |
|
Vladislav Vinogradov
|
44eaeee865
|
refactored gpu BruteForceMather (made it similar to BFMatcher)
|
2012-04-24 07:56:33 +00:00 |
|
Vladislav Vinogradov
|
c2935a6532
|
fixed build of gpu module without CUDA (video encoding/decoding)
|
2012-04-24 07:49:55 +00:00 |
|
Vladislav Vinogradov
|
f65d841d6f
|
fixed several warnings (VS2010, Win64)
added getParams method to VideoWriter_GPU
|
2012-04-23 14:22:02 +00:00 |
|
Alexey Spizhevoy
|
24be840c44
|
Added GPU version of wobble suppressor (videostab)
|
2012-04-23 10:37:07 +00:00 |
|
Alexander Kapustin
|
3675ef516a
|
6 functions from Inrange_func family were Neon Optimized
|
2012-04-23 09:31:08 +00:00 |
|
Alexander Kapustin
|
0094b468e6
|
Fail perf_inRange.cpp added
|
2012-04-23 09:09:30 +00:00 |
|
Vladislav Vinogradov
|
1eebb4506a
|
removed unnecessary CV_EXPORTS
|
2012-04-23 08:31:14 +00:00 |
|
Alexey Spizhevoy
|
36ef599840
|
Fixed trim ratio estimation for the case of homographies motion model (videostab)
|
2012-04-23 06:42:55 +00:00 |
|
Alexey Spizhevoy
|
ae8d377561
|
Replaced DECOMP_SVD with DECOMP_NORMAL|DECOMP_LU for speed (videostab)
|
2012-04-20 09:02:39 +00:00 |
|
Alexey Spizhevoy
|
f355f798a4
|
Minor changes in videostab module and sample
|
2012-04-19 10:27:17 +00:00 |
|
Alexey Spizhevoy
|
f42eea1029
|
Added timing for main steps (videostab)
|
2012-04-19 09:29:13 +00:00 |
|
Alexey Spizhevoy
|
536d36b05a
|
Refactoring (videostab)
|
2012-04-18 17:00:07 +00:00 |
|
Alexey Spizhevoy
|
1569c1ed52
|
Added GPU version of PyrLK based global motion estimator (videostab)
|
2012-04-18 13:23:41 +00:00 |
|
Vladislav Vinogradov
|
1351f4c8ef
|
added docs for VideoReader_GPU
|
2012-04-18 12:46:56 +00:00 |
|
Vladislav Vinogradov
|
dd6b11b87d
|
fixed build without CUDA
|
2012-04-18 11:25:56 +00:00 |
|
Vladislav Vinogradov
|
f4b4665940
|
added VideoReader_GPU
|
2012-04-18 11:18:25 +00:00 |
|
Andrey Pavlenko
|
b0dd192d52
|
fixing #1800
|
2012-04-17 15:33:18 +00:00 |
|
Vladislav Vinogradov
|
ffbee1fe97
|
added docs for VideoWriter_GPU
|
2012-04-17 11:36:37 +00:00 |
|
Vladislav Vinogradov
|
70909738f4
|
added support of different surface formats to VideoWriter_GPU
added key frame handling to ffmpeg wrappers
|
2012-04-17 11:08:08 +00:00 |
|
Alexey Spizhevoy
|
4c44ccc3c9
|
Removed unnecessary code (videostab)
|
2012-04-17 09:30:16 +00:00 |
|
Alexey Spizhevoy
|
dfedaff99b
|
Removed unnecessary code (videostab)
|
2012-04-17 09:21:09 +00:00 |
|
Alexey Spizhevoy
|
19c30eaa11
|
Refactored videostab module
|
2012-04-17 09:12:14 +00:00 |
|
Vladislav Vinogradov
|
2bfaf540a1
|
added VideoWriter_GPU
|
2012-04-17 07:12:16 +00:00 |
|
Alexey Spizhevoy
|
0824cf5059
|
Added info about papers (videostab)
|
2012-04-16 11:45:08 +00:00 |
|
Alexander Kapustin
|
9bb6e899f3
|
12 functions from Norm_func family were Neon Optimized
|
2012-04-16 11:39:38 +00:00 |
|
Alexey Spizhevoy
|
306248e444
|
Added support of Clp for Windows
|
2012-04-16 11:10:41 +00:00 |
|
Alexey Spizhevoy
|
601d2843f4
|
Fixed LP based stabilizer
|
2012-04-16 07:08:28 +00:00 |
|
Alexey Spizhevoy
|
40e7990b6b
|
Added linear programming based stabilizer (videostab)
|
2012-04-16 06:41:06 +00:00 |
|
Andrey Kamaev
|
c4af85043a
|
merged few missed changes from 2.4 to trunk
|
2012-04-15 23:19:57 +00:00 |
|
Vadim Pisarevsky
|
2fd1e2ea57
|
merged all the latest changes from 2.4 to trunk
|
2012-04-13 21:50:59 +00:00 |
|
Alexey Spizhevoy
|
cc0ecf9123
|
Removed unnecessary line (videostab)
|
2012-04-12 13:58:25 +00:00 |
|
Alexey Spizhevoy
|
df410ce246
|
Removed unnecessary line (videostab)
|
2012-04-12 13:57:28 +00:00 |
|
Ilya Lysenkov
|
04ac6db04a
|
Added support of CV_16S depth in morphology operations
|
2012-04-12 10:55:47 +00:00 |
|
Alexey Spizhevoy
|
9d871abd32
|
Refactored videostab module. Added normalization into motion estimators.
|
2012-04-11 14:02:10 +00:00 |
|
Ilya Lysenkov
|
258afe7cc2
|
Added OPTFLOW_LK_GET_MIN_EIGENVALS flag as alias for CV_LKFLOW_GET_MIN_EIGENVALS.
|
2012-04-11 12:36:16 +00:00 |
|
Alexey Spizhevoy
|
ae839df55d
|
Added WITH_CLP flag support into cmake scripts.
|
2012-04-11 12:34:30 +00:00 |
|
Alexey Spizhevoy
|
b5a1bad7a4
|
Added more flags for motion estimation in videostab sample
|
2012-04-11 10:17:35 +00:00 |
|
Alexey Spizhevoy
|
b549900fe1
|
Minor fixes and updates in videostab module and sample
|
2012-04-10 10:33:19 +00:00 |
|
Alexey Spizhevoy
|
673f879ccd
|
Fixed bug in videostab sample. Fixed model size in global estimators.
|
2012-04-10 09:07:30 +00:00 |
|
Alexey Spizhevoy
|
39cd13583f
|
Fixed bug in motion stabilization pipeline and updated wobble stabilizer (videostab)
|
2012-04-09 11:58:56 +00:00 |
|
Alexey Spizhevoy
|
d9d4755387
|
Updated wobble suppression code in videostab module
|
2012-04-06 08:52:31 +00:00 |
|
Alexey Spizhevoy
|
fa09f3d121
|
Refactored videostab module. Added MoreAccurateMotionWobbleSuppressor class
|
2012-04-05 13:23:42 +00:00 |
|
Alexey Spizhevoy
|
f32b645b96
|
Refactored videostab module, added base class for woobble suppression
|
2012-04-05 09:15:13 +00:00 |
|
Marius Muja
|
fd9a8c609f
|
Bug fix in LSH index
|
2012-04-05 06:46:42 +00:00 |
|
Andrey Pavlenko
|
dc8c281fa1
|
fixing compilation
|
2012-04-05 05:02:24 +00:00 |
|
Alexey Spizhevoy
|
a7da9681c3
|
Added motion stabilization pipeline (videostab module)
|
2012-04-04 13:58:38 +00:00 |
|
Alexey Spizhevoy
|
9c44715f50
|
Added asserts into global motion estimation functions (videostab module)
|
2012-04-04 11:49:48 +00:00 |
|
Alexey Spizhevoy
|
efa0717d01
|
Added support of homography estimation into videostab module
|
2012-04-04 11:45:16 +00:00 |
|
Alexey Spizhevoy
|
ecb1f0e288
|
Fixed some bugs in videostab module and refactored it
|
2012-04-04 09:28:47 +00:00 |
|
Vladislav Vinogradov
|
2659453694
|
merged revisions r7808 from 2.4 branch
|
2012-04-03 06:49:13 +00:00 |
|
Alexander Kapustin
|
42e0214de5
|
36 functions of cvtScaleTIPES_func were Neon Optimized
|
2012-04-03 05:53:26 +00:00 |
|
Alexander Shishkov
|
9bfd50e6ae
|
merged revisions r7802,r7804,r7805 from 2.4 branch
|
2012-04-03 00:33:33 +00:00 |
|
Alexey Spizhevoy
|
56b5e6d8a8
|
Updated videostab module
|
2012-04-02 12:26:05 +00:00 |
|
Alexey Spizhevoy
|
3e23bb6df6
|
Refactored videostab module and sample
|
2012-04-02 09:25:27 +00:00 |
|
Vladislav Vinogradov
|
489a1da0ed
|
fixeg gpu::Laplacian
|
2012-04-02 08:20:23 +00:00 |
|
Andrey Kamaev
|
b880bbcc18
|
Fixed Java API build
|
2012-04-01 10:19:54 +00:00 |
|
Alexander Shishkov
|
66fd36f79e
|
changed version to 2.4
|
2012-04-01 08:58:24 +00:00 |
|
Vladislav Vinogradov
|
82d619a34d
|
fixed gpu::filter2D
|
2012-04-01 07:32:25 +00:00 |
|
Andrey Kamaev
|
fd31234122
|
Fixed gcc build
|
2012-03-31 23:51:59 +00:00 |
|
Anatoly Baksheev
|
e1fd68b21e
|
fixed #1257 ( HaarCascadeApplication GPU test crash )
|
2012-03-31 23:49:35 +00:00 |
|
Andrey Kamaev
|
470f6fafeb
|
Fixed conversions from YV12 and IYUV on non-continuous input. Added accuracy and performance tests.
|
2012-03-31 22:30:18 +00:00 |
|
Anatoly Baksheev
|
a22641aa9c
|
fixed bug #1367 in CSBP
|
2012-03-31 22:07:16 +00:00 |
|
Anatoly Baksheev
|
d2bc0065a6
|
minor
|
2012-03-31 20:01:18 +00:00 |
|
Vadim Pisarevsky
|
eecda6d308
|
added explicit () to avoid MSVC /analyze warning
|
2012-03-31 17:39:06 +00:00 |
|
Andrey Kamaev
|
d95721107c
|
Fixed typo.
|
2012-03-31 17:34:24 +00:00 |
|
Vadim Pisarevsky
|
5c615ec28f
|
added optional dependency stitching->nonfree. When nonfree is available, make sure linker does not throw it away.
|
2012-03-31 17:25:19 +00:00 |
|
Alexander Reshetnikov
|
1c616f43ba
|
Fixed compilation error with ffmpeg 0.9.x & 0.10.x
|
2012-03-31 17:06:35 +00:00 |
|
Vladislav Vinogradov
|
4a41107b01
|
applied patch #1734
|
2012-03-31 17:05:33 +00:00 |
|
Andrey Kamaev
|
124ceb96a7
|
#1732 Added yuv420p to RGB conversion. Thanks to Robert Abel.
|
2012-03-31 15:33:03 +00:00 |
|
Alexander Reshetnikov
|
4ec2ad91b9
|
Removed duplicated includes from ffmpeg wrappers
|
2012-03-31 15:27:48 +00:00 |
|
Alexander Reshetnikov
|
958d5a0caa
|
Solved a problem with VideoWriter in the new wrapper
|
2012-03-31 15:12:45 +00:00 |
|
Alexander Reshetnikov
|
ab0fc84781
|
Fixed compilation error under Ubuntu 11.10; added #if-#else-#endif code for some deprecated functions
|
2012-03-31 15:10:13 +00:00 |
|
Andrey Kamaev
|
72f2523d0f
|
Fixed ~20 potential errors identified by the MS complier.
|
2012-03-31 11:09:16 +00:00 |
|
Vadim Pisarevsky
|
1e5a600d13
|
fixed video capturing on Mac running Windows (ticket #988)
|
2012-03-31 08:56:48 +00:00 |
|
Vadim Pisarevsky
|
f309bafe9e
|
another fix for cap_dshow.cpp; fixed warning in facerec_demo
|
2012-03-30 20:06:06 +00:00 |
|
Alexander Reshetnikov
|
3a564d1ae8
|
Updated displayOverlay's implementation & documentation (ticket #903)
|
2012-03-30 19:58:44 +00:00 |
|
Andrey Kamaev
|
7a017973bf
|
Fixed Windows build (MSVC 10 Win32)
internal CV_CAP_PROP_ZOOM is renamed to CV_CAP_PROP_ZOOM_DSHOW
internal CV_CAP_PROP_FOCUS is renamed to CV_CAP_PROP_FOCUS_DSHOW
|
2012-03-30 19:26:15 +00:00 |
|
Vadim Pisarevsky
|
f0b8b81caa
|
applied big patch #1281 by Martin Beckett (various direct show video capture enhancements)
|
2012-03-30 18:39:03 +00:00 |
|
Vadim Pisarevsky
|
7fb8e9d328
|
added borderType to pyrDown, pyrUp & buildPyramid (patch #925)
|
2012-03-30 16:58:24 +00:00 |
|
Alexander Reshetnikov
|
aff34adf1b
|
Updated new ffmpeg wrapper
|
2012-03-30 16:57:41 +00:00 |
|
Andrey Kamaev
|
dc6cad3d4b
|
Fixed build with tests disabled
|
2012-03-30 16:21:46 +00:00 |
|
Andrey Kamaev
|
0d18d19ad6
|
Fixed Android build warnings
|
2012-03-30 16:10:52 +00:00 |
|
Maria Dimashova
|
7f2cda6c8c
|
fix the ticket #1234
|
2012-03-30 15:04:51 +00:00 |
|
Alexander Reshetnikov
|
e00f1e3911
|
Fixed a problem with CODEC_ID_RAWVIDEO in FFMPEG (ticket #1400)
|
2012-03-30 14:30:24 +00:00 |
|
Andrey Pavlenko
|
aea24ffcd5
|
#796, #1701 fixing doc vs code arg-s naming consistency
|
2012-03-30 14:22:34 +00:00 |
|
Vadim Pisarevsky
|
38f686252c
|
added video stream positioning in QTKit-based VideoCapture backend (patch #1420)
|
2012-03-30 14:13:21 +00:00 |
|
Andrey Kamaev
|
a4f5216d52
|
Fixed gcc build after r7751
|
2012-03-30 14:03:18 +00:00 |
|
Vadim Pisarevsky
|
22a0d6b7d1
|
possible fix for #1396
|
2012-03-30 13:51:15 +00:00 |
|
Anatoly Baksheev
|
406a05316f
|
removed obsolete docs about cuda contexts
|
2012-03-30 13:43:50 +00:00 |
|
Ivan Korolev
|
856aaee8cd
|
Fixed the path to the testdata.
|
2012-03-30 12:48:47 +00:00 |
|
Ivan Korolev
|
44d4e85d9e
|
Fixed the path to the testdata.
|
2012-03-30 12:27:17 +00:00 |
|