mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-24 03:00:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

make Xcode 7.2 happy.

Browse Source
This commit is contained in:
KeySecure 2016-01-13 20:19:19 +08:00
parent 70cb17bf64
commit e6ac2ca3c9
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
3rdparty/libjpeg/jquant2.c vendored
View File

@ -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;

2
3rdparty/zlib/gzread.c vendored
View File

@ -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;

4
3rdparty/zlib/gzwrite.c vendored
View File

@ -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;

2
modules/calib3d/src/rho.cpp
View File

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