Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
29555b0a
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,发现更多精彩内容 >>
提交
29555b0a
编写于
5月 17, 2013
作者:
V
vadim
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
4892259: GIF ImageReader does not call passComplete in IIOReadUpdateListener
Reviewed-by: prr, bae
上级
8ed785ae
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
130 addition
and
7 deletion
+130
-7
src/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java
...e/classes/com/sun/imageio/plugins/gif/GIFImageReader.java
+3
-7
test/javax/imageio/plugins/gif/GIFPassListenerTest.java
test/javax/imageio/plugins/gif/GIFPassListenerTest.java
+127
-0
未找到文件。
src/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java
浏览文件 @
29555b0a
...
...
@@ -790,16 +790,12 @@ public class GIFImageReader extends ImageReader {
}
private
void
startPass
(
int
pass
)
{
if
(
updateListeners
==
null
)
{
if
(
updateListeners
==
null
||
!
imageMetadata
.
interlaceFlag
)
{
return
;
}
int
y
=
0
;
int
yStep
=
1
;
if
(
imageMetadata
.
interlaceFlag
)
{
y
=
interlaceOffset
[
interlacePass
];
yStep
=
interlaceIncrement
[
interlacePass
];
}
int
y
=
interlaceOffset
[
interlacePass
];
int
yStep
=
interlaceIncrement
[
interlacePass
];
int
[]
vals
=
ReaderUtil
.
computeUpdatedPixels
(
sourceRegion
,
...
...
test/javax/imageio/plugins/gif/GIFPassListenerTest.java
0 → 100644
浏览文件 @
29555b0a
/*
* Copyright (c) 2012, 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 4892259
*
* @summary Verify that calls to IIOReadUpdateListener passStarted and
* passComplete are consistent.
*
* @run main GIFPassListenerTest
*/
import
java.awt.image.*
;
import
java.io.*
;
import
java.util.*
;
import
javax.imageio.*
;
import
javax.imageio.event.*
;
import
javax.imageio.stream.*
;
public
class
GIFPassListenerTest
{
private
static
ImageInputStream
createTestImageStream
(
boolean
progressive
)
throws
IOException
{
ByteArrayOutputStream
output
=
new
ByteArrayOutputStream
();
Iterator
<
ImageWriter
>
writers
=
ImageIO
.
getImageWritersByFormatName
(
"gif"
);
if
(!
writers
.
hasNext
())
{
return
null
;
}
ImageWriter
writer
=
writers
.
next
();
ImageWriteParam
param
=
writer
.
getDefaultWriteParam
();
param
.
setProgressiveMode
(
progressive
?
ImageWriteParam
.
MODE_DEFAULT
:
ImageWriteParam
.
MODE_DISABLED
);
ImageOutputStream
imageOutput
=
ImageIO
.
createImageOutputStream
(
output
);
writer
.
setOutput
(
imageOutput
);
BufferedImage
image
=
new
BufferedImage
(
100
,
100
,
BufferedImage
.
TYPE_INT_ARGB
);
writer
.
write
(
null
,
new
IIOImage
(
image
,
null
,
null
),
param
);
imageOutput
.
flush
();
ByteArrayInputStream
input
=
new
ByteArrayInputStream
(
output
.
toByteArray
());
return
ImageIO
.
createImageInputStream
(
input
);
}
private
static
void
checkImage
(
boolean
progressive
)
throws
Exception
{
ImageInputStream
iis
=
createTestImageStream
(
progressive
);
ImageReader
reader
=
ImageIO
.
getImageReaders
(
iis
).
next
();
reader
.
setInput
(
iis
);
ReadUpdateHandler
handler
=
new
ReadUpdateHandler
();
reader
.
addIIOReadUpdateListener
(
handler
);
reader
.
readAll
(
null
);
if
(
handler
.
isPassStarted
)
{
throw
new
RuntimeException
(
"passStarted without passComplete."
);
}
if
(
progressive
&&
(
handler
.
numPasses
==
0
))
{
throw
new
RuntimeException
(
"passStarted wasn't called for progressive image"
);
}
if
(!
progressive
&&
(
handler
.
numPasses
!=
0
))
{
throw
new
RuntimeException
(
"passStarted was called for non-progressive image"
);
}
iis
.
close
();
}
public
static
void
main
(
String
args
[])
throws
Exception
{
checkImage
(
true
);
checkImage
(
false
);
}
private
static
class
ReadUpdateHandler
implements
IIOReadUpdateListener
{
public
boolean
isPassStarted
=
false
;
public
int
numPasses
=
0
;
@Override
public
void
imageUpdate
(
ImageReader
source
,
BufferedImage
theImage
,
int
minX
,
int
minY
,
int
width
,
int
height
,
int
periodX
,
int
periodY
,
int
[]
bands
)
{
}
@Override
public
void
passStarted
(
ImageReader
source
,
BufferedImage
theImage
,
int
pass
,
int
minPass
,
int
maxPass
,
int
minX
,
int
minY
,
int
periodX
,
int
periodY
,
int
[]
bands
)
{
if
(
isPassStarted
)
{
throw
new
RuntimeException
(
"reentered passStarted!"
);
}
isPassStarted
=
true
;
numPasses
++;
}
@Override
public
void
passComplete
(
ImageReader
source
,
BufferedImage
theImage
)
{
if
(!
isPassStarted
)
{
throw
new
RuntimeException
(
"passComplete without passStarted!"
);
}
isPassStarted
=
false
;
}
@Override
public
void
thumbnailPassStarted
(
ImageReader
source
,
BufferedImage
theThumbnail
,
int
pass
,
int
minPass
,
int
maxPass
,
int
minX
,
int
minY
,
int
periodX
,
int
periodY
,
int
[]
bands
)
{
}
@Override
public
void
thumbnailPassComplete
(
ImageReader
source
,
BufferedImage
theThumbnail
)
{
}
@Override
public
void
thumbnailUpdate
(
ImageReader
source
,
BufferedImage
theThumbnail
,
int
minX
,
int
minY
,
int
width
,
int
height
,
int
periodX
,
int
periodY
,
int
[]
bands
)
{
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录