diff options
author | vng <viktor.govako@gmail.com> | 2011-11-24 19:37:12 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:28:42 +0300 |
commit | 3171e698c313b84843aa2f10dd0ac404c55db871 (patch) | |
tree | 544dce37441ff48904ae05b9c2c0642d994aba4e /indexer/classificator_loader.cpp | |
parent | 6b307e22fe3acc4f2c594d2d0c79b311d9f4ccb5 (diff) |
Remove old code for binary drawing rules processing.
Add primary, secondary caption styles getting.
Diffstat (limited to 'indexer/classificator_loader.cpp')
-rw-r--r-- | indexer/classificator_loader.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indexer/classificator_loader.cpp b/indexer/classificator_loader.cpp index f463b8ba08..bec3a794fc 100644 --- a/indexer/classificator_loader.cpp +++ b/indexer/classificator_loader.cpp @@ -52,15 +52,11 @@ namespace classificator p.GetReader("types.txt")); //LOG(LINFO, ("Reading of drawing rules")); -#ifdef USE_PROTO_STYLES + // Load from protobuffer text file. string buffer; ReaderType(p.GetReader("drules_proto.txt")).ReadAsString(buffer); - drule::rules().LoadFromProto(buffer); -#else - ReaderPtrStream rulesS(p.GetReader("drawing_rules.bin")); - drule::ReadRules(rulesS); -#endif + drule::rules().LoadFromTextProto(buffer); LOG(LINFO, ("Reading of classificator finished")); } |