Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
2fc921c4
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
3
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2fc921c4
编写于
7月 10, 2014
作者:
M
mcherkas
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
4991647: PNGMetadata.getAsTree() sets bitDepth to invalid value
Reviewed-by: prr, bae
上级
cb477d31
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
79 addition
and
2 deletion
+79
-2
src/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java
...hare/classes/com/sun/imageio/plugins/png/PNGMetadata.java
+5
-2
test/javax/imageio/plugins/png/PngDitDepthTest.java
test/javax/imageio/plugins/png/PngDitDepthTest.java
+74
-0
未找到文件。
src/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java
浏览文件 @
2fc921c4
...
@@ -1254,8 +1254,11 @@ public class PNGMetadata extends IIOMetadata implements Cloneable {
...
@@ -1254,8 +1254,11 @@ public class PNGMetadata extends IIOMetadata implements Cloneable {
if
(
name
.
equals
(
"IHDR"
))
{
if
(
name
.
equals
(
"IHDR"
))
{
IHDR_width
=
getIntAttribute
(
node
,
"width"
);
IHDR_width
=
getIntAttribute
(
node
,
"width"
);
IHDR_height
=
getIntAttribute
(
node
,
"height"
);
IHDR_height
=
getIntAttribute
(
node
,
"height"
);
IHDR_bitDepth
=
getEnumeratedAttribute
(
node
,
"bitDepth"
,
IHDR_bitDepth
=
IHDR_bitDepths
);
Integer
.
valueOf
(
IHDR_bitDepths
[
getEnumeratedAttribute
(
node
,
"bitDepth"
,
IHDR_bitDepths
)]);
IHDR_colorType
=
getEnumeratedAttribute
(
node
,
"colorType"
,
IHDR_colorType
=
getEnumeratedAttribute
(
node
,
"colorType"
,
IHDR_colorTypeNames
);
IHDR_colorTypeNames
);
IHDR_compressionMethod
=
IHDR_compressionMethod
=
...
...
test/javax/imageio/plugins/png/PngDitDepthTest.java
0 → 100644
浏览文件 @
2fc921c4
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 4991647
* @summary PNGMetadata.getAsTree() sets bitDepth to invalid value
* @run main PngDitDepthTest
*/
import
org.w3c.dom.Node
;
import
javax.imageio.ImageIO
;
import
javax.imageio.ImageTypeSpecifier
;
import
javax.imageio.ImageWriter
;
import
javax.imageio.metadata.IIOInvalidTreeException
;
import
javax.imageio.metadata.IIOMetadata
;
import
java.awt.image.ColorModel
;
import
java.awt.image.SampleModel
;
import
java.util.Iterator
;
public
class
PngDitDepthTest
{
public
static
void
main
(
String
[]
args
)
throws
IIOInvalidTreeException
{
// getting the writer for the png format
Iterator
iter
=
ImageIO
.
getImageWritersByFormatName
(
"png"
);
ImageWriter
writer
=
(
ImageWriter
)
iter
.
next
();
// creating a color model
ColorModel
colorModel
=
ColorModel
.
getRGBdefault
();
// creating a sample model
SampleModel
sampleModel
=
colorModel
.
createCompatibleSampleModel
(
640
,
480
);
// creating a default metadata object
IIOMetadata
metaData
=
writer
.
getDefaultImageMetadata
(
new
ImageTypeSpecifier
(
colorModel
,
sampleModel
),
null
);
String
formatName
=
metaData
.
getNativeMetadataFormatName
();
// first call
Node
metaDataNode
=
metaData
.
getAsTree
(
formatName
);
try
{
metaData
.
setFromTree
(
formatName
,
metaDataNode
);
}
catch
(
Exception
ex
)
{
ex
.
printStackTrace
();
}
// second call (bitdepht is already set to an invalid value)
metaDataNode
=
metaData
.
getAsTree
(
formatName
);
metaData
.
setFromTree
(
formatName
,
metaDataNode
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录