diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-04-19 10:47:43 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-04-19 10:47:43 +0200 |
| commit | 03b65211260ff757b35a367f8936fd5e882ce56c (patch) | |
| tree | 014155ca365a93687f99ea6492dd2c9d3e80593e /nxcomp/RenderCompositeGlyphs.h | |
| parent | 2ffe52c5ecb7cf6af111c685eee7f8fcfd1139a9 (diff) | |
| parent | 5c495241069708e9b1bbf6e57fd49599be540b63 (diff) | |
| download | nx-libs-03b65211260ff757b35a367f8936fd5e882ce56c.tar.gz nx-libs-03b65211260ff757b35a367f8936fd5e882ce56c.tar.bz2 nx-libs-03b65211260ff757b35a367f8936fd5e882ce56c.zip | |
Merge branch 'fcarvajaldev-3.6.x-remove-old-proto-compat' into 3.6.x
Diffstat (limited to 'nxcomp/RenderCompositeGlyphs.h')
| -rw-r--r-- | nxcomp/RenderCompositeGlyphs.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nxcomp/RenderCompositeGlyphs.h b/nxcomp/RenderCompositeGlyphs.h index 527fd3d12..9458ecb14 100644 --- a/nxcomp/RenderCompositeGlyphs.h +++ b/nxcomp/RenderCompositeGlyphs.h @@ -80,9 +80,8 @@ class MESSAGE_STORE : public MESSAGE_CLASS virtual int identitySize(const unsigned char *buffer, unsigned int size) { - unsigned int offset = (control -> isProtoStep8() == 1 ? - MESSAGE_OFFSET_IF_PROTO_STEP_8 : - MESSAGE_OFFSET); + // Since ProtoStep8 (#issue 108) + unsigned int offset = MESSAGE_OFFSET_IF_PROTO_STEP_8; return (size >= offset ? offset : size); } |