Merge pull request #5963 from KeySecure:master

3rdparty/libjpeg/jquant2.c

@@ -265,9 +265,9 @@ typedef struct {
   INT32 volume;
   /* The number of nonzero histogram cells within this box */
   long colorcount;
-} box;
+} _box;
 
-typedef box * boxptr;
+typedef _box * boxptr;
 
 
 LOCAL(boxptr)
@@ -546,7 +546,7 @@ select_colors (j_decompress_ptr cinfo, int desired_colors)
 
   /* Allocate workspace for box list */
   boxlist = (boxptr) (*cinfo->mem->alloc_small)
-    ((j_common_ptr) cinfo, JPOOL_IMAGE, desired_colors * SIZEOF(box));
+    ((j_common_ptr) cinfo, JPOOL_IMAGE, desired_colors * SIZEOF(_box));
   /* Initialize one box containing whole space */
   numboxes = 1;
   boxlist[0].c0min = 0;

3rdparty/zlib/gzread.c

@@ -27,7 +27,7 @@ local int gz_load(state, buf, len, have)
 
     *have = 0;
     do {
-        ret = read(state->fd, buf + *have, len - *have);
+        ret = (int) read(state->fd, buf + *have, len - *have);
         if (ret <= 0)
             break;
         *have += ret;

3rdparty/zlib/gzwrite.c

@@ -81,7 +81,7 @@ local int gz_comp(state, flush)
 
     /* write directly if requested */
     if (state->direct) {
-        got = write(state->fd, strm->next_in, strm->avail_in);
+        got = (int) write(state->fd, strm->next_in, strm->avail_in);
         if (got < 0 || (unsigned)got != strm->avail_in) {
             gz_error(state, Z_ERRNO, zstrerror());
             return -1;
@@ -98,7 +98,7 @@ local int gz_comp(state, flush)
         if (strm->avail_out == 0 || (flush != Z_NO_FLUSH &&
             (flush != Z_FINISH || ret == Z_STREAM_END))) {
             have = (unsigned)(strm->next_out - state->x.next);
-            if (have && ((got = write(state->fd, state->x.next, have)) < 0 ||
+            if (have && ((got = (int) write(state->fd, state->x.next, have)) < 0 ||
                          (unsigned)got != have)) {
                 gz_error(state, Z_ERRNO, zstrerror());
                 return -1;

modules/calib3d/src/rho.cpp

@@ -44,7 +44,7 @@
  */
 
 /* Includes */
-#include <precomp.hpp>
+#include "precomp.hpp"
 #include <opencv2/core.hpp>
 #include <stdlib.h>
 #include <stdio.h>