Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
e6ac2ca3
Commit
e6ac2ca3
authored
Jan 13, 2016
by
KeySecure
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make Xcode 7.2 happy.
parent
70cb17bf
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
jquant2.c
3rdparty/libjpeg/jquant2.c
+3
-3
gzread.c
3rdparty/zlib/gzread.c
+1
-1
gzwrite.c
3rdparty/zlib/gzwrite.c
+2
-2
rho.cpp
modules/calib3d/src/rho.cpp
+1
-1
No files found.
3rdparty/libjpeg/jquant2.c
View file @
e6ac2ca3
...
...
@@ -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
View file @
e6ac2ca3
...
...
@@ -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
View file @
e6ac2ca3
...
...
@@ -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
View file @
e6ac2ca3
...
...
@@ -44,7 +44,7 @@
*/
/* Includes */
#include
<precomp.hpp>
#include
"precomp.hpp"
#include <opencv2/core.hpp>
#include <stdlib.h>
#include <stdio.h>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment