Revision: 4861 http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4861&view=rev Author: bphinz Date: 2012-03-06 02:49:56 +0000 (Tue, 06 Mar 2012) Log Message: ----------- Fix problem noted in feature request 3482254 where selecting Raw encoding caused the Java viewer to freeze.
Modified Paths: -------------- trunk/java/com/tigervnc/rfb/RawDecoder.java Modified: trunk/java/com/tigervnc/rfb/RawDecoder.java =================================================================== --- trunk/java/com/tigervnc/rfb/RawDecoder.java 2012-03-05 23:57:05 UTC (rev 4860) +++ trunk/java/com/tigervnc/rfb/RawDecoder.java 2012-03-06 02:49:56 UTC (rev 4861) @@ -27,12 +27,13 @@ int y = r.tl.y; int w = r.width(); int h = r.height(); - int[] imageBuf = reader.getImageBuf(w * h); - int nPixels = imageBuf.length / (reader.bpp() / 8); + int[] imageBuf = new int[w*h]; + int nPixels = imageBuf.length; + int bytesPerRow = w * (reader.bpp() / 8); while (h > 0) { int nRows = nPixels / w; if (nRows > h) nRows = h; - reader.is.readPixels(imageBuf, w * h, (reader.bpp() / 8), handler.cp.pf().bigEndian); + reader.getInStream().readPixels(imageBuf, nPixels, (reader.bpp() / 8), handler.cp.pf().bigEndian); handler.imageRect(new Rect(x, y, x+w, y+nRows), imageBuf); h -= nRows; y += nRows; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Keep Your Developer Skills Current with LearnDevNow! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-d2d _______________________________________________ Tigervnc-commits mailing list Tigervnc-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tigervnc-commits