platform/upstream/opencv.git
7 years agoMerge pull request #7163 from savuor:openvx_sample
Alexander Alekhin [Tue, 22 Nov 2016 19:10:48 +0000 (19:10 +0000)]
Merge pull request #7163 from savuor:openvx_sample

7 years agoMerge pull request #7662 from K-Shinotsuka:issue34
Vadim Pisarevsky [Tue, 22 Nov 2016 13:57:13 +0000 (13:57 +0000)]
Merge pull request #7662 from K-Shinotsuka:issue34

7 years agohide info warnings
Rostislav Vasilikhin [Tue, 22 Nov 2016 13:27:06 +0000 (16:27 +0300)]
hide info warnings

7 years agohiding silly warnings
apavlenko [Mon, 21 Nov 2016 09:31:48 +0000 (12:31 +0300)]
hiding silly warnings

7 years agocompilation fixed for C++98
Rostislav Vasilikhin [Mon, 21 Nov 2016 07:50:29 +0000 (10:50 +0300)]
compilation fixed for C++98

7 years agowarnings in ivx.hpp fixed
Andrey Pavlenko [Fri, 18 Nov 2016 13:22:11 +0000 (16:22 +0300)]
warnings in ivx.hpp fixed

* fixing 1.0.1

* fixing build without c++11

* hiding warnings

7 years ago"no previous declaration" warnings fixed in samples
Rostislav Vasilikhin [Fri, 18 Nov 2016 13:11:32 +0000 (16:11 +0300)]
"no previous declaration" warnings fixed in samples

7 years agobuild fixes for openvx-1.0.1 and c++03
Andrey Pavlenko [Fri, 18 Nov 2016 12:11:17 +0000 (15:11 +0300)]
build fixes for openvx-1.0.1 and c++03

* fixing 1.0.1
* fixing build without c++11

7 years agochanged image creation from handle
Rostislav Vasilikhin [Thu, 17 Nov 2016 16:42:58 +0000 (19:42 +0300)]
changed image creation from handle

7 years agosugar for single plane images
apavlenko [Thu, 17 Nov 2016 16:27:14 +0000 (19:27 +0300)]
sugar for single plane images

7 years agominor fixes in samples and ivx.hpp
Rostislav Vasilikhin [Thu, 17 Nov 2016 12:58:23 +0000 (15:58 +0300)]
minor fixes in samples and ivx.hpp

7 years agointeroperability OpenVX samples added
Rostislav Vasilikhin [Thu, 1 Sep 2016 11:34:34 +0000 (14:34 +0300)]
interoperability OpenVX samples added

7 years agoMerge pull request #7664 from K-Shinotsuka:issue35
Vadim Pisarevsky [Tue, 22 Nov 2016 13:49:14 +0000 (13:49 +0000)]
Merge pull request #7664 from K-Shinotsuka:issue35

7 years agoMerge pull request #7665 from K-Shinotsuka:issue36
Vadim Pisarevsky [Tue, 22 Nov 2016 13:44:42 +0000 (13:44 +0000)]
Merge pull request #7665 from K-Shinotsuka:issue36

7 years agoMerge pull request #7621 from terfendail:ovxhal_resizefix
Vadim Pisarevsky [Tue, 22 Nov 2016 13:39:20 +0000 (13:39 +0000)]
Merge pull request #7621 from terfendail:ovxhal_resizefix

7 years agoMerge pull request #7646 from alalek:cmake_ccache
Vadim Pisarevsky [Tue, 22 Nov 2016 13:35:43 +0000 (13:35 +0000)]
Merge pull request #7646 from alalek:cmake_ccache

7 years agoMerge pull request #7641 from alalek:warnings
Vadim Pisarevsky [Tue, 22 Nov 2016 13:31:26 +0000 (13:31 +0000)]
Merge pull request #7641 from alalek:warnings

7 years agoMerge pull request #7627 from sovrasov:fs_vec_of_vec
Vadim Pisarevsky [Tue, 22 Nov 2016 12:40:22 +0000 (12:40 +0000)]
Merge pull request #7627 from sovrasov:fs_vec_of_vec

7 years agoMerge pull request #7688 from alalek:fix_orb_test
Vadim Pisarevsky [Tue, 22 Nov 2016 11:35:07 +0000 (11:35 +0000)]
Merge pull request #7688 from alalek:fix_orb_test

