Merge pull request #4 from saturday06/fix/remove_unused_from_bitstream_features

Remove undefined (unused) Bitstream feature. It breaks compilation.
master
Shunsuke Michii 10 years ago
commit 64bb969fac

@ -32,12 +32,11 @@ type DecoderOptions struct {
// BitstreamFeatures represents the image properties which are retrived from // BitstreamFeatures represents the image properties which are retrived from
// data stream. // data stream.
type BitstreamFeatures struct { type BitstreamFeatures struct {
Width int // Image width in pixels Width int // Image width in pixels
Height int // Image height in pixles Height int // Image height in pixles
HasAlpha bool // True if data stream contains a alpha channel. HasAlpha bool // True if data stream contains a alpha channel.
HasAnimation bool // True if data stream is an animation HasAnimation bool // True if data stream is an animation
Format int // Image compression format Format int // Image compression format
NoIncrementalDecoding bool // True if incremental decording is not using
} }
// GetDecoderVersion returns decoder's version number, packed in hexadecimal. // GetDecoderVersion returns decoder's version number, packed in hexadecimal.
@ -63,12 +62,11 @@ func GetFeatures(data []byte) (f *BitstreamFeatures, err error) {
} }
f = &BitstreamFeatures{ f = &BitstreamFeatures{
Width: int(cf.width), // TODO: use Rectangle instaed? Width: int(cf.width), // TODO: use Rectangle instaed?
Height: int(cf.height), Height: int(cf.height),
HasAlpha: cf.has_alpha > 0, HasAlpha: cf.has_alpha > 0,
HasAnimation: cf.has_animation > 0, HasAnimation: cf.has_animation > 0,
Format: int(cf.format), Format: int(cf.format),
NoIncrementalDecoding: cf.no_incremental_decoding == 1,
} }
return return
} }

Loading…
Cancel
Save