Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
cd8262eb
O
Opencv
项目概览
Greenplum
/
Opencv
大约 1 年 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cd8262eb
编写于
6月 24, 2020
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #17650 from alalek:update_libjpeg-turbo
上级
d2b85467
ad930f62
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
11 addition
and
7 deletion
+11
-7
3rdparty/libjpeg-turbo/CMakeLists.txt
3rdparty/libjpeg-turbo/CMakeLists.txt
+4
-2
3rdparty/libjpeg-turbo/jconfigint.h.in
3rdparty/libjpeg-turbo/jconfigint.h.in
+3
-0
3rdparty/libjpeg-turbo/src/jdatadst.c
3rdparty/libjpeg-turbo/src/jdatadst.c
+1
-2
3rdparty/libjpeg-turbo/src/jversion.h
3rdparty/libjpeg-turbo/src/jversion.h
+3
-3
未找到文件。
3rdparty/libjpeg-turbo/CMakeLists.txt
浏览文件 @
cd8262eb
...
@@ -4,9 +4,9 @@ ocv_warnings_disable(CMAKE_C_FLAGS -Wunused-parameter -Wsign-compare -Wshorten-6
...
@@ -4,9 +4,9 @@ ocv_warnings_disable(CMAKE_C_FLAGS -Wunused-parameter -Wsign-compare -Wshorten-6
set
(
VERSION_MAJOR 2
)
set
(
VERSION_MAJOR 2
)
set
(
VERSION_MINOR 0
)
set
(
VERSION_MINOR 0
)
set
(
VERSION_REVISION
4
)
set
(
VERSION_REVISION
5
)
set
(
VERSION
${
VERSION_MAJOR
}
.
${
VERSION_MINOR
}
.
${
VERSION_REVISION
}
)
set
(
VERSION
${
VERSION_MAJOR
}
.
${
VERSION_MINOR
}
.
${
VERSION_REVISION
}
)
set
(
LIBJPEG_TURBO_VERSION_NUMBER 200000
4
)
set
(
LIBJPEG_TURBO_VERSION_NUMBER 200000
5
)
string
(
TIMESTAMP BUILD
"opencv-
${
OPENCV_VERSION
}
-libjpeg-turbo"
)
string
(
TIMESTAMP BUILD
"opencv-
${
OPENCV_VERSION
}
-libjpeg-turbo"
)
if
(
CMAKE_BUILD_TYPE STREQUAL
"Debug"
)
if
(
CMAKE_BUILD_TYPE STREQUAL
"Debug"
)
...
@@ -65,6 +65,8 @@ set(JPEG_LIB_VERSION 62)
...
@@ -65,6 +65,8 @@ set(JPEG_LIB_VERSION 62)
# OpenCV
# OpenCV
set
(
JPEG_LIB_VERSION
"
${
VERSION
}
-
${
JPEG_LIB_VERSION
}
"
PARENT_SCOPE
)
set
(
JPEG_LIB_VERSION
"
${
VERSION
}
-
${
JPEG_LIB_VERSION
}
"
PARENT_SCOPE
)
set
(
THREAD_LOCAL
""
)
# WITH_TURBOJPEG is not used
if
(
MSVC
)
if
(
MSVC
)
add_definitions
(
-W3 -wd4996 -wd4018
)
add_definitions
(
-W3 -wd4996 -wd4018
)
endif
()
endif
()
...
...
3rdparty/libjpeg-turbo/jconfigint.h.in
浏览文件 @
cd8262eb
...
@@ -15,6 +15,9 @@
...
@@ -15,6 +15,9 @@
#endif
#endif
#endif
#endif
/* How to obtain thread-local storage */
#define THREAD_LOCAL @THREAD_LOCAL@
/* Define to the full name of this package. */
/* Define to the full name of this package. */
#define PACKAGE_NAME "@CMAKE_PROJECT_NAME@"
#define PACKAGE_NAME "@CMAKE_PROJECT_NAME@"
...
...
3rdparty/libjpeg-turbo/src/jdatadst.c
浏览文件 @
cd8262eb
...
@@ -143,8 +143,7 @@ empty_mem_output_buffer(j_compress_ptr cinfo)
...
@@ -143,8 +143,7 @@ empty_mem_output_buffer(j_compress_ptr cinfo)
MEMCOPY
(
nextbuffer
,
dest
->
buffer
,
dest
->
bufsize
);
MEMCOPY
(
nextbuffer
,
dest
->
buffer
,
dest
->
bufsize
);
if
(
dest
->
newbuffer
!=
NULL
)
free
(
dest
->
newbuffer
);
free
(
dest
->
newbuffer
);
dest
->
newbuffer
=
nextbuffer
;
dest
->
newbuffer
=
nextbuffer
;
...
...
3rdparty/libjpeg-turbo/src/jversion.h
浏览文件 @
cd8262eb
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
* This file was part of the Independent JPEG Group's software:
* This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-2012, Thomas G. Lane, Guido Vollbeding.
* Copyright (C) 1991-2012, Thomas G. Lane, Guido Vollbeding.
* libjpeg-turbo Modifications:
* libjpeg-turbo Modifications:
* Copyright (C) 2010, 2012-20
19
, D. R. Commander.
* Copyright (C) 2010, 2012-20
20
, D. R. Commander.
* For conditions of distribution and use, see the accompanying README.ijg
* For conditions of distribution and use, see the accompanying README.ijg
* file.
* file.
*
*
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
*/
*/
#define JCOPYRIGHT \
#define JCOPYRIGHT \
"Copyright (C) 2009-20
19
D. R. Commander\n" \
"Copyright (C) 2009-20
20
D. R. Commander\n" \
"Copyright (C) 2011-2016 Siarhei Siamashka\n" \
"Copyright (C) 2011-2016 Siarhei Siamashka\n" \
"Copyright (C) 2015-2016, 2018 Matthieu Darbois\n" \
"Copyright (C) 2015-2016, 2018 Matthieu Darbois\n" \
"Copyright (C) 2015 Intel Corporation\n" \
"Copyright (C) 2015 Intel Corporation\n" \
...
@@ -49,4 +49,4 @@
...
@@ -49,4 +49,4 @@
"Copyright (C) 1991-2016 Thomas G. Lane, Guido Vollbeding"
"Copyright (C) 1991-2016 Thomas G. Lane, Guido Vollbeding"
#define JCOPYRIGHT_SHORT \
#define JCOPYRIGHT_SHORT \
"Copyright (C) 1991-20
19
The libjpeg-turbo Project and many others"
"Copyright (C) 1991-20
20
The libjpeg-turbo Project and many others"
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录