github/vnc2video
1
0
Fork 0
mirror of https://github.com/amitbet/vnc2video.git synced 2025-09-19 17:14:15 +00:00
Code Issues Projects Releases Wiki Activity

fixing up tightPng implementation so it might work (untested)

Browse Source
This commit is contained in:
amit bezalel
2018-01-22 07:10:23 +02:00
parent 1ce97d02eb
commit 2bff324c0a
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
encoding_tightpng.go
View File

@@ -58,7 +58,7 @@ func (enc *TightPngEncoding) Write(c Conn, rect *Rectangle) error {
type TightPngEncoding struct { type TightPngEncoding struct {
TightCC *TightCC TightCC *TightCC
Image image.Image Image draw.Image
} }
func (*TightPngEncoding) Type() EncodingType { return EncTightPng } func (*TightPngEncoding) Type() EncodingType { return EncTightPng }
@@ -77,19 +77,27 @@ func (enc *TightPngEncoding) Read(c Conn, rect *Rectangle) error {
if err != nil { if err != nil {
return err return err
} }
enc.Image, err = png.Decode(io.LimitReader(c, int64(l))) img, err := png.Decode(io.LimitReader(c, int64(l)))
if err != nil { if err != nil {
return err return err
} }
draw.Draw(enc.Image, enc.Image.Bounds(), img, image.Point{X: int(rect.X), Y: int(rect.Y)}, draw.Src)
case TightCompressionFill: case TightCompressionFill:
var tpx TightPixel var tpx TightPixel
if err := binary.Read(c, binary.BigEndian, &tpx); err != nil { if err := binary.Read(c, binary.BigEndian, &tpx); err != nil {
return err return err
} }
enc.Image = image.NewRGBA(image.Rect(0, 0, 1, 1)) //enc.Image = image.NewRGBA(image.Rect(0, 0, 1, 1))
enc.Image.(draw.Image).Set(0, 0, color.RGBA{R: tpx.R, G: tpx.G, B: tpx.B, A: 1}) col := color.RGBA{R: tpx.R, G: tpx.G, B: tpx.B, A: 1}
myRect := MakeRectFromVncRect(rect)
FillRect(enc.Image, &myRect, col)
//enc.Image.(draw.Image).Set(0, 0, color.RGBA{R: tpx.R, G: tpx.G, B: tpx.B, A: 1})
default: default:
return fmt.Errorf("unknown compression %d", cmp) return fmt.Errorf("unknown compression %d", cmp)
} }
return nil return nil
} }
func (enc *TightPngEncoding) SetTargetImage(img draw.Image) {
enc.Image = img
}