Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
448a2527
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,发现更多精彩内容 >>
提交
448a2527
编写于
10月 28, 2011
作者:
V
Vadim Pisarevsky
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
added compression strategy as a parameter (another request from ticket #1452)
上级
17c31027
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
19 addition
and
1 deletion
+19
-1
modules/highgui/include/opencv2/highgui/highgui.hpp
modules/highgui/include/opencv2/highgui/highgui.hpp
+6
-0
modules/highgui/include/opencv2/highgui/highgui_c.h
modules/highgui/include/opencv2/highgui/highgui_c.h
+6
-0
modules/highgui/src/grfmt_png.cpp
modules/highgui/src/grfmt_png.cpp
+7
-1
未找到文件。
modules/highgui/include/opencv2/highgui/highgui.hpp
浏览文件 @
448a2527
...
@@ -150,6 +150,12 @@ enum
...
@@ -150,6 +150,12 @@ enum
{
{
IMWRITE_JPEG_QUALITY
=
1
,
IMWRITE_JPEG_QUALITY
=
1
,
IMWRITE_PNG_COMPRESSION
=
16
,
IMWRITE_PNG_COMPRESSION
=
16
,
IMWRITE_PNG_STRATEGY
=
17
,
IMWRITE_PNG_STRATEGY_DEFAULT
=
0
,
IMWRITE_PNG_STRATEGY_FILTERED
=
1
,
IMWRITE_PNG_STRATEGY_HUFFMAN_ONLY
=
2
,
IMWRITE_PNG_STRATEGY_RLE
=
3
,
IMWRITE_PNG_STRATEGY_FIXED
=
4
,
IMWRITE_PXM_BINARY
=
32
IMWRITE_PXM_BINARY
=
32
};
};
...
...
modules/highgui/include/opencv2/highgui/highgui_c.h
浏览文件 @
448a2527
...
@@ -217,6 +217,12 @@ enum
...
@@ -217,6 +217,12 @@ enum
{
{
CV_IMWRITE_JPEG_QUALITY
=
1
,
CV_IMWRITE_JPEG_QUALITY
=
1
,
CV_IMWRITE_PNG_COMPRESSION
=
16
,
CV_IMWRITE_PNG_COMPRESSION
=
16
,
CV_IMWRITE_PNG_STRATEGY
=
17
,
CV_IMWRITE_PNG_STRATEGY_DEFAULT
=
0
,
CV_IMWRITE_PNG_STRATEGY_FILTERED
=
1
,
CV_IMWRITE_PNG_STRATEGY_HUFFMAN_ONLY
=
2
,
CV_IMWRITE_PNG_STRATEGY_RLE
=
3
,
CV_IMWRITE_PNG_STRATEGY_FIXED
=
4
,
CV_IMWRITE_PXM_BINARY
=
32
CV_IMWRITE_PXM_BINARY
=
32
};
};
...
...
modules/highgui/src/grfmt_png.cpp
浏览文件 @
448a2527
...
@@ -312,6 +312,7 @@ void PngEncoder::flushBuf(void*)
...
@@ -312,6 +312,7 @@ void PngEncoder::flushBuf(void*)
bool
PngEncoder
::
write
(
const
Mat
&
img
,
const
vector
<
int
>&
params
)
bool
PngEncoder
::
write
(
const
Mat
&
img
,
const
vector
<
int
>&
params
)
{
{
int
compression_level
=
0
;
int
compression_level
=
0
;
int
compression_strategy
=
Z_RLE
;
for
(
size_t
i
=
0
;
i
<
params
.
size
();
i
+=
2
)
for
(
size_t
i
=
0
;
i
<
params
.
size
();
i
+=
2
)
{
{
...
@@ -320,6 +321,11 @@ bool PngEncoder::write( const Mat& img, const vector<int>& params )
...
@@ -320,6 +321,11 @@ bool PngEncoder::write( const Mat& img, const vector<int>& params )
compression_level
=
params
[
i
+
1
];
compression_level
=
params
[
i
+
1
];
compression_level
=
MIN
(
MAX
(
compression_level
,
0
),
MAX_MEM_LEVEL
);
compression_level
=
MIN
(
MAX
(
compression_level
,
0
),
MAX_MEM_LEVEL
);
}
}
if
(
params
[
i
]
==
CV_IMWRITE_PNG_STRATEGY
)
{
compression_strategy
=
params
[
i
+
1
];
compression_strategy
=
MIN
(
MAX
(
compression_strategy
,
0
),
Z_FIXED
);
}
}
}
png_structp
png_ptr
=
png_create_write_struct
(
PNG_LIBPNG_VER_STRING
,
0
,
0
,
0
);
png_structp
png_ptr
=
png_create_write_struct
(
PNG_LIBPNG_VER_STRING
,
0
,
0
,
0
);
...
@@ -366,7 +372,7 @@ bool PngEncoder::write( const Mat& img, const vector<int>& params )
...
@@ -366,7 +372,7 @@ bool PngEncoder::write( const Mat& img, const vector<int>& params )
png_set_filter
(
png_ptr
,
PNG_FILTER_TYPE_BASE
,
PNG_FILTER_SUB
);
png_set_filter
(
png_ptr
,
PNG_FILTER_TYPE_BASE
,
PNG_FILTER_SUB
);
png_set_compression_level
(
png_ptr
,
Z_BEST_SPEED
);
png_set_compression_level
(
png_ptr
,
Z_BEST_SPEED
);
}
}
png_set_compression_strategy
(
png_ptr
,
Z_FILTERED
);
png_set_compression_strategy
(
png_ptr
,
compression_strategy
);
png_set_IHDR
(
png_ptr
,
info_ptr
,
width
,
height
,
depth
==
CV_8U
?
8
:
16
,
png_set_IHDR
(
png_ptr
,
info_ptr
,
width
,
height
,
depth
==
CV_8U
?
8
:
16
,
channels
==
1
?
PNG_COLOR_TYPE_GRAY
:
channels
==
1
?
PNG_COLOR_TYPE_GRAY
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录