platform/upstream/opencv.git
6 years agoMake external cv::dnn::Importer usage is deprecated
Dmitry Kurtaev [Thu, 3 Aug 2017 14:43:52 +0000 (17:43 +0300)]
Make external cv::dnn::Importer usage is deprecated

6 years agoMerge pull request #9599 from whizzzkid:master
Nishant Arora [Sun, 17 Sep 2017 19:24:43 +0000 (13:24 -0600)]
Merge pull request #9599 from whizzzkid:master

Incorrect Naming (#9599)

* Resolved #9544

* This is a better fix

* This should be good.

6 years agoMerge pull request #9313 from dkurt:dnn_perf_test
Vadim Pisarevsky [Sat, 16 Sep 2017 19:39:23 +0000 (19:39 +0000)]
Merge pull request #9313 from dkurt:dnn_perf_test

6 years agoMerge pull request #9626 from T0ny0:fisheye_fix_
Alexander Alekhin [Fri, 15 Sep 2017 20:29:39 +0000 (20:29 +0000)]
Merge pull request #9626 from T0ny0:fisheye_fix_

6 years agoremove assignments in expressions
Tony0 [Fri, 15 Sep 2017 19:45:17 +0000 (22:45 +0300)]
remove assignments in expressions

6 years agoMerge pull request #9458 from csukuangfj:fix-doc
Alexander Alekhin [Fri, 15 Sep 2017 19:35:01 +0000 (19:35 +0000)]
Merge pull request #9458 from csukuangfj:fix-doc

6 years agoMerge pull request #9526 from sturkmen72:update_documentation
Alexander Alekhin [Fri, 15 Sep 2017 18:47:06 +0000 (18:47 +0000)]
Merge pull request #9526 from sturkmen72:update_documentation

6 years agoMerge pull request #9384 from dkurt:torch_split
Vadim Pisarevsky [Fri, 15 Sep 2017 13:05:05 +0000 (13:05 +0000)]
Merge pull request #9384 from dkurt:torch_split

6 years agoMerge pull request #9301 from dkurt:dnn_npy
Vadim Pisarevsky [Fri, 15 Sep 2017 12:42:02 +0000 (12:42 +0000)]
Merge pull request #9301 from dkurt:dnn_npy

6 years agoMerge pull request #9524 from dkurt:dnn_torch_openface
Vadim Pisarevsky [Fri, 15 Sep 2017 12:38:11 +0000 (12:38 +0000)]
Merge pull request #9524 from dkurt:dnn_torch_openface

6 years agoMerge pull request #9560 from sovrasov:undistort_stop_criteria
Vadim Pisarevsky [Fri, 15 Sep 2017 12:34:16 +0000 (12:34 +0000)]
Merge pull request #9560 from sovrasov:undistort_stop_criteria

6 years agoMerge pull request #9633 from saskatchewancatch:psnr-doc
Vadim Pisarevsky [Fri, 15 Sep 2017 12:26:34 +0000 (12:26 +0000)]
Merge pull request #9633 from saskatchewancatch:psnr-doc

6 years agoMerge pull request #9616 from dkurt:feature_dnn_tf_importer_atrous_conv
Vadim Pisarevsky [Fri, 15 Sep 2017 10:24:05 +0000 (10:24 +0000)]
Merge pull request #9616 from dkurt:feature_dnn_tf_importer_atrous_conv

6 years agoMerge pull request #9623 from dkurt:hotfix_disable_ssd_cpu_halide_test
Vadim Pisarevsky [Fri, 15 Sep 2017 10:21:44 +0000 (10:21 +0000)]
Merge pull request #9623 from dkurt:hotfix_disable_ssd_cpu_halide_test

6 years agoi9629 - Added actual documentation for cv::PSNR function
saskatchewancatch [Fri, 15 Sep 2017 00:20:00 +0000 (18:20 -0600)]
i9629 - Added actual documentation for cv::PSNR function

6 years agofisheye: fix initUndistortRectifyMap()
Tony0 [Thu, 14 Sep 2017 11:57:21 +0000 (14:57 +0300)]
fisheye: fix initUndistortRectifyMap()

6 years agoBit-exact version of RGB2Luv_b (#9226)
Rostislav Vasilikhin [Thu, 14 Sep 2017 11:51:27 +0000 (14:51 +0300)]
Bit-exact version of RGB2Luv_b (#9226)

* Imgproc_ColorLab_Full.accuracy test fixed

* Lab and Luv tests: rewritten, constants explained

* CV_ColorCvtBaseTest: added methods for 8u implementations

* Lab2RGB_b: bit-exactness enabled for all modes; non-vectorized code fixed to comply with vectorized

* srgb support added

* XYZ constants made softdouble

* bit-exact tests written for Lab

* ColorLab_full test fixed

* reverted: no 8u convertors for CV_ColorCvtBaseTest

* added checksum-based test for Lab bit-exactness

* extra declarations removed

* Lab test fix: stop at first mismatch

* test info output improved

* error message fixed

* lab_tetra squashed

* initial version is almost written

* unfinished work

* compilation fixed, to be debugged

* Lab test removed

* more fixes

* Luv2RGBinteger: channels order fixed

* Lab structs removed

* good trilinear interpolation added

* several fixes

* removed Luv2RGB interpolations, XYZ tables; 8-cell LUT added

* no_interpolate made 8-cell

* interpolations rewritten to 8-cell, minor fixes

* packed interpolation added for RGB2Luv

* tetra implemented

* removing unnecessary code

* LUT building merged

* changes ported to color.cpp

* minor fixes; try to suppress warnings

* fixed v range of Luv

* fixed incorrect src channel number

* minor fixes

* preliminary version of Luv2RGBinteger is done

* Luv2RGB_b is in progress

* XYZ color constants converted to softfloat

* Luv test: precision fixed

* Luv bit-exactness test added

* warnings fixed

* compilation fixed, error message fixed

* test_lab.cpp removed

6 years agoimgproc: slightly change the signature of undistortPoints overload
Vladislav Sovrasov [Thu, 14 Sep 2017 08:13:36 +0000 (11:13 +0300)]
imgproc: slightly change the signature of undistortPoints overload

6 years agoimgproc: add stop criteria tuning in undistortPoints
Vladislav Sovrasov [Tue, 5 Sep 2017 13:05:13 +0000 (16:05 +0300)]
imgproc: add stop criteria tuning in undistortPoints

6 years agoTorch's Concat and ConcatTable doesn't use Split layer
Dmitry Kurtaev [Wed, 16 Aug 2017 18:11:59 +0000 (21:11 +0300)]
Torch's Concat and ConcatTable doesn't use Split layer

6 years agoLayers for OpenFace face recognition network
Dmitry Kurtaev [Mon, 28 Aug 2017 14:37:09 +0000 (17:37 +0300)]
Layers for OpenFace face recognition network

6 years agoDilated convolution import from TensorFlow
Dmitry Kurtaev [Tue, 12 Sep 2017 12:56:51 +0000 (15:56 +0300)]
Dilated convolution import from TensorFlow

6 years agoDisable SSD on CPU Halide test
Dmitry Kurtaev [Wed, 13 Sep 2017 15:15:23 +0000 (18:15 +0300)]
Disable SSD on CPU Halide test

6 years agoMerge pull request #9592 from alalek:issue_9589
Vadim Pisarevsky [Wed, 13 Sep 2017 14:57:49 +0000 (14:57 +0000)]
Merge pull request #9592 from alalek:issue_9589

6 years agoImprove README (#9243)
Faheel Ahmad [Wed, 13 Sep 2017 14:58:34 +0000 (20:28 +0530)]
Improve README (#9243)

6 years agoMerge pull request #9603 from alalek:ocl_device_extensions
Vadim Pisarevsky [Wed, 13 Sep 2017 14:43:36 +0000 (14:43 +0000)]
Merge pull request #9603 from alalek:ocl_device_extensions

6 years agoMerge pull request #9374 from savuor:test_lab_bit_exact
Vadim Pisarevsky [Wed, 13 Sep 2017 14:39:04 +0000 (14:39 +0000)]
Merge pull request #9374 from savuor:test_lab_bit_exact

6 years agodocumentation improvement
Suleyman TURKMEN [Thu, 31 Aug 2017 13:39:28 +0000 (16:39 +0300)]
documentation improvement

6 years agoRemoved hard-coded version from integration test. (#9335)
Kerry Billingham [Wed, 13 Sep 2017 14:19:16 +0000 (15:19 +0100)]
Removed hard-coded version from integration test. (#9335)

Documented how to change the version of Maven to match OpenCV core and modified bash scripts accordingly.

Extracted integration test module and placed into own profile.

Configured CMake Maven plugin to use native CMake by default.

Updated documentation.

6 years agoMerge pull request #9406 from Cartucho:update_core_tutorials
Vadim Pisarevsky [Wed, 13 Sep 2017 14:09:39 +0000 (14:09 +0000)]
Merge pull request #9406 from Cartucho:update_core_tutorials

6 years agoMerge pull request #9574 from saskatchewancatch:i9482
Vadim Pisarevsky [Wed, 13 Sep 2017 13:59:43 +0000 (13:59 +0000)]
Merge pull request #9574 from saskatchewancatch:i9482

6 years agoMerge pull request #9576 from dkurt:feature_dnn_tf_importer_fp16
Vadim Pisarevsky [Wed, 13 Sep 2017 13:57:38 +0000 (13:57 +0000)]
Merge pull request #9576 from dkurt:feature_dnn_tf_importer_fp16

6 years agoMerge pull request #9541 from sturkmen72:patch-15
Vadim Pisarevsky [Wed, 13 Sep 2017 13:47:26 +0000 (13:47 +0000)]
Merge pull request #9541 from sturkmen72:patch-15

6 years agoMerge pull request #9561 from dkurt:fix_8693
Vadim Pisarevsky [Wed, 13 Sep 2017 13:34:49 +0000 (13:34 +0000)]
Merge pull request #9561 from dkurt:fix_8693

6 years agoMerge pull request #9566 from alalek:python_signatures
Vadim Pisarevsky [Wed, 13 Sep 2017 13:32:05 +0000 (13:32 +0000)]
Merge pull request #9566 from alalek:python_signatures

6 years agoMerge pull request #9569 from dkurt:test_dnn_ssd_halide
Vadim Pisarevsky [Wed, 13 Sep 2017 13:29:50 +0000 (13:29 +0000)]
Merge pull request #9569 from dkurt:test_dnn_ssd_halide

6 years agoMerge pull request #9600 from StevenPuttemans:fix_9583
Vadim Pisarevsky [Wed, 13 Sep 2017 13:27:04 +0000 (13:27 +0000)]
Merge pull request #9600 from StevenPuttemans:fix_9583

6 years agoMerge pull request #9581 from sovrasov:rtree_disable_cv
Vadim Pisarevsky [Wed, 13 Sep 2017 13:20:52 +0000 (13:20 +0000)]
Merge pull request #9581 from sovrasov:rtree_disable_cv

6 years agoUpdate train_HOG.cpp
Suleyman TURKMEN [Sun, 26 Jun 2016 00:42:10 +0000 (03:42 +0300)]
Update train_HOG.cpp

6 years agoerror message fixed
Rostislav Vasilikhin [Tue, 12 Sep 2017 17:05:58 +0000 (20:05 +0300)]
error message fixed

6 years agotest info output improved
Rostislav Vasilikhin [Fri, 25 Aug 2017 16:07:31 +0000 (19:07 +0300)]
test info output improved

6 years agoLab test fix: stop at first mismatch
Rostislav Vasilikhin [Thu, 17 Aug 2017 15:54:50 +0000 (18:54 +0300)]
Lab test fix: stop at first mismatch

6 years agoextra declarations removed
Rostislav Vasilikhin [Wed, 16 Aug 2017 23:34:32 +0000 (02:34 +0300)]
extra declarations removed

6 years agoadded checksum-based test for Lab bit-exactness
Rostislav Vasilikhin [Wed, 16 Aug 2017 23:14:42 +0000 (02:14 +0300)]
added checksum-based test for Lab bit-exactness

6 years agoreverted: no 8u convertors for CV_ColorCvtBaseTest
Rostislav Vasilikhin [Wed, 16 Aug 2017 23:13:11 +0000 (02:13 +0300)]
reverted: no 8u convertors for CV_ColorCvtBaseTest

6 years agoColorLab_full test fixed
Rostislav Vasilikhin [Tue, 15 Aug 2017 15:44:59 +0000 (18:44 +0300)]
ColorLab_full test fixed

6 years agobit-exact tests written for Lab
Rostislav Vasilikhin [Tue, 15 Aug 2017 15:43:55 +0000 (18:43 +0300)]
bit-exact tests written for Lab

6 years agoXYZ constants made softdouble
Rostislav Vasilikhin [Tue, 15 Aug 2017 15:22:19 +0000 (18:22 +0300)]
XYZ constants made softdouble

6 years agosrgb support added
Rostislav Vasilikhin [Tue, 15 Aug 2017 15:21:25 +0000 (18:21 +0300)]
srgb support added

6 years agoLab2RGB_b: bit-exactness enabled for all modes; non-vectorized code fixed to comply...
Rostislav Vasilikhin [Tue, 15 Aug 2017 15:15:13 +0000 (18:15 +0300)]
Lab2RGB_b: bit-exactness enabled for all modes; non-vectorized code fixed to comply with vectorized

6 years agoCV_ColorCvtBaseTest: added methods for 8u implementations
Rostislav Vasilikhin [Thu, 10 Aug 2017 16:01:36 +0000 (19:01 +0300)]
CV_ColorCvtBaseTest: added methods for 8u implementations

6 years agoLab and Luv tests: rewritten, constants explained
Rostislav Vasilikhin [Thu, 10 Aug 2017 14:26:42 +0000 (17:26 +0300)]
Lab and Luv tests: rewritten, constants explained

6 years agoImgproc_ColorLab_Full.accuracy test fixed
Rostislav Vasilikhin [Thu, 10 Aug 2017 13:36:46 +0000 (16:36 +0300)]
Imgproc_ColorLab_Full.accuracy test fixed

6 years agoImport and convert FP16 weights from TensorFlow
Dmitry Kurtaev [Thu, 7 Sep 2017 07:18:13 +0000 (10:18 +0300)]
Import and convert FP16 weights from TensorFlow

6 years agoMerge pull request #9606 from sovrasov:fix_gcc7_warnings
Alexander Alekhin [Mon, 11 Sep 2017 18:45:30 +0000 (18:45 +0000)]
Merge pull request #9606 from sovrasov:fix_gcc7_warnings

6 years agocmake: disable implicit-fallthrough by default
Vladislav Sovrasov [Mon, 11 Sep 2017 13:04:00 +0000 (16:04 +0300)]
cmake: disable implicit-fallthrough by default

6 years agofixing issue 9583 - issue in cascadeclassifier code clipObjects
Steven Puttemans [Sat, 9 Sep 2017 07:51:20 +0000 (09:51 +0200)]
fixing issue 9583 - issue in cascadeclassifier code clipObjects

6 years agoMore whitespace fixes
saskatchewancatch [Mon, 11 Sep 2017 01:03:56 +0000 (19:03 -0600)]
More whitespace fixes

6 years agots: dump OpenCL device extensions
Alexander Alekhin [Thu, 7 Sep 2017 11:22:48 +0000 (14:22 +0300)]
ts: dump OpenCL device extensions

6 years agoocl: added cv::ocl::Device::isExtensionSupported() method
Alexander Alekhin [Wed, 6 Sep 2017 20:15:47 +0000 (23:15 +0300)]
ocl: added cv::ocl::Device::isExtensionSupported() method

6 years agoMerge pull request #9580 from mshabunin:fix-static-6
Alexander Alekhin [Sat, 9 Sep 2017 19:31:21 +0000 (19:31 +0000)]
Merge pull request #9580 from mshabunin:fix-static-6

6 years agoMerge pull request #9590 from alalek:ocl_runtime_fix
Alexander Alekhin [Sat, 9 Sep 2017 19:30:07 +0000 (19:30 +0000)]
Merge pull request #9590 from alalek:ocl_runtime_fix

6 years agoTutorial Mask Operations on Matrices
tribta [Mon, 21 Aug 2017 14:08:13 +0000 (15:08 +0100)]
Tutorial Mask Operations on Matrices

6 years agoTutorial Discrete Fourier Transform
tribta [Sun, 20 Aug 2017 12:45:46 +0000 (13:45 +0100)]
Tutorial Discrete Fourier Transform

6 years agoTutorial Basic Geometric Drawing
tribta [Fri, 18 Aug 2017 20:33:28 +0000 (21:33 +0100)]
Tutorial Basic Geometric Drawing

6 years agoTutorial Adding Images
tribta [Fri, 18 Aug 2017 14:06:05 +0000 (15:06 +0100)]
Tutorial Adding Images

6 years agoFix whitespace issues
saskatchewancatch [Sat, 9 Sep 2017 02:27:03 +0000 (20:27 -0600)]
Fix whitespace issues

6 years agoAdjustmenbts
saskatchewancatch [Sat, 9 Sep 2017 01:55:19 +0000 (19:55 -0600)]
Adjustmenbts

6 years agoMerge pull request #9595 from paroj:imreadmulti_py
Alexander Alekhin [Fri, 8 Sep 2017 14:03:03 +0000 (14:03 +0000)]
Merge pull request #9595 from paroj:imreadmulti_py

6 years agoMerge pull request #9582 from sovrasov:fix_gcc7_macro_warning
Alexander Alekhin [Fri, 8 Sep 2017 13:31:27 +0000 (13:31 +0000)]
Merge pull request #9582 from sovrasov:fix_gcc7_macro_warning

6 years agopython: imreadmulti - add CV_OUT so it is correctly wrapped
Pavel Rojtberg [Fri, 8 Sep 2017 13:09:00 +0000 (15:09 +0200)]
python: imreadmulti - add CV_OUT so it is correctly wrapped

6 years agoMerge pull request #9588 from lupustr3:pvlasov/ipp_compatibility
Alexander Alekhin [Fri, 8 Sep 2017 11:23:40 +0000 (11:23 +0000)]
Merge pull request #9588 from lupustr3:pvlasov/ipp_compatibility

6 years agocudafilters: don't modify "const" data
Alexander Alekhin [Fri, 8 Sep 2017 11:19:09 +0000 (14:19 +0300)]
cudafilters: don't modify "const" data

6 years agocore: fix OpenCL runtime compilation with HAVE_OPENCL_STATIC
Alexander Alekhin [Wed, 6 Sep 2017 15:21:54 +0000 (18:21 +0300)]
core: fix OpenCL runtime compilation with HAVE_OPENCL_STATIC

6 years agoFixed some issues found by static analysis
Maksim Shabunin [Tue, 5 Sep 2017 14:10:16 +0000 (17:10 +0300)]
Fixed some issues found by static analysis

6 years agoCompatibility improvement with old IPP versions (tested on 9.0.1);
Pavel Vlasov [Fri, 8 Sep 2017 08:08:24 +0000 (11:08 +0300)]
Compatibility improvement with old IPP versions (tested on 9.0.1);
Manual IPP dispatcher simplification;

6 years agoMobileNet-SSD and VGG-SSD topologies in Halide
Dmitry Kurtaev [Wed, 6 Sep 2017 07:34:07 +0000 (10:34 +0300)]
MobileNet-SSD and VGG-SSD topologies in Halide

6 years agoFeedback.
saskatchewancatch [Fri, 8 Sep 2017 04:43:55 +0000 (22:43 -0600)]
Feedback.

Still need to remove the descriptions of these flags from cv::norm

6 years agocore: fix gcc7 warning about empty VA_ARGS in Assert macro
Vladislav Sovrasov [Thu, 7 Sep 2017 13:09:05 +0000 (16:09 +0300)]
core: fix gcc7 warning about empty VA_ARGS in Assert macro

6 years agoml: disable not implemented k-fold validation in RTrees
Vladislav Sovrasov [Thu, 7 Sep 2017 12:49:46 +0000 (15:49 +0300)]
ml: disable not implemented k-fold validation in RTrees

6 years agoMerge pull request #9293 from sovrasov:assert_improvement
Vadim Pisarevsky [Thu, 7 Sep 2017 11:17:42 +0000 (11:17 +0000)]
Merge pull request #9293 from sovrasov:assert_improvement

6 years agoMerge pull request #9577 from mshabunin:const-foreach
Vadim Pisarevsky [Thu, 7 Sep 2017 11:12:45 +0000 (11:12 +0000)]
Merge pull request #9577 from mshabunin:const-foreach

6 years agoMerge pull request #9578 from sovrasov:objdet_build_fix
Vadim Pisarevsky [Thu, 7 Sep 2017 11:11:30 +0000 (11:11 +0000)]
Merge pull request #9578 from sovrasov:objdet_build_fix

6 years agoMerge pull request #9579 from alalek:ocl_float_calc
Vadim Pisarevsky [Thu, 7 Sep 2017 11:10:20 +0000 (11:10 +0000)]
Merge pull request #9579 from alalek:ocl_float_calc

6 years agoobjdetect: fix wrong cxx11 features check
Vladislav Sovrasov [Thu, 7 Sep 2017 09:25:36 +0000 (12:25 +0300)]
objdetect: fix wrong cxx11 features check

6 years agoimgproc(ocl): don't use doubles to process float data
Alexander Alekhin [Thu, 7 Sep 2017 09:42:20 +0000 (12:42 +0300)]
imgproc(ocl): don't use doubles to process float data

6 years agoEnabled forEach for const Mats
Maksim Shabunin [Thu, 7 Sep 2017 08:35:14 +0000 (11:35 +0300)]
Enabled forEach for const Mats

6 years agoi9482:
saskatchewancatch [Thu, 7 Sep 2017 04:42:01 +0000 (22:42 -0600)]
i9482:

Removing description for cv::NormTypes that's already in cv::norm

Masking out NORM_TYPE_MASK from docs since it's not intended to be exposed to user

6 years agoi9482: Improve documentation concerning norm functionality.
saskatchewancatch [Thu, 7 Sep 2017 04:35:39 +0000 (22:35 -0600)]
i9482: Improve documentation concerning norm functionality.

Added forkfour Latex command to math js support.

Split cv::norm documentation between the cv::norm and its overload, to make things clearer

Corrected some typos and cleaned up grammar.

Result is clearer documentation for the norms.

Work pending...

6 years agoMerge pull request #9457 from alalek:type_traits_issue_7599
Maksim Shabunin [Wed, 6 Sep 2017 13:34:28 +0000 (13:34 +0000)]
Merge pull request #9457 from alalek:type_traits_issue_7599

6 years agoMerge pull request #9564 from saskatchewancatch:i9550
Alexander Alekhin [Wed, 6 Sep 2017 08:29:16 +0000 (08:29 +0000)]
Merge pull request #9564 from saskatchewancatch:i9550

6 years agopython: add special targets gen_opencv_python2(3)
Alexander Alekhin [Tue, 5 Sep 2017 15:28:26 +0000 (18:28 +0300)]
python: add special targets gen_opencv_python2(3)

6 years agopython: generate pyopencv_signatures.json file
Alexander Alekhin [Tue, 5 Sep 2017 13:10:36 +0000 (16:10 +0300)]
python: generate pyopencv_signatures.json file

6 years agoAllow TIFF min=white PHOTOMETRIC interpretation images to be read unchanged
saskatchewancatch [Wed, 6 Sep 2017 03:43:33 +0000 (21:43 -0600)]
Allow TIFF min=white PHOTOMETRIC interpretation images to be read unchanged

6 years agoFix https://github.com/opencv/opencv/issues/8693
Dmitry Kurtaev [Tue, 5 Sep 2017 13:17:06 +0000 (16:17 +0300)]
Fix https://github.com/opencv/opencv/issues/8693

6 years agoMerge pull request #8934 from lewisjb:python-classes
Lewis B [Tue, 5 Sep 2017 05:38:17 +0000 (15:38 +1000)]
Merge pull request #8934 from lewisjb:python-classes

* Refactor Python Classes

6 years agoMerge pull request #9522 from terfendail:resize_move
Alexander Alekhin [Tue, 5 Sep 2017 05:33:07 +0000 (05:33 +0000)]
Merge pull request #9522 from terfendail:resize_move

6 years agofix CUDA build
Alexander Alekhin [Thu, 31 Aug 2017 16:13:07 +0000 (19:13 +0300)]
fix CUDA build

CUDA implementation wants to convert std::vector<KeyPoint> <-> GpuMat.
There is no direct mapping from KeyPoint (mix of int/float fields)
into cv::Mat element type, so this conversion must be avoided.

Legacy mode is turned back for CUDA builds.

6 years agoMerge pull request #9548 from alalek:python_tests
Maksim Shabunin [Mon, 4 Sep 2017 10:14:13 +0000 (10:14 +0000)]
Merge pull request #9548 from alalek:python_tests

6 years agoMerge pull request #9546 from sturkmen72:GrammaTech
Maksim Shabunin [Mon, 4 Sep 2017 09:51:22 +0000 (09:51 +0000)]
Merge pull request #9546 from sturkmen72:GrammaTech