comparison src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java @ 381:47c018aed50e

Change condition to ZRLEESender.decode method
author innparusu
date Thu, 03 Sep 2015 19:44:39 +0900
parents aef5cbdd84ab
children 3af5f4af2d63
comparison
equal deleted inserted replaced
380:aef5cbdd84ab 381:47c018aed50e
28 byte[] bytes = new byte[rect.width * rect.height * renderer.getBytesPerPixel()]; 28 byte[] bytes = new byte[rect.width * rect.height * renderer.getBytesPerPixel()];
29 // byte[] bytes = new byte[renderer.getWidth() * renderer.getHeight() * renderer.getBytesPerPixel()]; 29 // byte[] bytes = new byte[renderer.getWidth() * renderer.getHeight() * renderer.getBytesPerPixel()];
30 reader.reset(); 30 reader.reset();
31 if (rfb.hasViewer()) { 31 if (rfb.hasViewer()) {
32 ZRLEDecoder decoder = new ZRLEDecoder(); 32 ZRLEDecoder decoder = new ZRLEDecoder();
33 if (rfb.isTreeManager()) { 33 if (rect.getEncodingType() == EncodingType.ZRLE) {
34 // ReadSendData convert ZRLE to ZRLEE
35 // unzipped data in the bytes
34 rfb.readSendData(dataLen, reader, bytes, rect); 36 rfb.readSendData(dataLen, reader, bytes, rect);
35 decoder.decode1(renderer, rect, bytes, 0); 37 decoder.decode1(renderer, rect, bytes, 0);
36 return; 38 return;
37 } else if (!rfb.getCuiVersion()) { 39 } else {
40 // no reencoding is required
41 // readSend does not peform unzip, do the fullrecoding
38 rfb.readSendData(dataLen, reader, null, rect); 42 rfb.readSendData(dataLen, reader, null, rect);
39 reader.reset(); 43 reader.reset();
40 reader.skip(16); 44 reader.skip(16);
41 decoder.decode(reader, renderer, rect); 45 decoder.decode(reader, renderer, rect);
42 return; 46 return;