Merge remote-tracking branch 'upstream/3.4' into merge-3.4

diff --cc cmake/OpenCVCompilerOptions.cmake
Simple merge

diff --cc cmake/OpenCVUtils.cmake
Simple merge

diff --cc modules/imgcodecs/CMakeLists.txt
Simple merge

diff --cc modules/imgcodecs/src/grfmt_jpeg2000.cpp
index 18d8904,fe69f80..f4bb097
--- 1/modules/imgcodecs/src/grfmt_jpeg2000.cpp
--- 2/modules/imgcodecs/src/grfmt_jpeg2000.cpp
+++ b/modules/imgcodecs/src/grfmt_jpeg2000.cpp
@@@ -43,8 -43,10 +43,11 @@@
  #include "precomp.hpp"
  
  #ifdef HAVE_JASPER
 +#include <sstream>
  
+ #include <opencv2/core/utils/configuration.private.hpp>
+ #include <opencv2/core/utils/logger.hpp>
+ 
  #include "grfmt_jpeg2000.hpp"
  #include "opencv2/imgproc.hpp"
  
@@@ -468,8 -510,9 +511,9 @@@ bool  Jpeg2KEncoder::isFormatSupported
  }
  
  
 -bool  Jpeg2KEncoder::write( const Mat& _img, const std::vector<int>& )
 +bool  Jpeg2KEncoder::write( const Mat& _img, const std::vector<int>& params )
  {
+     CV_Assert(isJasperEnabled());
      int width = _img.cols, height = _img.rows;
      int depth = _img.depth(), channels = _img.channels();
      depth = depth == CV_8U ? 8 : 16;

diff --cc modules/imgcodecs/test/test_grfmt.cpp
Simple merge

diff --cc modules/ml/src/ann_mlp.cpp
Simple merge

diff --cc modules/videoio/src/cap_dc1394_v2.cpp
index f79d472,ba309fb..9564958
--- 1/modules/videoio/src/cap_dc1394_v2.cpp
--- 2/modules/videoio/src/cap_dc1394_v2.cpp
+++ b/modules/videoio/src/cap_dc1394_v2.cpp
@@@ -60,108 -59,15 +60,6 @@@
  #include <stdlib.h>
  #include <string.h>
  
- static dc1394error_t adaptBufferStereoLocal(dc1394video_frame_t *in, dc1394video_frame_t *out)
- {
-     uint32_t bpp;
- 
-     // buffer position is not changed. Size is boubled in Y
-     out->size[0] = in->size[0];
-     out->size[1] = in->size[1] * 2;
-     out->position[0] = in->position[0];
-     out->position[1] = in->position[1];
- 
-     // color coding is set to mono8 or raw8.
-     switch (in->color_coding)
-     {
-     case DC1394_COLOR_CODING_RAW16:
-         out->color_coding = DC1394_COLOR_CODING_RAW8;
-         break;
-     case DC1394_COLOR_CODING_MONO16:
-     case DC1394_COLOR_CODING_YUV422:
-         out->color_coding = DC1394_COLOR_CODING_MONO8;
-         break;
-     default:
-         return DC1394_INVALID_COLOR_CODING;
-     }
- 
-     // keep the color filter value in all cases. if the format is not raw it will not be further used anyway
-     out->color_filter = in->color_filter;
- 
-     // the output YUV byte order must be already set if the buffer is YUV422 at the output
-     // if the output is not YUV we don't care about this field.
-     // Hence nothing to do.
-     // we always convert to 8bits (at this point) we can safely set this value to 8.
-     out->data_depth = 8;
- 
-     // don't know what to do with stride... >>>> TODO: STRIDE SHOULD BE TAKEN INTO ACCOUNT... <<<<
-     // out->stride=??
-     // the video mode should not change. Color coding and other stuff can be accessed in specific fields of this struct
-     out->video_mode = in->video_mode;
- 
-     // padding is kept:
-     out->padding_bytes = in->padding_bytes;
- 
-     // image bytes changes:    >>>> TODO: STRIDE SHOULD BE TAKEN INTO ACCOUNT... <<<<
-     dc1394_get_color_coding_bit_size(out->color_coding, &bpp);
-     out->image_bytes = (out->size[0] * out->size[1] * bpp) / 8;
- 
-     // total is image_bytes + padding_bytes
-     out->total_bytes = out->image_bytes + out->padding_bytes;
- 
-     // bytes-per-packet and packets_per_frame are internal data that can be kept as is.
-     out->packet_size  = in->packet_size;
-     out->packets_per_frame = in->packets_per_frame;
- 
-     // timestamp, frame_behind, id and camera are copied too:
-     out->timestamp = in->timestamp;
-     out->frames_behind = in->frames_behind;
-     out->camera = in->camera;
-     out->id = in->id;
- 
-     // verify memory allocation:
-     if (out->total_bytes > out->allocated_image_bytes)
-     {
-         free(out->image);
-         out->image = (uint8_t*)malloc(out->total_bytes * sizeof(uint8_t));
-         out->allocated_image_bytes = out->total_bytes;
-     }
- 
-     // Copy padding bytes:
-     memcpy(&(out->image[out->image_bytes]), &(in->image[in->image_bytes]), out->padding_bytes);
-     out->little_endian = DC1394_FALSE; // not used before 1.32 is out.
-     out->data_in_padding = DC1394_FALSE; // not used before 1.32 is out.
-     return DC1394_SUCCESS;
- }
- 
- static dc1394error_t dc1394_deinterlace_stereo_frames_fixed(dc1394video_frame_t *in,
-     dc1394video_frame_t *out, dc1394stereo_method_t method)
 -static uint32_t getControlRegister(dc1394camera_t *camera, uint64_t offset)
--{
-     if((in->color_coding == DC1394_COLOR_CODING_RAW16) ||
-        (in->color_coding == DC1394_COLOR_CODING_MONO16) ||
-        (in->color_coding == DC1394_COLOR_CODING_YUV422))
-     {
-         switch (method)
-         {
- 
-         case DC1394_STEREO_METHOD_INTERLACED:
-             adaptBufferStereoLocal(in, out);
- //FIXED by AB:
- //          dc1394_deinterlace_stereo(in->image, out->image, in->size[0], in->size[1]);
-             dc1394_deinterlace_stereo(in->image, out->image, out->size[0], out->size[1]);
-             break;
- 
-         case DC1394_STEREO_METHOD_FIELD:
-             adaptBufferStereoLocal(in, out);
-             memcpy(out->image, in->image, out->image_bytes);
-             break;
-         }
 -    uint32_t value = 0;
 -    dc1394error_t err = dc1394_get_control_register(camera, offset, &value);
--
-         return DC1394_INVALID_STEREO_METHOD;
-     }
-     else
-         return DC1394_FUNCTION_NOT_SUPPORTED;
 -    assert(err == DC1394_SUCCESS);
 -    return err == DC1394_SUCCESS ? value : 0xffffffff;
--}
--
  struct CvDC1394
  {
      CvDC1394();