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/ShapeExtension.cpp | |
| 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/ShapeExtension.cpp')
| -rw-r--r-- | nxcomp/ShapeExtension.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/nxcomp/ShapeExtension.cpp b/nxcomp/ShapeExtension.cpp index daa19fbb4..34fad27c9 100644 --- a/nxcomp/ShapeExtension.cpp +++ b/nxcomp/ShapeExtension.cpp @@ -45,12 +45,9 @@ ShapeExtensionStore::ShapeExtensionStore(StaticCompressor *compressor) enableCache = SHAPEEXTENSION_ENABLE_CACHE; enableData = SHAPEEXTENSION_ENABLE_DATA; enableSplit = SHAPEEXTENSION_ENABLE_SPLIT; - enableCompress = SHAPEEXTENSION_ENABLE_COMPRESS; - if (control -> isProtoStep7() == 1) - { - enableCompress = SHAPEEXTENSION_ENABLE_COMPRESS_IF_PROTO_STEP_7; - } + // Since ProtoStep7 (#issue 108) + enableCompress = SHAPEEXTENSION_ENABLE_COMPRESS_IF_PROTO_STEP_7; dataLimit = SHAPEEXTENSION_DATA_LIMIT; dataOffset = SHAPEEXTENSION_DATA_OFFSET; |