Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenCV
opencv
提交
c6ab32ff
O
opencv
项目概览
OpenCV
/
opencv
上一次同步 8 个月
通知
982
Star
71100
Fork
55581
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
c6ab32ff
编写于
11月 24, 2021
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
3rdparty: libjpeg-turbo 2.1.0 => 2.1.2
https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.1.2
上级
101be77d
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
54 addition
and
17 deletion
+54
-17
3rdparty/libjpeg-turbo/CMakeLists.txt
3rdparty/libjpeg-turbo/CMakeLists.txt
+2
-2
3rdparty/libjpeg-turbo/jconfigint.h.in
3rdparty/libjpeg-turbo/jconfigint.h.in
+10
-0
3rdparty/libjpeg-turbo/src/jchuff.c
3rdparty/libjpeg-turbo/src/jchuff.c
+3
-2
3rdparty/libjpeg-turbo/src/jcmaster.c
3rdparty/libjpeg-turbo/src/jcmaster.c
+1
-1
3rdparty/libjpeg-turbo/src/jcphuff.c
3rdparty/libjpeg-turbo/src/jcphuff.c
+6
-4
3rdparty/libjpeg-turbo/src/jdapimin.c
3rdparty/libjpeg-turbo/src/jdapimin.c
+2
-1
3rdparty/libjpeg-turbo/src/jdhuff.c
3rdparty/libjpeg-turbo/src/jdhuff.c
+10
-1
3rdparty/libjpeg-turbo/src/jdmainct.c
3rdparty/libjpeg-turbo/src/jdmainct.c
+3
-2
3rdparty/libjpeg-turbo/src/jmemmgr.c
3rdparty/libjpeg-turbo/src/jmemmgr.c
+3
-3
3rdparty/libjpeg-turbo/src/jpegint.h
3rdparty/libjpeg-turbo/src/jpegint.h
+14
-1
未找到文件。
3rdparty/libjpeg-turbo/CMakeLists.txt
浏览文件 @
c6ab32ff
...
...
@@ -4,9 +4,9 @@ ocv_warnings_disable(CMAKE_C_FLAGS -Wunused-parameter -Wsign-compare -Wshorten-6
set
(
VERSION_MAJOR 2
)
set
(
VERSION_MINOR 1
)
set
(
VERSION_REVISION
0
)
set
(
VERSION_REVISION
2
)
set
(
VERSION
${
VERSION_MAJOR
}
.
${
VERSION_MINOR
}
.
${
VERSION_REVISION
}
)
set
(
LIBJPEG_TURBO_VERSION_NUMBER 200100
0
)
set
(
LIBJPEG_TURBO_VERSION_NUMBER 200100
2
)
string
(
TIMESTAMP BUILD
"opencv-
${
OPENCV_VERSION
}
-libjpeg-turbo"
)
if
(
CMAKE_BUILD_TYPE STREQUAL
"Debug"
)
...
...
3rdparty/libjpeg-turbo/jconfigint.h.in
浏览文件 @
c6ab32ff
...
...
@@ -40,3 +40,13 @@
#define HAVE_BITSCANFORWARD
#endif
#endif
#if defined(__has_attribute)
#if __has_attribute(fallthrough)
#define FALLTHROUGH __attribute__((fallthrough));
#else
#define FALLTHROUGH
#endif
#else
#define FALLTHROUGH
#endif
3rdparty/libjpeg-turbo/src/jchuff.c
浏览文件 @
c6ab32ff
...
...
@@ -44,8 +44,9 @@
* flags (this defines __thumb__).
*/
#if defined(__arm__) || defined(__aarch64__) || defined(_M_ARM) || \
defined(_M_ARM64)
/* NOTE: Both GCC and Clang define __GNUC__ */
#if (defined(__GNUC__) && (defined(__arm__) || defined(__aarch64__))) || \
defined(_M_ARM) || defined(_M_ARM64)
#if !defined(__thumb__) || defined(__thumb2__)
#define USE_CLZ_INTRINSIC
#endif
...
...
3rdparty/libjpeg-turbo/src/jcmaster.c
浏览文件 @
c6ab32ff
...
...
@@ -493,7 +493,7 @@ prepare_for_pass(j_compress_ptr cinfo)
master
->
pass_type
=
output_pass
;
master
->
pass_number
++
;
#endif
/*FALLTHROUGH*/
FALLTHROUGH
/*FALLTHROUGH*/
case
output_pass
:
/* Do a data-output pass. */
/* We need not repeat per-scan setup if prior optimization pass did it. */
...
...
3rdparty/libjpeg-turbo/src/jcphuff.c
浏览文件 @
c6ab32ff
...
...
@@ -7,6 +7,7 @@
* Copyright (C) 2011, 2015, 2018, 2021, D. R. Commander.
* Copyright (C) 2016, 2018, Matthieu Darbois.
* Copyright (C) 2020, Arm Limited.
* Copyright (C) 2021, Alex Richardson.
* For conditions of distribution and use, see the accompanying README.ijg
* file.
*
...
...
@@ -52,8 +53,9 @@
* flags (this defines __thumb__).
*/
#if defined(__arm__) || defined(__aarch64__) || defined(_M_ARM) || \
defined(_M_ARM64)
/* NOTE: Both GCC and Clang define __GNUC__ */
#if (defined(__GNUC__) && (defined(__arm__) || defined(__aarch64__))) || \
defined(_M_ARM) || defined(_M_ARM64)
#if !defined(__thumb__) || defined(__thumb2__)
#define USE_CLZ_INTRINSIC
#endif
...
...
@@ -679,7 +681,7 @@ encode_mcu_AC_first(j_compress_ptr cinfo, JBLOCKROW *MCU_data)
emit_restart
(
entropy
,
entropy
->
next_restart_num
);
#ifdef WITH_SIMD
cvalue
=
values
=
(
JCOEF
*
)
PAD
((
size_t
)
values_unaligned
,
16
);
cvalue
=
values
=
(
JCOEF
*
)
PAD
((
JUINTPTR
)
values_unaligned
,
16
);
#else
/* Not using SIMD, so alignment is not needed */
cvalue
=
values
=
values_unaligned
;
...
...
@@ -944,7 +946,7 @@ encode_mcu_AC_refine(j_compress_ptr cinfo, JBLOCKROW *MCU_data)
emit_restart
(
entropy
,
entropy
->
next_restart_num
);
#ifdef WITH_SIMD
cabsvalue
=
absvalues
=
(
JCOEF
*
)
PAD
((
size_t
)
absvalues_unaligned
,
16
);
cabsvalue
=
absvalues
=
(
JCOEF
*
)
PAD
((
JUINTPTR
)
absvalues_unaligned
,
16
);
#else
/* Not using SIMD, so alignment is not needed */
cabsvalue
=
absvalues
=
absvalues_unaligned
;
...
...
3rdparty/libjpeg-turbo/src/jdapimin.c
浏览文件 @
c6ab32ff
...
...
@@ -23,6 +23,7 @@
#include "jinclude.h"
#include "jpeglib.h"
#include "jdmaster.h"
#include "jconfigint.h"
/*
...
...
@@ -308,7 +309,7 @@ jpeg_consume_input(j_decompress_ptr cinfo)
/* Initialize application's data source module */
(
*
cinfo
->
src
->
init_source
)
(
cinfo
);
cinfo
->
global_state
=
DSTATE_INHEADER
;
/*FALLTHROUGH*/
FALLTHROUGH
/*FALLTHROUGH*/
case
DSTATE_INHEADER
:
retcode
=
(
*
cinfo
->
inputctl
->
consume_input
)
(
cinfo
);
if
(
retcode
==
JPEG_REACHED_SOS
)
{
/* Found SOS, prepare to decompress */
...
...
3rdparty/libjpeg-turbo/src/jdhuff.c
浏览文件 @
c6ab32ff
...
...
@@ -584,7 +584,7 @@ decode_mcu_slow(j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
* behavior is, to the best of our understanding, innocuous, and it is
* unclear how to work around it without potentially affecting
* performance. Thus, we (hopefully temporarily) suppress UBSan integer
* overflow errors for this function.
* overflow errors for this function
and decode_mcu_fast()
.
*/
s
+=
state
.
last_dc_val
[
ci
];
state
.
last_dc_val
[
ci
]
=
s
;
...
...
@@ -651,6 +651,12 @@ decode_mcu_slow(j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
}
#if defined(__has_feature)
#if __has_feature(undefined_behavior_sanitizer)
__attribute__
((
no_sanitize
(
"signed-integer-overflow"
),
no_sanitize
(
"unsigned-integer-overflow"
)))
#endif
#endif
LOCAL
(
boolean
)
decode_mcu_fast
(
j_decompress_ptr
cinfo
,
JBLOCKROW
*
MCU_data
)
{
...
...
@@ -681,6 +687,9 @@ decode_mcu_fast(j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
if
(
entropy
->
dc_needed
[
blkn
])
{
int
ci
=
cinfo
->
MCU_membership
[
blkn
];
/* Refer to the comment in decode_mcu_slow() regarding the supression of
* a UBSan integer overflow error in this line of code.
*/
s
+=
state
.
last_dc_val
[
ci
];
state
.
last_dc_val
[
ci
]
=
s
;
if
(
block
)
...
...
3rdparty/libjpeg-turbo/src/jdmainct.c
浏览文件 @
c6ab32ff
...
...
@@ -18,6 +18,7 @@
#include "jinclude.h"
#include "jdmainct.h"
#include "jconfigint.h"
/*
...
...
@@ -360,7 +361,7 @@ process_data_context_main(j_decompress_ptr cinfo, JSAMPARRAY output_buf,
main_ptr
->
context_state
=
CTX_PREPARE_FOR_IMCU
;
if
(
*
out_row_ctr
>=
out_rows_avail
)
return
;
/* Postprocessor exactly filled output buf */
/*FALLTHROUGH*/
FALLTHROUGH
/*FALLTHROUGH*/
case
CTX_PREPARE_FOR_IMCU
:
/* Prepare to process first M-1 row groups of this iMCU row */
main_ptr
->
rowgroup_ctr
=
0
;
...
...
@@ -371,7 +372,7 @@ process_data_context_main(j_decompress_ptr cinfo, JSAMPARRAY output_buf,
if
(
main_ptr
->
iMCU_row_ctr
==
cinfo
->
total_iMCU_rows
)
set_bottom_pointers
(
cinfo
);
main_ptr
->
context_state
=
CTX_PROCESS_IMCU
;
/*FALLTHROUGH*/
FALLTHROUGH
/*FALLTHROUGH*/
case
CTX_PROCESS_IMCU
:
/* Call postprocessor using previously set pointers */
(
*
cinfo
->
post
->
post_process_data
)
(
cinfo
,
...
...
3rdparty/libjpeg-turbo/src/jmemmgr.c
浏览文件 @
c6ab32ff
...
...
@@ -4,7 +4,7 @@
* This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-1997, Thomas G. Lane.
* libjpeg-turbo Modifications:
* Copyright (C) 2016, D. R. Commander.
* Copyright (C) 2016,
2021,
D. R. Commander.
* For conditions of distribution and use, see the accompanying README.ijg
* file.
*
...
...
@@ -1032,7 +1032,7 @@ free_pool(j_common_ptr cinfo, int pool_id)
large_pool_ptr
next_lhdr_ptr
=
lhdr_ptr
->
next
;
space_freed
=
lhdr_ptr
->
bytes_used
+
lhdr_ptr
->
bytes_left
+
sizeof
(
large_pool_hdr
);
sizeof
(
large_pool_hdr
)
+
ALIGN_SIZE
-
1
;
jpeg_free_large
(
cinfo
,
(
void
*
)
lhdr_ptr
,
space_freed
);
mem
->
total_space_allocated
-=
space_freed
;
lhdr_ptr
=
next_lhdr_ptr
;
...
...
@@ -1045,7 +1045,7 @@ free_pool(j_common_ptr cinfo, int pool_id)
while
(
shdr_ptr
!=
NULL
)
{
small_pool_ptr
next_shdr_ptr
=
shdr_ptr
->
next
;
space_freed
=
shdr_ptr
->
bytes_used
+
shdr_ptr
->
bytes_left
+
sizeof
(
small_pool_hdr
);
sizeof
(
small_pool_hdr
)
+
ALIGN_SIZE
-
1
;
jpeg_free_small
(
cinfo
,
(
void
*
)
shdr_ptr
,
space_freed
);
mem
->
total_space_allocated
-=
space_freed
;
shdr_ptr
=
next_shdr_ptr
;
...
...
3rdparty/libjpeg-turbo/src/jpegint.h
浏览文件 @
c6ab32ff
...
...
@@ -5,8 +5,9 @@
* Copyright (C) 1991-1997, Thomas G. Lane.
* Modified 1997-2009 by Guido Vollbeding.
* libjpeg-turbo Modifications:
* Copyright (C) 2015-2016, 2019, D. R. Commander.
* Copyright (C) 2015-2016, 2019,
2021,
D. R. Commander.
* Copyright (C) 2015, Google, Inc.
* Copyright (C) 2021, Alex Richardson.
* For conditions of distribution and use, see the accompanying README.ijg
* file.
*
...
...
@@ -47,6 +48,18 @@ typedef enum { /* Operating modes for buffer controllers */
/* JLONG must hold at least signed 32-bit values. */
typedef
long
JLONG
;
/* JUINTPTR must hold pointer values. */
#ifdef __UINTPTR_TYPE__
/*
* __UINTPTR_TYPE__ is GNU-specific and available in GCC 4.6+ and Clang 3.0+.
* Fortunately, that is sufficient to support the few architectures for which
* sizeof(void *) != sizeof(size_t). The only other options would require C99
* or Clang-specific builtins.
*/
typedef
__UINTPTR_TYPE__
JUINTPTR
;
#else
typedef
size_t
JUINTPTR
;
#endif
/*
* Left shift macro that handles a negative operand without causing any
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录