7 years agoMerge pull request #7699 from alalek:test_hog_eps
Vadim Pisarevsky [Tue, 22 Nov 2016 10:19:52 +0000 (10:19 +0000)]
Merge pull request #7699 from alalek:test_hog_eps

7 years agoMerge pull request #7702 from lupustr3:pvlasov/ipp2017_filter_fix
Alexander Alekhin [Tue, 22 Nov 2016 09:49:17 +0000 (09:49 +0000)]
Merge pull request #7702 from lupustr3:pvlasov/ipp2017_filter_fix

7 years agoIPP 2017 filter2D fix;
Pavel Vlasov [Mon, 21 Nov 2016 14:18:03 +0000 (17:18 +0300)]
IPP 2017 filter2D fix;
filter2D IPP runtime check;

7 years agotest: change EPS in Objdetect_HOGDetector tests
Alexander Alekhin [Mon, 21 Nov 2016 11:20:25 +0000 (14:20 +0300)]
test: change EPS in Objdetect_HOGDetector tests

7 years agoMerge pull request #7691 from LaurentBerger:I7676
LaurentBerger [Mon, 21 Nov 2016 01:28:59 +0000 (02:28 +0100)]
Merge pull request #7691 from LaurentBerger:I7676

* Solve issue 7676

* I7676 bis

7 years agoMerge pull request #7695 from ArkadiuszRaj:aravis-release-bug-fix
Arek [Mon, 21 Nov 2016 01:22:43 +0000 (02:22 +0100)]
Merge pull request #7695 from ArkadiuszRaj:aravis-release-bug-fix

* Aravis: fixing releasing object when no communication with camera is possible

* Removing unnecessary include

7 years agoperf: disabled checks for magic numbers
Alexander Alekhin [Thu, 17 Nov 2016 13:58:12 +0000 (16:58 +0300)]
perf: disabled checks for magic numbers

Results are not bit-exact

7 years agofeatures2d: update rotation invariance test
Alexander Alekhin [Thu, 17 Nov 2016 13:36:39 +0000 (16:36 +0300)]
features2d: update rotation invariance test

Don't process keypoints near border, because after rotation border points
have contrast gradients with rotation border fill.

7 years agoMerge pull request #7644 from alalek:cmake_python_install
Alexander Alekhin [Fri, 18 Nov 2016 12:19:00 +0000 (12:19 +0000)]
Merge pull request #7644 from alalek:cmake_python_install

7 years agocmake: ccache
Alexander Alekhin [Tue, 8 Nov 2016 15:00:03 +0000 (18:00 +0300)]
cmake: ccache

7 years agowarnings
Alexander Alekhin [Thu, 17 Nov 2016 15:41:39 +0000 (18:41 +0300)]
warnings

7 years agoffmpeg: check return value
Alexander Alekhin [Thu, 10 Nov 2016 12:55:47 +0000 (15:55 +0300)]
ffmpeg: check return value

7 years agoMerge pull request #7625 from souch55:Fixapi
Alexander Alekhin [Thu, 17 Nov 2016 17:54:25 +0000 (17:54 +0000)]
Merge pull request #7625 from souch55:Fixapi

7 years agoMerge pull request #7673 from pengli:deriv
Alexander Alekhin [Thu, 17 Nov 2016 09:40:27 +0000 (09:40 +0000)]
Merge pull request #7673 from pengli:deriv

7 years agolaplacian ocl kernel optimization
Li Peng [Thu, 27 Oct 2016 06:52:26 +0000 (14:52 +0800)]
laplacian ocl kernel optimization

This ocl kernel is 46%~171% faster than current laplacian 3x3
ocl kernel in the perf test, with image format "CV_8UC1".

Signed-off-by: Li Peng <peng.li@intel.com>
7 years agoReplaced magic constant in large image handling check
Vitaly Tuzov [Wed, 16 Nov 2016 10:36:37 +0000 (13:36 +0300)]
Replaced magic constant in large image handling check

7 years agoMerge pull request #7681 from apavlenko:ivx-docs
Andrey Pavlenko [Wed, 16 Nov 2016 14:05:08 +0000 (17:05 +0300)]
Merge pull request #7681 from apavlenko:ivx-docs

