Skip to content

Commit

Permalink
if zlib is disabled (which it can now be), don't use it even if level…
Browse files Browse the repository at this point in the history
… is high!

git-svn-id: https://xpra.org/svn/Xpra/trunk@6984 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Jul 28, 2014
1 parent d1cae10 commit d8a695b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/xpra/server/picture_encode.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def rgb_encode(coding, image, rgb_formats, supports_transparency, speed, rgb_zli
#fewer pixels, make it more likely we won't bother compressing:
level = level / 2
if level>0:
lz4 = compression.use_lz4 and rgb_lz4 and level<=3
lz4 = (not rgb_zlib) or (compression.use_lz4 and rgb_lz4 and level<=3)
wire_data = compression.compressed_wrapper(coding, pixels, level=level, lz4=lz4)
raw_data = wire_data.data
#log("%s/%s data compressed from %s bytes down to %s (%s%%) with lz4=%s",
Expand Down

0 comments on commit d8a695b

Please sign in to comment.