Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
ea6928c8
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
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看板
提交
ea6928c8
编写于
4月 15, 2013
作者:
B
bae
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8005930: [lcms] ColorConvertOp: Alpha channel is not transferred from source to destination.
Reviewed-by: prr
上级
1f91e5f9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
108 addition
and
7 deletion
+108
-7
src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java
src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java
+9
-7
test/sun/java2d/cmm/ColorConvertOp/AlphaTest.java
test/sun/java2d/cmm/ColorConvertOp/AlphaTest.java
+99
-0
未找到文件。
src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java
浏览文件 @
ea6928c8
...
@@ -163,13 +163,15 @@ public class LCMSTransform implements ColorTransform {
...
@@ -163,13 +163,15 @@ public class LCMSTransform implements ColorTransform {
public
void
colorConvert
(
BufferedImage
src
,
BufferedImage
dst
)
{
public
void
colorConvert
(
BufferedImage
src
,
BufferedImage
dst
)
{
LCMSImageLayout
srcIL
,
dstIL
;
LCMSImageLayout
srcIL
,
dstIL
;
dstIL
=
LCMSImageLayout
.
createImageLayout
(
dst
);
if
(!
dst
.
getColorModel
().
hasAlpha
())
{
dstIL
=
LCMSImageLayout
.
createImageLayout
(
dst
);
if
(
dstIL
!=
null
)
{
srcIL
=
LCMSImageLayout
.
createImageLayout
(
src
);
if
(
dstIL
!=
null
)
{
if
(
srcIL
!=
null
)
{
srcIL
=
LCMSImageLayout
.
createImageLayout
(
src
);
doTransform
(
srcIL
,
dstIL
);
if
(
srcIL
!=
null
)
{
return
;
doTransform
(
srcIL
,
dstIL
);
return
;
}
}
}
}
}
...
...
test/sun/java2d/cmm/ColorConvertOp/AlphaTest.java
0 → 100644
浏览文件 @
ea6928c8
/*
* Copyright (c) 2013, 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 8005930
* @summary Thest verifies that color conversion does not distort
* alpha channel in the destination image.
*
* @run main AlphaTest
*/
import
java.awt.AlphaComposite
;
import
java.awt.Color
;
import
java.awt.Graphics2D
;
import
java.awt.color.ColorSpace
;
import
java.awt.image.BufferedImage
;
import
java.awt.image.ColorConvertOp
;
public
class
AlphaTest
{
public
static
void
main
(
String
[]
args
)
{
ColorSpace
cs
=
ColorSpace
.
getInstance
(
ColorSpace
.
CS_GRAY
);
ColorConvertOp
op
=
new
ColorConvertOp
(
cs
,
null
);
// create source image filled with an opaque color
BufferedImage
src
=
createSrc
();
int
srcAlpha
=
getAlpha
(
src
);
System
.
out
.
printf
(
"Src alpha: 0x%02x\n"
,
srcAlpha
);
// create clear (transparent black) destination image
BufferedImage
dst
=
createDst
();
int
dstAlpha
=
getAlpha
(
dst
);
System
.
out
.
printf
(
"Dst alpha: 0x%02x\n"
,
dstAlpha
);
dst
=
op
.
filter
(
src
,
dst
);
dstAlpha
=
getAlpha
(
dst
);
// we expect that destination image is opaque
// i.e. alpha is transferred from source to
// the destination
System
.
out
.
printf
(
"Result alpha: 0x%02x\n"
,
dstAlpha
);
if
(
srcAlpha
!=
dstAlpha
)
{
throw
new
RuntimeException
(
"Test failed!"
);
}
System
.
out
.
println
(
"Test passed"
);
}
private
static
BufferedImage
createSrc
()
{
BufferedImage
img
=
new
BufferedImage
(
w
,
h
,
BufferedImage
.
TYPE_INT_ARGB
);
Graphics2D
g
=
img
.
createGraphics
();
g
.
setColor
(
Color
.
red
);
g
.
fillRect
(
0
,
0
,
w
,
h
);
g
.
dispose
();
return
img
;
}
private
static
BufferedImage
createDst
()
{
BufferedImage
img
=
new
BufferedImage
(
w
,
h
,
BufferedImage
.
TYPE_INT_ARGB
);
Graphics2D
g
=
img
.
createGraphics
();
g
.
setComposite
(
AlphaComposite
.
Clear
);
g
.
fillRect
(
0
,
0
,
w
,
h
);
g
.
dispose
();
return
img
;
}
private
static
int
getAlpha
(
BufferedImage
img
)
{
int
argb
=
img
.
getRGB
(
w
/
2
,
h
/
2
);
return
0xff
&
(
argb
>>
24
);
}
private
static
final
int
w
=
100
;
private
static
final
int
h
=
100
;
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录