OpenVX C++ wrappers docs (#7681)

* adding wrapper headers to the project to see them in IDE project explorer

* readme

* doxygen: toplevel brief-s

* more doxygen

* more doxygen

7 years agoAdd support of vector of vectors serialization to FileStorage
Vladislav Sovrasov [Tue, 8 Nov 2016 11:04:17 +0000 (14:04 +0300)]
Add support of vector of vectors serialization to FileStorage

7 years agoMerge pull request #7678 from dec1:tag_3.0.0
Alexander Alekhin [Tue, 15 Nov 2016 19:35:38 +0000 (19:35 +0000)]
Merge pull request #7678 from dec1:tag_3.0.0

7 years agoMerge pull request #7675 from filnet:msys2
Alexander Alekhin [Tue, 15 Nov 2016 15:59:27 +0000 (15:59 +0000)]
Merge pull request #7675 from filnet:msys2

7 years agoadd SSE code for RGB2HLS_f.
k-shinotsuka [Sun, 13 Nov 2016 14:13:02 +0000 (23:13 +0900)]
add SSE code for RGB2HLS_f.

7 years agofix error when building android sample:
Declan Moran [Tue, 15 Nov 2016 14:02:10 +0000 (15:02 +0100)]
fix error when building android sample:
https://github.com/opencv/opencv/issues/7590

7 years agocalib3d: fix missing cv::redirectError symbol error
Philippe Renon [Mon, 14 Nov 2016 23:33:11 +0000 (00:33 +0100)]
calib3d: fix missing cv::redirectError symbol error

happens on msys2 with gcc 6.2.0
see also http://stackoverflow.com/questions/38552221/undefined-reference-to-cvredirecterror-while-creating-shared-build-of-opencv-3

7 years agoFixed with review comments.
sourin [Wed, 9 Nov 2016 11:19:57 +0000 (16:49 +0530)]
Fixed with review comments.

7 years agoMerge pull request #7653 from pengli:deriv
Alexander Alekhin [Mon, 14 Nov 2016 13:40:04 +0000 (13:40 +0000)]
Merge pull request #7653 from pengli:deriv

7 years agoMerge pull request #7643 from alalek:libpng_aarch64
Alexander Alekhin [Mon, 14 Nov 2016 13:38:44 +0000 (13:38 +0000)]
Merge pull request #7643 from alalek:libpng_aarch64

7 years agoMerge pull request #7638 from ArkadiuszRaj:move-exif-from-jpeg-to-loadsave
Alexander Alekhin [Mon, 14 Nov 2016 13:37:41 +0000 (13:37 +0000)]
Merge pull request #7638 from ArkadiuszRaj:move-exif-from-jpeg-to-loadsave

7 years agoMerge pull request #7464 from reunanen:test-7409-7458
Juha Reunanen [Mon, 14 Nov 2016 13:31:29 +0000 (15:31 +0200)]
Merge pull request #7464 from reunanen:test-7409-7458

Change contour test images to be very wide (#7464)

* Change contour test images to be very wide (#7409, #7458)

Unfortunately, slows down the tests.

* Decrease the number of contour test cases, in order to (at least partially) offset the test run duration increase caused by making the test images wider

* Don't test with very wide images on 32-bit architectures

7 years agosobel and scharr ocl kernel optimization
Li Peng [Thu, 27 Oct 2016 04:41:40 +0000 (12:41 +0800)]
sobel and scharr ocl kernel optimization

It improves 108%~230% performance in the perf test
with image format "CV_8UC1" and kernel size 3.

Signed-off-by: Li Peng <peng.li@intel.com>
7 years agoadd SSE code for HLS2RGB_f.
k-shinotsuka [Sun, 13 Nov 2016 06:24:00 +0000 (15:24 +0900)]
add SSE code for HLS2RGB_f.

7 years agoadd SSE code for HSV2RGB_f.
k-shinotsuka [Sat, 12 Nov 2016 10:02:43 +0000 (19:02 +0900)]
add SSE code for HSV2RGB_f.

7 years agoMerge pull request #7656 from alalek:python_warning
Vadim Pisarevsky [Fri, 11 Nov 2016 20:37:38 +0000 (20:37 +0000)]
Merge pull request #7656 from alalek:python_warning

7 years agoMerge pull request #7654 from souch55:Fixgtk
Vadim Pisarevsky [Fri, 11 Nov 2016 20:35:24 +0000 (20:35 +0000)]
Merge pull request #7654 from souch55:Fixgtk

7 years agoMerge pull request #7539 from Tetragramm:90DegreeRotations
Vadim Pisarevsky [Fri, 11 Nov 2016 20:30:24 +0000 (20:30 +0000)]
Merge pull request #7539 from Tetragramm:90DegreeRotations

7 years agoMerge pull request #7645 from alalek:cmake_arm_toolchain
Vadim Pisarevsky [Fri, 11 Nov 2016 20:27:41 +0000 (20:27 +0000)]
Merge pull request #7645 from alalek:cmake_arm_toolchain

7 years agoMerge pull request #7642 from alalek:plantuml
Vadim Pisarevsky [Fri, 11 Nov 2016 15:06:56 +0000 (15:06 +0000)]
Merge pull request #7642 from alalek:plantuml

7 years agobuild: fix warning in python parser
Alexander Alekhin [Fri, 11 Nov 2016 14:45:12 +0000 (17:45 +0300)]
build: fix warning in python parser

/usr/lib/python3.5/re.py:203: FutureWarning: split() requires a non-empty pattern match.
  return _compile(pattern, flags).split(string, maxsplit)

7 years agoMerge pull request #7634 from paroj:undistpt
Vadim Pisarevsky [Fri, 11 Nov 2016 14:13:18 +0000 (14:13 +0000)]
Merge pull request #7634 from paroj:undistpt

7 years agoMerge pull request #7648 from alalek:cmake_warnings
Vadim Pisarevsky [Fri, 11 Nov 2016 14:09:11 +0000 (14:09 +0000)]
Merge pull request #7648 from alalek:cmake_warnings

7 years agoFix error gtk
sourin [Fri, 11 Nov 2016 05:25:38 +0000 (10:55 +0530)]
Fix error gtk

7 years agoUse transpose() as suggested, because it works on pre-existing destination Mats.
Tetragramm [Fri, 11 Nov 2016 03:35:00 +0000 (21:35 -0600)]
Use transpose() as suggested, because it works on pre-existing destination Mats.

7 years agoCompletely disabled OpenVX based implementation of resize HAL API
Vitaly Tuzov [Wed, 9 Nov 2016 20:33:40 +0000 (23:33 +0300)]
Completely disabled OpenVX based implementation of resize HAL API

7 years agoFix for OpenVX based implementation of resize HAL API
Vitaly Tuzov [Fri, 30 Sep 2016 11:55:06 +0000 (14:55 +0300)]
Fix for OpenVX based implementation of resize HAL API

7 years agoCompletely disabled OpenVX based implementation of warp HAL API
Vitaly Tuzov [Wed, 9 Nov 2016 20:34:10 +0000 (23:34 +0300)]
Completely disabled OpenVX based implementation of warp HAL API

7 years agoFix for OpenVX based implementation of wrapAffine HAL API
Vitaly Tuzov [Mon, 7 Nov 2016 14:04:00 +0000 (17:04 +0300)]
Fix for OpenVX based implementation of wrapAffine HAL API

7 years agoFix for large image handling in OpenVX based implementation of HAL API
Vitaly Tuzov [Wed, 9 Nov 2016 19:32:57 +0000 (22:32 +0300)]
Fix for large image handling in OpenVX based implementation of HAL API

7 years agoMerge pull request #7628 from sergiud:viz-vtkUnsignedCharArray-delete
Alexander Alekhin [Thu, 10 Nov 2016 17:04:04 +0000 (17:04 +0000)]
Merge pull request #7628 from sergiud:viz-vtkUnsignedCharArray-delete

7 years agoMerge pull request #7629 from alalek:issue_7626
Alexander Alekhin [Thu, 10 Nov 2016 16:35:08 +0000 (16:35 +0000)]
Merge pull request #7629 from alalek:issue_7626

7 years agoMerge pull request #7161 from terfendail:shortline_fix
Vadim Pisarevsky [Thu, 10 Nov 2016 16:02:19 +0000 (16:02 +0000)]
Merge pull request #7161 from terfendail:shortline_fix

7 years agoMerge pull request #7556 from terfendail:ovxhal_101compl
Vadim Pisarevsky [Thu, 10 Nov 2016 15:56:01 +0000 (15:56 +0000)]
Merge pull request #7556 from terfendail:ovxhal_101compl

7 years agocmake: eliminate configuration warnings
Alexander Alekhin [Sat, 29 Oct 2016 12:48:26 +0000 (15:48 +0300)]
cmake: eliminate configuration warnings

7 years agocmake: ARM toolchain: find ld/ar
Alexander Alekhin [Sat, 29 Oct 2016 13:15:24 +0000 (16:15 +0300)]
cmake: ARM toolchain: find ld/ar

7 years agocmake: ARM toolchain: do not force compiler version
Alexander Alekhin [Sat, 29 Oct 2016 12:44:55 +0000 (15:44 +0300)]
cmake: ARM toolchain: do not force compiler version

7 years agocmake: python installation
Alexander Alekhin [Sat, 29 Oct 2016 20:03:41 +0000 (23:03 +0300)]
cmake: python installation

Also fixes issue with empty PYTHON_PACKAGES_PATH (cross-compilation mode)

7 years agocmake: fix libpng for AARCH64
Alexander Alekhin [Sat, 29 Oct 2016 12:52:14 +0000 (15:52 +0300)]
cmake: fix libpng for AARCH64

7 years agoChange name to minimize confusion
Arkadiusz Raj [Thu, 10 Nov 2016 14:31:34 +0000 (15:31 +0100)]
Change name to minimize confusion

7 years agoAdd static to local function
Arkadiusz Raj [Thu, 10 Nov 2016 14:04:28 +0000 (15:04 +0100)]
Add static to local function

7 years agodocs: drop plantuml support
Alexander Alekhin [Thu, 10 Nov 2016 13:29:04 +0000 (16:29 +0300)]
docs: drop plantuml support

7 years agoMerge pull request #7550 from apavlenko:ivx
Andrey Pavlenko [Thu, 10 Nov 2016 11:43:08 +0000 (15:43 +0400)]
Merge pull request #7550 from apavlenko:ivx

C++ wrappers over OpenVX 1.x API (#7550)

* initial commit

* fixing missing swap(refcount) bug

* removing dead code

* fixinf identation

* splitting c++98 and external refcount definitions

* fixing formatToMatType

* using vector instead of initializer_list for consistency with c++98 API

* IVX_HIDE_INFO_WARNINGS

* just in case a compiler doesn't do this

* removing copy functionality from ImagePatch, Image can be used for that

* stricter type checks

7 years agoOpenVX 1.0.1 compliance update
Vitaly Tuzov [Wed, 26 Oct 2016 12:33:08 +0000 (15:33 +0300)]
OpenVX 1.0.1 compliance update

7 years agoAdded IMREAD_IGNORE_ORIENTATION flag
Arkadiusz Raj [Wed, 9 Nov 2016 17:09:22 +0000 (18:09 +0100)]
Added IMREAD_IGNORE_ORIENTATION flag

7 years agoundistortPoints: only consider distCoeffs if present
Pavel Rojtberg [Wed, 9 Nov 2016 13:19:23 +0000 (14:19 +0100)]
undistortPoints: only consider distCoeffs if present

iters should be 0 if we have no distortion. Also skip tilt distortion in
that case.
Furthermore move variable declarations to usage sites.

7 years agoMerge pull request #7632 from paroj:homgpt_int
Alexander Alekhin [Wed, 9 Nov 2016 14:55:10 +0000 (14:55 +0000)]
Merge pull request #7632 from paroj:homgpt_int

7 years agoMerge pull request #7602 from mshabunin:fix-opencl-warnings
Alexander Alekhin [Wed, 9 Nov 2016 12:35:00 +0000 (12:35 +0000)]
Merge pull request #7602 from mshabunin:fix-opencl-warnings

7 years agoconvertPointsToHomogeneous: fix output type for depth == CV_32S
Pavel Rojtberg [Wed, 9 Nov 2016 10:35:12 +0000 (11:35 +0100)]
convertPointsToHomogeneous: fix output type for depth == CV_32S

7 years agoMerge pull request #7624 from pengli:gaussian_blur
Alexander Alekhin [Wed, 9 Nov 2016 09:25:25 +0000 (09:25 +0000)]
Merge pull request #7624 from pengli:gaussian_blur

7 years agoMerge pull request #7618 from lupustr3:pvlasov/instrumentation_update
Alexander Alekhin [Tue, 8 Nov 2016 15:37:03 +0000 (15:37 +0000)]
Merge pull request #7618 from lupustr3:pvlasov/instrumentation_update

7 years agoimgproc: fix trailingZeros for MSVS 2010
Alexander Alekhin [Tue, 8 Nov 2016 12:44:52 +0000 (15:44 +0300)]
imgproc: fix trailingZeros for MSVS 2010

7 years agoviz: free new[] allocated arrays using delete[] instead of free
Sergiu Deitsch [Tue, 8 Nov 2016 11:54:58 +0000 (12:54 +0100)]
viz: free new[] allocated arrays using delete[] instead of free

Clang's AddressSanitizer throws an alloc-dealloc-mismatch (operator
new[] vs free) error here.

7 years ago--perf_instrument parameter now has int type and 0, 1, 2 modes (1 - simple trees...
Pavel Vlasov [Mon, 7 Nov 2016 09:15:51 +0000 (12:15 +0300)]
--perf_instrument parameter now has int type and 0, 1, 2 modes (1 - simple trees, 2 - expanded trees for functions with same name but different calling address);

Maximum depth limit var was added to the instrumentation structure;

Trace names output console output fix: improper tree formatting could happen;
Output in case of error was added;

Custom regions improvements;

Improved timing and weight calculation for parallel regions; New TC (threads counter) value to indicate how many different threads accessed particular node;

parallel_for, warnings fixes and ReturnAddress code from Alexander Alekhin;

7 years agogaussian blur ocl kernel optimization
Li Peng [Fri, 21 Oct 2016 05:17:45 +0000 (13:17 +0800)]
gaussian blur ocl kernel optimization

This ocl kernel is for 3x3 kernel size and CV_8UC1 format
It is 115% ~ 300% faster than current ocl path in perf test

python ./modules/ts/misc/run.py -t imgproc --gtest_filter=OCL_GaussianBlurFixture*

Signed-off-by: Li Peng <peng.li@intel.com>
7 years agoMerge pull request #7585 from pengli:morph_filter
Alexander Alekhin [Mon, 7 Nov 2016 17:11:32 +0000 (17:11 +0000)]
Merge pull request #7585 from pengli:morph_filter

7 years agoFixed several OpenCL compiler warnings
mshabunin [Wed, 2 Nov 2016 11:59:37 +0000 (14:59 +0300)]
Fixed several OpenCL compiler warnings

8 years agomorph ocl kernel for erode and dilate filter
Li Peng [Wed, 19 Oct 2016 06:53:05 +0000 (14:53 +0800)]
morph ocl kernel for erode and dilate filter

This kernel is for CV_8UC1 format and 3x3 kernel size,
It is about 33% ~ 55% faster than current ocl kernel with below perf test

python ./modules/ts/misc/run.py -t imgproc --gtest_filter=OCL_ErodeFixture*
python ./modules/ts/misc/run.py -t imgproc --gtest_filter=OCL_DilateFixture*

Also add accuracy test cases for this kernel, the test command is

./bin/opencv_test_imgproc --gtest_filter=OCL_Filter/MorphFilter3x3*

Signed-off-by: Li Peng <peng.li@intel.com>
8 years agoMerge pull request #7604 from rokm:highgui-qt
Alexander Alekhin [Thu, 3 Nov 2016 19:24:52 +0000 (19:24 +0000)]
Merge pull request #7604 from rokm:highgui-qt

8 years agoMerge pull request #7423 from grahamfyffe:leading_edges
Vadim Pisarevsky [Thu, 3 Nov 2016 11:20:42 +0000 (11:20 +0000)]
Merge pull request #7423 from grahamfyffe:leading_edges

8 years agoMerge pull request #7605 from tomoaki0705:fixBuildFp16Error
Alexander Alekhin [Thu, 3 Nov 2016 07:41:42 +0000 (07:41 +0000)]
Merge pull request #7605 from tomoaki0705:fixBuildFp16Error

8 years agoImprove the efficiency as suggested by vpisarev.
Tetragramm [Wed, 2 Nov 2016 22:44:13 +0000 (17:44 -0500)]
Improve the efficiency as suggested by vpisarev.
Alter the Rotation enum to be unambiguous as to direction.

8 years agoMerge pull request #7595 from sovrasov:fs_utf8_bom
Vadim Pisarevsky [Wed, 2 Nov 2016 15:27:48 +0000 (15:27 +0000)]
Merge pull request #7595 from sovrasov:fs_utf8_bom

8 years agofix build error
Tomoaki Teshima [Wed, 2 Nov 2016 14:18:58 +0000 (23:18 +0900)]
fix build error

8 years agoMerge pull request #7601 from sovrasov:remap_big_img_assert
Vadim Pisarevsky [Wed, 2 Nov 2016 14:17:04 +0000 (14:17 +0000)]
Merge pull request #7601 from sovrasov:remap_big_img_assert