qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-22 01:54:42 -07:00
Code Releases Activity

Documentation for png.Decode and png.Encode.

Browse Source 
R=r,rsc
APPROVED=r
DELTA=7  (5 added, 0 deleted, 2 changed)
OCL=35651
CL=35692
This commit is contained in:
Nigel Tao 2009-10-13 17:14:49 -07:00
parent 76d585e5af
commit cb1ad7e765
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pkg/image/png/reader.go
View File

@ -412,6 +412,8 @@ func (d *decoder) checkHeader(r io.Reader) os.Error {
return nil; return nil;
} }
// Decode reads a PNG formatted image from r and returns it as an image.Image.
// The type of Image returned depends on the PNG contents.
func Decode(r io.Reader) (image.Image, os.Error) { func Decode(r io.Reader) (image.Image, os.Error) {
var d decoder; var d decoder;
err := d.checkHeader(r); err := d.checkHeader(r);

7
src/pkg/image/png/writer.go
View File

@ -316,9 +316,12 @@ func (e *encoder) writeIEND() {
e.writeChunk(e.tmp[0:0], "IEND"); e.writeChunk(e.tmp[0:0], "IEND");
} }
// Encode writes the Image m to w in PNG format. Any Image may be encoded, but
// images that are not image.NRGBA might be encoded lossily.
func Encode(w io.Writer, m image.Image) os.Error { func Encode(w io.Writer, m image.Image) os.Error {
// Obviously, negative widths and heights are invalid. Furthermore, // Obviously, negative widths and heights are invalid. Furthermore, the PNG
// the PNG spec section 11.2.2 says that zero is an invalid dimension. // spec section 11.2.2 says that zero is invalid. Excessively large images are
// also rejected.
mw, mh := int64(m.Width()), int64(m.Height()); mw, mh := int64(m.Width()), int64(m.Height());
if mw <= 0 || mh <= 0 || mw >= 1<<32 || mh >= 1<<32 { if mw <= 0 || mh <= 0 || mw >= 1<<32 || mh >= 1<<32 {
return FormatError("invalid image size: " + strconv.Itoa64(mw) + "x" + strconv.Itoa64(mw)); return FormatError("invalid image size: " + strconv.Itoa64(mw) + "x" + strconv.Itoa64(mw));