From 495ad0261795e85d525996a63cba1124bf999ac2 Mon Sep 17 00:00:00 2001 From: vng Date: Fri, 11 Nov 2011 17:21:54 +0300 Subject: [PATCH] Some fixes of drawing rules proto-structure. --- indexer/drules_struct.pb.cc | 1522 ++++++++++++++++++++++++----------- indexer/drules_struct.pb.h | 703 ++++++++-------- indexer/drules_struct.proto | 28 +- 3 files changed, 1391 insertions(+), 862 deletions(-) diff --git a/indexer/drules_struct.pb.cc b/indexer/drules_struct.pb.cc index fe9e9ea58b..6be33b1f29 100644 --- a/indexer/drules_struct.pb.cc +++ b/indexer/drules_struct.pb.cc @@ -8,19 +8,251 @@ #include #include #include +#include +#include +#include // @@protoc_insertion_point(includes) +namespace { + +const ::google::protobuf::Descriptor* DashDotProto_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + DashDotProto_reflection_ = NULL; +const ::google::protobuf::Descriptor* LineRuleProto_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + LineRuleProto_reflection_ = NULL; +const ::google::protobuf::Descriptor* AreaRuleProto_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + AreaRuleProto_reflection_ = NULL; +const ::google::protobuf::Descriptor* SymbolRuleProto_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + SymbolRuleProto_reflection_ = NULL; +const ::google::protobuf::Descriptor* CaptionRuleProto_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + CaptionRuleProto_reflection_ = NULL; +const ::google::protobuf::Descriptor* CircleRuleProto_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + CircleRuleProto_reflection_ = NULL; +const ::google::protobuf::Descriptor* DrawElementProto_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + DrawElementProto_reflection_ = NULL; +const ::google::protobuf::Descriptor* ClassifElementProto_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + ClassifElementProto_reflection_ = NULL; +const ::google::protobuf::Descriptor* ContainerProto_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + ContainerProto_reflection_ = NULL; + +} // namespace + + +void protobuf_AssignDesc_drules_5fstruct_2eproto() { + protobuf_AddDesc_drules_5fstruct_2eproto(); + const ::google::protobuf::FileDescriptor* file = + ::google::protobuf::DescriptorPool::generated_pool()->FindFileByName( + "drules_struct.proto"); + GOOGLE_CHECK(file != NULL); + DashDotProto_descriptor_ = file->message_type(0); + static const int DashDotProto_offsets_[1] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DashDotProto, dd_), + }; + DashDotProto_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + DashDotProto_descriptor_, + DashDotProto::default_instance_, + DashDotProto_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DashDotProto, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DashDotProto, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(DashDotProto)); + LineRuleProto_descriptor_ = file->message_type(1); + static const int LineRuleProto_offsets_[3] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineRuleProto, width_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineRuleProto, color_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineRuleProto, dashdot_), + }; + LineRuleProto_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + LineRuleProto_descriptor_, + LineRuleProto::default_instance_, + LineRuleProto_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineRuleProto, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineRuleProto, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(LineRuleProto)); + AreaRuleProto_descriptor_ = file->message_type(2); + static const int AreaRuleProto_offsets_[2] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AreaRuleProto, color_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AreaRuleProto, border_), + }; + AreaRuleProto_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + AreaRuleProto_descriptor_, + AreaRuleProto::default_instance_, + AreaRuleProto_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AreaRuleProto, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AreaRuleProto, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(AreaRuleProto)); + SymbolRuleProto_descriptor_ = file->message_type(3); + static const int SymbolRuleProto_offsets_[1] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SymbolRuleProto, name_), + }; + SymbolRuleProto_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + SymbolRuleProto_descriptor_, + SymbolRuleProto::default_instance_, + SymbolRuleProto_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SymbolRuleProto, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SymbolRuleProto, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(SymbolRuleProto)); + CaptionRuleProto_descriptor_ = file->message_type(4); + static const int CaptionRuleProto_offsets_[3] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionRuleProto, height_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionRuleProto, color_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionRuleProto, stroke_color_), + }; + CaptionRuleProto_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + CaptionRuleProto_descriptor_, + CaptionRuleProto::default_instance_, + CaptionRuleProto_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionRuleProto, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionRuleProto, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(CaptionRuleProto)); + CircleRuleProto_descriptor_ = file->message_type(5); + static const int CircleRuleProto_offsets_[3] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CircleRuleProto, radius_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CircleRuleProto, color_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CircleRuleProto, border_), + }; + CircleRuleProto_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + CircleRuleProto_descriptor_, + CircleRuleProto::default_instance_, + CircleRuleProto_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CircleRuleProto, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CircleRuleProto, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(CircleRuleProto)); + DrawElementProto_descriptor_ = file->message_type(6); + static const int DrawElementProto_offsets_[6] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrawElementProto, scale_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrawElementProto, lines_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrawElementProto, area_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrawElementProto, symbol_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrawElementProto, caption_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrawElementProto, circle_), + }; + DrawElementProto_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + DrawElementProto_descriptor_, + DrawElementProto::default_instance_, + DrawElementProto_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrawElementProto, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrawElementProto, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(DrawElementProto)); + ClassifElementProto_descriptor_ = file->message_type(7); + static const int ClassifElementProto_offsets_[2] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClassifElementProto, name_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClassifElementProto, element_), + }; + ClassifElementProto_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + ClassifElementProto_descriptor_, + ClassifElementProto::default_instance_, + ClassifElementProto_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClassifElementProto, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClassifElementProto, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(ClassifElementProto)); + ContainerProto_descriptor_ = file->message_type(8); + static const int ContainerProto_offsets_[1] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ContainerProto, cont_), + }; + ContainerProto_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + ContainerProto_descriptor_, + ContainerProto::default_instance_, + ContainerProto_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ContainerProto, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ContainerProto, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(ContainerProto)); +} + +namespace { + +GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_); +inline void protobuf_AssignDescriptorsOnce() { + ::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_, + &protobuf_AssignDesc_drules_5fstruct_2eproto); +} + +void protobuf_RegisterTypes(const ::std::string&) { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + DashDotProto_descriptor_, &DashDotProto::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + LineRuleProto_descriptor_, &LineRuleProto::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + AreaRuleProto_descriptor_, &AreaRuleProto::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + SymbolRuleProto_descriptor_, &SymbolRuleProto::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + CaptionRuleProto_descriptor_, &CaptionRuleProto::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + CircleRuleProto_descriptor_, &CircleRuleProto::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + DrawElementProto_descriptor_, &DrawElementProto::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + ClassifElementProto_descriptor_, &ClassifElementProto::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + ContainerProto_descriptor_, &ContainerProto::default_instance()); +} + +} // namespace + void protobuf_ShutdownFile_drules_5fstruct_2eproto() { - delete ColorProto::default_instance_; delete DashDotProto::default_instance_; + delete DashDotProto_reflection_; delete LineRuleProto::default_instance_; + delete LineRuleProto_reflection_; delete AreaRuleProto::default_instance_; + delete AreaRuleProto_reflection_; delete SymbolRuleProto::default_instance_; + delete SymbolRuleProto_reflection_; delete CaptionRuleProto::default_instance_; + delete CaptionRuleProto_reflection_; delete CircleRuleProto::default_instance_; + delete CircleRuleProto_reflection_; delete DrawElementProto::default_instance_; + delete DrawElementProto_reflection_; delete ClassifElementProto::default_instance_; + delete ClassifElementProto_reflection_; delete ContainerProto::default_instance_; + delete ContainerProto_reflection_; } void protobuf_AddDesc_drules_5fstruct_2eproto() { @@ -29,7 +261,27 @@ void protobuf_AddDesc_drules_5fstruct_2eproto() { already_here = true; GOOGLE_PROTOBUF_VERIFY_VERSION; - ColorProto::default_instance_ = new ColorProto(); + ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( + "\n\023drules_struct.proto\"\032\n\014DashDotProto\022\n\n" + "\002dd\030\001 \003(\001\"M\n\rLineRuleProto\022\r\n\005width\030\001 \002(" + "\001\022\r\n\005color\030\002 \002(\005\022\036\n\007dashdot\030\003 \001(\0132\r.Dash" + "DotProto\">\n\rAreaRuleProto\022\r\n\005color\030\001 \002(\005" + "\022\036\n\006border\030\002 \001(\0132\016.LineRuleProto\"\037\n\017Symb" + "olRuleProto\022\014\n\004name\030\001 \002(\t\"G\n\020CaptionRule" + "Proto\022\016\n\006height\030\001 \002(\005\022\r\n\005color\030\002 \001(\005\022\024\n\014" + "stroke_color\030\003 \001(\005\"P\n\017CircleRuleProto\022\016\n" + "\006radius\030\001 \002(\001\022\r\n\005color\030\002 \002(\005\022\036\n\006border\030\003" + " \001(\0132\016.LineRuleProto\"\306\001\n\020DrawElementProt" + "o\022\r\n\005scale\030\001 \002(\005\022\035\n\005lines\030\002 \003(\0132\016.LineRu" + "leProto\022\034\n\004area\030\003 \001(\0132\016.AreaRuleProto\022 \n" + "\006symbol\030\004 \001(\0132\020.SymbolRuleProto\022\"\n\007capti" + "on\030\005 \001(\0132\021.CaptionRuleProto\022 \n\006circle\030\006 " + "\001(\0132\020.CircleRuleProto\"G\n\023ClassifElementP" + "roto\022\014\n\004name\030\001 \002(\t\022\"\n\007element\030\002 \003(\0132\021.Dr" + "awElementProto\"4\n\016ContainerProto\022\"\n\004cont" + "\030\001 \003(\0132\024.ClassifElementProto", 708); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( + "drules_struct.proto", &protobuf_RegisterTypes); DashDotProto::default_instance_ = new DashDotProto(); LineRuleProto::default_instance_ = new LineRuleProto(); AreaRuleProto::default_instance_ = new AreaRuleProto(); @@ -39,7 +291,6 @@ void protobuf_AddDesc_drules_5fstruct_2eproto() { DrawElementProto::default_instance_ = new DrawElementProto(); ClassifElementProto::default_instance_ = new ClassifElementProto(); ContainerProto::default_instance_ = new ContainerProto(); - ColorProto::default_instance_->InitAsDefaultInstance(); DashDotProto::default_instance_->InitAsDefaultInstance(); LineRuleProto::default_instance_->InitAsDefaultInstance(); AreaRuleProto::default_instance_->InitAsDefaultInstance(); @@ -60,200 +311,6 @@ struct StaticDescriptorInitializer_drules_5fstruct_2eproto { } static_descriptor_initializer_drules_5fstruct_2eproto_; -// =================================================================== - -#ifndef _MSC_VER -const int ColorProto::kColorFieldNumber; -const int ColorProto::kOpacityFieldNumber; -#endif // !_MSC_VER - -ColorProto::ColorProto() - : ::google::protobuf::MessageLite() { - SharedCtor(); -} - -void ColorProto::InitAsDefaultInstance() { -} - -ColorProto::ColorProto(const ColorProto& from) - : ::google::protobuf::MessageLite() { - SharedCtor(); - MergeFrom(from); -} - -void ColorProto::SharedCtor() { - _cached_size_ = 0; - color_ = 0; - opacity_ = 0; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); -} - -ColorProto::~ColorProto() { - SharedDtor(); -} - -void ColorProto::SharedDtor() { - if (this != default_instance_) { - } -} - -void ColorProto::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const ColorProto& ColorProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; -} - -ColorProto* ColorProto::default_instance_ = NULL; - -ColorProto* ColorProto::New() const { - return new ColorProto; -} - -void ColorProto::Clear() { - if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - color_ = 0; - opacity_ = 0; - } - ::memset(_has_bits_, 0, sizeof(_has_bits_)); -} - -bool ColorProto::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!(EXPRESSION)) return false - ::google::protobuf::uint32 tag; - while ((tag = input->ReadTag()) != 0) { - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required int32 color = 1; - case 1: { - if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) { - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, &color_))); - set_has_color(); - } else { - goto handle_uninterpreted; - } - if (input->ExpectTag(16)) goto parse_opacity; - break; - } - - // optional int32 opacity = 2; - case 2: { - if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) { - parse_opacity: - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, &opacity_))); - set_has_opacity(); - } else { - goto handle_uninterpreted; - } - if (input->ExpectAtEnd()) return true; - break; - } - - default: { - handle_uninterpreted: - if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { - return true; - } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); - break; - } - } - } - return true; -#undef DO_ -} - -void ColorProto::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // required int32 color = 1; - if (has_color()) { - ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->color(), output); - } - - // optional int32 opacity = 2; - if (has_opacity()) { - ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->opacity(), output); - } - -} - -int ColorProto::ByteSize() const { - int total_size = 0; - - if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required int32 color = 1; - if (has_color()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->color()); - } - - // optional int32 opacity = 2; - if (has_opacity()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->opacity()); - } - - } - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); - return total_size; -} - -void ColorProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); -} - -void ColorProto::MergeFrom(const ColorProto& from) { - GOOGLE_CHECK_NE(&from, this); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { - if (from.has_color()) { - set_color(from.color()); - } - if (from.has_opacity()) { - set_opacity(from.opacity()); - } - } -} - -void ColorProto::CopyFrom(const ColorProto& from) { - if (&from == this) return; - Clear(); - MergeFrom(from); -} - -bool ColorProto::IsInitialized() const { - if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false; - - return true; -} - -void ColorProto::Swap(ColorProto* other) { - if (other != this) { - std::swap(color_, other->color_); - std::swap(opacity_, other->opacity_); - std::swap(_has_bits_[0], other->_has_bits_[0]); - std::swap(_cached_size_, other->_cached_size_); - } -} - -::std::string ColorProto::GetTypeName() const { - return "ColorProto"; -} - - // =================================================================== #ifndef _MSC_VER @@ -261,7 +318,7 @@ const int DashDotProto::kDdFieldNumber; #endif // !_MSC_VER DashDotProto::DashDotProto() - : ::google::protobuf::MessageLite() { + : ::google::protobuf::Message() { SharedCtor(); } @@ -269,7 +326,7 @@ void DashDotProto::InitAsDefaultInstance() { } DashDotProto::DashDotProto(const DashDotProto& from) - : ::google::protobuf::MessageLite() { + : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); } @@ -293,6 +350,11 @@ void DashDotProto::SetCachedSize(int size) const { _cached_size_ = size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); } +const ::google::protobuf::Descriptor* DashDotProto::descriptor() { + protobuf_AssignDescriptorsOnce(); + return DashDotProto_descriptor_; +} + const DashDotProto& DashDotProto::default_instance() { if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; } @@ -306,6 +368,7 @@ DashDotProto* DashDotProto::New() const { void DashDotProto::Clear() { dd_.Clear(); ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); } bool DashDotProto::MergePartialFromCodedStream( @@ -342,7 +405,8 @@ bool DashDotProto::MergePartialFromCodedStream( ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { return true; } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); break; } } @@ -359,6 +423,25 @@ void DashDotProto::SerializeWithCachedSizes( 1, this->dd(i), output); } + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } +} + +::google::protobuf::uint8* DashDotProto::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // repeated double dd = 1; + for (int i = 0; i < this->dd_size(); i++) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteDoubleToArray(1, this->dd(i), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + return target; } int DashDotProto::ByteSize() const { @@ -371,20 +454,39 @@ int DashDotProto::ByteSize() const { total_size += 1 * this->dd_size() + data_size; } + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = total_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } -void DashDotProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); +void DashDotProto::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const DashDotProto* source = + ::google::protobuf::internal::dynamic_cast_if_available( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } } void DashDotProto::MergeFrom(const DashDotProto& from) { GOOGLE_CHECK_NE(&from, this); dd_.MergeFrom(from.dd_); + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void DashDotProto::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); } void DashDotProto::CopyFrom(const DashDotProto& from) { @@ -402,12 +504,17 @@ void DashDotProto::Swap(DashDotProto* other) { if (other != this) { dd_.Swap(&other->dd_); std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); } } -::std::string DashDotProto::GetTypeName() const { - return "DashDotProto"; +::google::protobuf::Metadata DashDotProto::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = DashDotProto_descriptor_; + metadata.reflection = DashDotProto_reflection_; + return metadata; } @@ -420,17 +527,16 @@ const int LineRuleProto::kDashdotFieldNumber; #endif // !_MSC_VER LineRuleProto::LineRuleProto() - : ::google::protobuf::MessageLite() { + : ::google::protobuf::Message() { SharedCtor(); } void LineRuleProto::InitAsDefaultInstance() { - color_ = const_cast< ::ColorProto*>(&::ColorProto::default_instance()); dashdot_ = const_cast< ::DashDotProto*>(&::DashDotProto::default_instance()); } LineRuleProto::LineRuleProto(const LineRuleProto& from) - : ::google::protobuf::MessageLite() { + : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); } @@ -438,7 +544,7 @@ LineRuleProto::LineRuleProto(const LineRuleProto& from) void LineRuleProto::SharedCtor() { _cached_size_ = 0; width_ = 0; - color_ = NULL; + color_ = 0; dashdot_ = NULL; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -449,7 +555,6 @@ LineRuleProto::~LineRuleProto() { void LineRuleProto::SharedDtor() { if (this != default_instance_) { - delete color_; delete dashdot_; } } @@ -459,6 +564,11 @@ void LineRuleProto::SetCachedSize(int size) const { _cached_size_ = size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); } +const ::google::protobuf::Descriptor* LineRuleProto::descriptor() { + protobuf_AssignDescriptorsOnce(); + return LineRuleProto_descriptor_; +} + const LineRuleProto& LineRuleProto::default_instance() { if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; } @@ -472,14 +582,13 @@ LineRuleProto* LineRuleProto::New() const { void LineRuleProto::Clear() { if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { width_ = 0; - if (has_color()) { - if (color_ != NULL) color_->::ColorProto::Clear(); - } + color_ = 0; if (has_dashdot()) { if (dashdot_ != NULL) dashdot_->::DashDotProto::Clear(); } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); } bool LineRuleProto::MergePartialFromCodedStream( @@ -499,17 +608,19 @@ bool LineRuleProto::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(18)) goto parse_color; + if (input->ExpectTag(16)) goto parse_color; break; } - // required .ColorProto color = 2; + // required int32 color = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) { parse_color: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_color())); + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( + input, &color_))); + set_has_color(); } else { goto handle_uninterpreted; } @@ -537,7 +648,8 @@ bool LineRuleProto::MergePartialFromCodedStream( ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { return true; } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); break; } } @@ -553,18 +665,47 @@ void LineRuleProto::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteDouble(1, this->width(), output); } - // required .ColorProto color = 2; + // required int32 color = 2; if (has_color()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 2, this->color(), output); + ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->color(), output); } // optional .DashDotProto dashdot = 3; if (has_dashdot()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->dashdot(), output); } + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } +} + +::google::protobuf::uint8* LineRuleProto::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // required double width = 1; + if (has_width()) { + target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(1, this->width(), target); + } + + // required int32 color = 2; + if (has_color()) { + target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->color(), target); + } + + // optional .DashDotProto dashdot = 3; + if (has_dashdot()) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 3, this->dashdot(), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + return target; } int LineRuleProto::ByteSize() const { @@ -576,10 +717,10 @@ int LineRuleProto::ByteSize() const { total_size += 1 + 8; } - // required .ColorProto color = 2; + // required int32 color = 2; if (has_color()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + ::google::protobuf::internal::WireFormatLite::Int32Size( this->color()); } @@ -591,15 +732,27 @@ int LineRuleProto::ByteSize() const { } } + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = total_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } -void LineRuleProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); +void LineRuleProto::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const LineRuleProto* source = + ::google::protobuf::internal::dynamic_cast_if_available( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } } void LineRuleProto::MergeFrom(const LineRuleProto& from) { @@ -609,12 +762,19 @@ void LineRuleProto::MergeFrom(const LineRuleProto& from) { set_width(from.width()); } if (from.has_color()) { - mutable_color()->::ColorProto::MergeFrom(from.color()); + set_color(from.color()); } if (from.has_dashdot()) { mutable_dashdot()->::DashDotProto::MergeFrom(from.dashdot()); } } + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void LineRuleProto::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); } void LineRuleProto::CopyFrom(const LineRuleProto& from) { @@ -626,9 +786,6 @@ void LineRuleProto::CopyFrom(const LineRuleProto& from) { bool LineRuleProto::IsInitialized() const { if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false; - if (has_color()) { - if (!this->color().IsInitialized()) return false; - } return true; } @@ -638,12 +795,17 @@ void LineRuleProto::Swap(LineRuleProto* other) { std::swap(color_, other->color_); std::swap(dashdot_, other->dashdot_); std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); } } -::std::string LineRuleProto::GetTypeName() const { - return "LineRuleProto"; +::google::protobuf::Metadata LineRuleProto::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = LineRuleProto_descriptor_; + metadata.reflection = LineRuleProto_reflection_; + return metadata; } @@ -655,24 +817,23 @@ const int AreaRuleProto::kBorderFieldNumber; #endif // !_MSC_VER AreaRuleProto::AreaRuleProto() - : ::google::protobuf::MessageLite() { + : ::google::protobuf::Message() { SharedCtor(); } void AreaRuleProto::InitAsDefaultInstance() { - color_ = const_cast< ::ColorProto*>(&::ColorProto::default_instance()); border_ = const_cast< ::LineRuleProto*>(&::LineRuleProto::default_instance()); } AreaRuleProto::AreaRuleProto(const AreaRuleProto& from) - : ::google::protobuf::MessageLite() { + : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); } void AreaRuleProto::SharedCtor() { _cached_size_ = 0; - color_ = NULL; + color_ = 0; border_ = NULL; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -683,7 +844,6 @@ AreaRuleProto::~AreaRuleProto() { void AreaRuleProto::SharedDtor() { if (this != default_instance_) { - delete color_; delete border_; } } @@ -693,6 +853,11 @@ void AreaRuleProto::SetCachedSize(int size) const { _cached_size_ = size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); } +const ::google::protobuf::Descriptor* AreaRuleProto::descriptor() { + protobuf_AssignDescriptorsOnce(); + return AreaRuleProto_descriptor_; +} + const AreaRuleProto& AreaRuleProto::default_instance() { if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; } @@ -705,14 +870,13 @@ AreaRuleProto* AreaRuleProto::New() const { void AreaRuleProto::Clear() { if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - if (has_color()) { - if (color_ != NULL) color_->::ColorProto::Clear(); - } + color_ = 0; if (has_border()) { if (border_ != NULL) border_->::LineRuleProto::Clear(); } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); } bool AreaRuleProto::MergePartialFromCodedStream( @@ -721,12 +885,14 @@ bool AreaRuleProto::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; while ((tag = input->ReadTag()) != 0) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .ColorProto color = 1; + // required int32 color = 1; case 1: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_color())); + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) { + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( + input, &color_))); + set_has_color(); } else { goto handle_uninterpreted; } @@ -754,7 +920,8 @@ bool AreaRuleProto::MergePartialFromCodedStream( ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { return true; } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); break; } } @@ -765,28 +932,52 @@ bool AreaRuleProto::MergePartialFromCodedStream( void AreaRuleProto::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // required .ColorProto color = 1; + // required int32 color = 1; if (has_color()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 1, this->color(), output); + ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->color(), output); } // optional .LineRuleProto border = 2; if (has_border()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->border(), output); } + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } +} + +::google::protobuf::uint8* AreaRuleProto::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // required int32 color = 1; + if (has_color()) { + target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->color(), target); + } + + // optional .LineRuleProto border = 2; + if (has_border()) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 2, this->border(), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + return target; } int AreaRuleProto::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .ColorProto color = 1; + // required int32 color = 1; if (has_color()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + ::google::protobuf::internal::WireFormatLite::Int32Size( this->color()); } @@ -798,27 +989,46 @@ int AreaRuleProto::ByteSize() const { } } + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = total_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } -void AreaRuleProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); +void AreaRuleProto::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const AreaRuleProto* source = + ::google::protobuf::internal::dynamic_cast_if_available( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } } void AreaRuleProto::MergeFrom(const AreaRuleProto& from) { GOOGLE_CHECK_NE(&from, this); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_color()) { - mutable_color()->::ColorProto::MergeFrom(from.color()); + set_color(from.color()); } if (from.has_border()) { mutable_border()->::LineRuleProto::MergeFrom(from.border()); } } + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void AreaRuleProto::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); } void AreaRuleProto::CopyFrom(const AreaRuleProto& from) { @@ -830,9 +1040,6 @@ void AreaRuleProto::CopyFrom(const AreaRuleProto& from) { bool AreaRuleProto::IsInitialized() const { if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false; - if (has_color()) { - if (!this->color().IsInitialized()) return false; - } if (has_border()) { if (!this->border().IsInitialized()) return false; } @@ -844,12 +1051,17 @@ void AreaRuleProto::Swap(AreaRuleProto* other) { std::swap(color_, other->color_); std::swap(border_, other->border_); std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); } } -::std::string AreaRuleProto::GetTypeName() const { - return "AreaRuleProto"; +::google::protobuf::Metadata AreaRuleProto::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = AreaRuleProto_descriptor_; + metadata.reflection = AreaRuleProto_reflection_; + return metadata; } @@ -860,7 +1072,7 @@ const int SymbolRuleProto::kNameFieldNumber; #endif // !_MSC_VER SymbolRuleProto::SymbolRuleProto() - : ::google::protobuf::MessageLite() { + : ::google::protobuf::Message() { SharedCtor(); } @@ -868,7 +1080,7 @@ void SymbolRuleProto::InitAsDefaultInstance() { } SymbolRuleProto::SymbolRuleProto(const SymbolRuleProto& from) - : ::google::protobuf::MessageLite() { + : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); } @@ -896,6 +1108,11 @@ void SymbolRuleProto::SetCachedSize(int size) const { _cached_size_ = size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); } +const ::google::protobuf::Descriptor* SymbolRuleProto::descriptor() { + protobuf_AssignDescriptorsOnce(); + return SymbolRuleProto_descriptor_; +} + const SymbolRuleProto& SymbolRuleProto::default_instance() { if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; } @@ -915,6 +1132,7 @@ void SymbolRuleProto::Clear() { } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); } bool SymbolRuleProto::MergePartialFromCodedStream( @@ -929,6 +1147,9 @@ bool SymbolRuleProto::MergePartialFromCodedStream( ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); + ::google::protobuf::internal::WireFormat::VerifyUTF8String( + this->name().data(), this->name().length(), + ::google::protobuf::internal::WireFormat::PARSE); } else { goto handle_uninterpreted; } @@ -942,7 +1163,8 @@ bool SymbolRuleProto::MergePartialFromCodedStream( ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { return true; } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); break; } } @@ -955,10 +1177,36 @@ void SymbolRuleProto::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { // required string name = 1; if (has_name()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8String( + this->name().data(), this->name().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE); ::google::protobuf::internal::WireFormatLite::WriteString( 1, this->name(), output); } + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } +} + +::google::protobuf::uint8* SymbolRuleProto::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // required string name = 1; + if (has_name()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8String( + this->name().data(), this->name().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 1, this->name(), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + return target; } int SymbolRuleProto::ByteSize() const { @@ -973,15 +1221,27 @@ int SymbolRuleProto::ByteSize() const { } } + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = total_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } -void SymbolRuleProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); +void SymbolRuleProto::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const SymbolRuleProto* source = + ::google::protobuf::internal::dynamic_cast_if_available( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } } void SymbolRuleProto::MergeFrom(const SymbolRuleProto& from) { @@ -991,6 +1251,13 @@ void SymbolRuleProto::MergeFrom(const SymbolRuleProto& from) { set_name(from.name()); } } + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void SymbolRuleProto::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); } void SymbolRuleProto::CopyFrom(const SymbolRuleProto& from) { @@ -1009,12 +1276,17 @@ void SymbolRuleProto::Swap(SymbolRuleProto* other) { if (other != this) { std::swap(name_, other->name_); std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); } } -::std::string SymbolRuleProto::GetTypeName() const { - return "SymbolRuleProto"; +::google::protobuf::Metadata SymbolRuleProto::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = SymbolRuleProto_descriptor_; + metadata.reflection = SymbolRuleProto_reflection_; + return metadata; } @@ -1027,17 +1299,15 @@ const int CaptionRuleProto::kStrokeColorFieldNumber; #endif // !_MSC_VER CaptionRuleProto::CaptionRuleProto() - : ::google::protobuf::MessageLite() { + : ::google::protobuf::Message() { SharedCtor(); } void CaptionRuleProto::InitAsDefaultInstance() { - color_ = const_cast< ::ColorProto*>(&::ColorProto::default_instance()); - stroke_color_ = const_cast< ::ColorProto*>(&::ColorProto::default_instance()); } CaptionRuleProto::CaptionRuleProto(const CaptionRuleProto& from) - : ::google::protobuf::MessageLite() { + : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); } @@ -1045,8 +1315,8 @@ CaptionRuleProto::CaptionRuleProto(const CaptionRuleProto& from) void CaptionRuleProto::SharedCtor() { _cached_size_ = 0; height_ = 0; - color_ = NULL; - stroke_color_ = NULL; + color_ = 0; + stroke_color_ = 0; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -1056,8 +1326,6 @@ CaptionRuleProto::~CaptionRuleProto() { void CaptionRuleProto::SharedDtor() { if (this != default_instance_) { - delete color_; - delete stroke_color_; } } @@ -1066,6 +1334,11 @@ void CaptionRuleProto::SetCachedSize(int size) const { _cached_size_ = size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); } +const ::google::protobuf::Descriptor* CaptionRuleProto::descriptor() { + protobuf_AssignDescriptorsOnce(); + return CaptionRuleProto_descriptor_; +} + const CaptionRuleProto& CaptionRuleProto::default_instance() { if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; } @@ -1079,14 +1352,11 @@ CaptionRuleProto* CaptionRuleProto::New() const { void CaptionRuleProto::Clear() { if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { height_ = 0; - if (has_color()) { - if (color_ != NULL) color_->::ColorProto::Clear(); - } - if (has_stroke_color()) { - if (stroke_color_ != NULL) stroke_color_->::ColorProto::Clear(); - } + color_ = 0; + stroke_color_ = 0; } ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); } bool CaptionRuleProto::MergePartialFromCodedStream( @@ -1106,31 +1376,35 @@ bool CaptionRuleProto::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(18)) goto parse_color; + if (input->ExpectTag(16)) goto parse_color; break; } - // optional .ColorProto color = 2; + // optional int32 color = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) { parse_color: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_color())); + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( + input, &color_))); + set_has_color(); } else { goto handle_uninterpreted; } - if (input->ExpectTag(26)) goto parse_stroke_color; + if (input->ExpectTag(24)) goto parse_stroke_color; break; } - // optional .ColorProto stroke_color = 3; + // optional int32 stroke_color = 3; case 3: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) { parse_stroke_color: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_stroke_color())); + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( + input, &stroke_color_))); + set_has_stroke_color(); } else { goto handle_uninterpreted; } @@ -1144,7 +1418,8 @@ bool CaptionRuleProto::MergePartialFromCodedStream( ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { return true; } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); break; } } @@ -1160,18 +1435,44 @@ void CaptionRuleProto::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->height(), output); } - // optional .ColorProto color = 2; + // optional int32 color = 2; if (has_color()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 2, this->color(), output); + ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->color(), output); } - // optional .ColorProto stroke_color = 3; + // optional int32 stroke_color = 3; if (has_stroke_color()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 3, this->stroke_color(), output); + ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->stroke_color(), output); } + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } +} + +::google::protobuf::uint8* CaptionRuleProto::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // required int32 height = 1; + if (has_height()) { + target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->height(), target); + } + + // optional int32 color = 2; + if (has_color()) { + target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->color(), target); + } + + // optional int32 stroke_color = 3; + if (has_stroke_color()) { + target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(3, this->stroke_color(), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + return target; } int CaptionRuleProto::ByteSize() const { @@ -1185,30 +1486,42 @@ int CaptionRuleProto::ByteSize() const { this->height()); } - // optional .ColorProto color = 2; + // optional int32 color = 2; if (has_color()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + ::google::protobuf::internal::WireFormatLite::Int32Size( this->color()); } - // optional .ColorProto stroke_color = 3; + // optional int32 stroke_color = 3; if (has_stroke_color()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + ::google::protobuf::internal::WireFormatLite::Int32Size( this->stroke_color()); } } + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = total_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } -void CaptionRuleProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); +void CaptionRuleProto::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const CaptionRuleProto* source = + ::google::protobuf::internal::dynamic_cast_if_available( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } } void CaptionRuleProto::MergeFrom(const CaptionRuleProto& from) { @@ -1218,12 +1531,19 @@ void CaptionRuleProto::MergeFrom(const CaptionRuleProto& from) { set_height(from.height()); } if (from.has_color()) { - mutable_color()->::ColorProto::MergeFrom(from.color()); + set_color(from.color()); } if (from.has_stroke_color()) { - mutable_stroke_color()->::ColorProto::MergeFrom(from.stroke_color()); + set_stroke_color(from.stroke_color()); } } + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void CaptionRuleProto::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); } void CaptionRuleProto::CopyFrom(const CaptionRuleProto& from) { @@ -1235,12 +1555,6 @@ void CaptionRuleProto::CopyFrom(const CaptionRuleProto& from) { bool CaptionRuleProto::IsInitialized() const { if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false; - if (has_color()) { - if (!this->color().IsInitialized()) return false; - } - if (has_stroke_color()) { - if (!this->stroke_color().IsInitialized()) return false; - } return true; } @@ -1250,43 +1564,47 @@ void CaptionRuleProto::Swap(CaptionRuleProto* other) { std::swap(color_, other->color_); std::swap(stroke_color_, other->stroke_color_); std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); } } -::std::string CaptionRuleProto::GetTypeName() const { - return "CaptionRuleProto"; +::google::protobuf::Metadata CaptionRuleProto::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = CaptionRuleProto_descriptor_; + metadata.reflection = CaptionRuleProto_reflection_; + return metadata; } // =================================================================== #ifndef _MSC_VER -const int CircleRuleProto::kRadFieldNumber; +const int CircleRuleProto::kRadiusFieldNumber; const int CircleRuleProto::kColorFieldNumber; const int CircleRuleProto::kBorderFieldNumber; #endif // !_MSC_VER CircleRuleProto::CircleRuleProto() - : ::google::protobuf::MessageLite() { + : ::google::protobuf::Message() { SharedCtor(); } void CircleRuleProto::InitAsDefaultInstance() { - color_ = const_cast< ::ColorProto*>(&::ColorProto::default_instance()); border_ = const_cast< ::LineRuleProto*>(&::LineRuleProto::default_instance()); } CircleRuleProto::CircleRuleProto(const CircleRuleProto& from) - : ::google::protobuf::MessageLite() { + : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); } void CircleRuleProto::SharedCtor() { _cached_size_ = 0; - rad_ = 0; - color_ = NULL; + radius_ = 0; + color_ = 0; border_ = NULL; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -1297,7 +1615,6 @@ CircleRuleProto::~CircleRuleProto() { void CircleRuleProto::SharedDtor() { if (this != default_instance_) { - delete color_; delete border_; } } @@ -1307,6 +1624,11 @@ void CircleRuleProto::SetCachedSize(int size) const { _cached_size_ = size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); } +const ::google::protobuf::Descriptor* CircleRuleProto::descriptor() { + protobuf_AssignDescriptorsOnce(); + return CircleRuleProto_descriptor_; +} + const CircleRuleProto& CircleRuleProto::default_instance() { if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; } @@ -1319,15 +1641,14 @@ CircleRuleProto* CircleRuleProto::New() const { void CircleRuleProto::Clear() { if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - rad_ = 0; - if (has_color()) { - if (color_ != NULL) color_->::ColorProto::Clear(); - } + radius_ = 0; + color_ = 0; if (has_border()) { if (border_ != NULL) border_->::LineRuleProto::Clear(); } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); } bool CircleRuleProto::MergePartialFromCodedStream( @@ -1336,28 +1657,30 @@ bool CircleRuleProto::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; while ((tag = input->ReadTag()) != 0) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required double rad = 1; + // required double radius = 1; case 1: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) { DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>( - input, &rad_))); - set_has_rad(); + input, &radius_))); + set_has_radius(); } else { goto handle_uninterpreted; } - if (input->ExpectTag(18)) goto parse_color; + if (input->ExpectTag(16)) goto parse_color; break; } - // required .ColorProto color = 2; + // required int32 color = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) { parse_color: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_color())); + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( + input, &color_))); + set_has_color(); } else { goto handle_uninterpreted; } @@ -1385,7 +1708,8 @@ bool CircleRuleProto::MergePartialFromCodedStream( ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { return true; } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); break; } } @@ -1396,38 +1720,67 @@ bool CircleRuleProto::MergePartialFromCodedStream( void CircleRuleProto::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // required double rad = 1; - if (has_rad()) { - ::google::protobuf::internal::WireFormatLite::WriteDouble(1, this->rad(), output); + // required double radius = 1; + if (has_radius()) { + ::google::protobuf::internal::WireFormatLite::WriteDouble(1, this->radius(), output); } - // required .ColorProto color = 2; + // required int32 color = 2; if (has_color()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 2, this->color(), output); + ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->color(), output); } // optional .LineRuleProto border = 3; if (has_border()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->border(), output); } + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } +} + +::google::protobuf::uint8* CircleRuleProto::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // required double radius = 1; + if (has_radius()) { + target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(1, this->radius(), target); + } + + // required int32 color = 2; + if (has_color()) { + target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->color(), target); + } + + // optional .LineRuleProto border = 3; + if (has_border()) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 3, this->border(), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + return target; } int CircleRuleProto::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required double rad = 1; - if (has_rad()) { + // required double radius = 1; + if (has_radius()) { total_size += 1 + 8; } - // required .ColorProto color = 2; + // required int32 color = 2; if (has_color()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + ::google::protobuf::internal::WireFormatLite::Int32Size( this->color()); } @@ -1439,30 +1792,49 @@ int CircleRuleProto::ByteSize() const { } } + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = total_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } -void CircleRuleProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); +void CircleRuleProto::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const CircleRuleProto* source = + ::google::protobuf::internal::dynamic_cast_if_available( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } } void CircleRuleProto::MergeFrom(const CircleRuleProto& from) { GOOGLE_CHECK_NE(&from, this); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { - if (from.has_rad()) { - set_rad(from.rad()); + if (from.has_radius()) { + set_radius(from.radius()); } if (from.has_color()) { - mutable_color()->::ColorProto::MergeFrom(from.color()); + set_color(from.color()); } if (from.has_border()) { mutable_border()->::LineRuleProto::MergeFrom(from.border()); } } + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void CircleRuleProto::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); } void CircleRuleProto::CopyFrom(const CircleRuleProto& from) { @@ -1474,9 +1846,6 @@ void CircleRuleProto::CopyFrom(const CircleRuleProto& from) { bool CircleRuleProto::IsInitialized() const { if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false; - if (has_color()) { - if (!this->color().IsInitialized()) return false; - } if (has_border()) { if (!this->border().IsInitialized()) return false; } @@ -1485,16 +1854,21 @@ bool CircleRuleProto::IsInitialized() const { void CircleRuleProto::Swap(CircleRuleProto* other) { if (other != this) { - std::swap(rad_, other->rad_); + std::swap(radius_, other->radius_); std::swap(color_, other->color_); std::swap(border_, other->border_); std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); } } -::std::string CircleRuleProto::GetTypeName() const { - return "CircleRuleProto"; +::google::protobuf::Metadata CircleRuleProto::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = CircleRuleProto_descriptor_; + metadata.reflection = CircleRuleProto_reflection_; + return metadata; } @@ -1504,25 +1878,25 @@ void CircleRuleProto::Swap(CircleRuleProto* other) { const int DrawElementProto::kScaleFieldNumber; const int DrawElementProto::kLinesFieldNumber; const int DrawElementProto::kAreaFieldNumber; -const int DrawElementProto::kSymFieldNumber; -const int DrawElementProto::kCapFieldNumber; -const int DrawElementProto::kCirFieldNumber; +const int DrawElementProto::kSymbolFieldNumber; +const int DrawElementProto::kCaptionFieldNumber; +const int DrawElementProto::kCircleFieldNumber; #endif // !_MSC_VER DrawElementProto::DrawElementProto() - : ::google::protobuf::MessageLite() { + : ::google::protobuf::Message() { SharedCtor(); } void DrawElementProto::InitAsDefaultInstance() { area_ = const_cast< ::AreaRuleProto*>(&::AreaRuleProto::default_instance()); - sym_ = const_cast< ::SymbolRuleProto*>(&::SymbolRuleProto::default_instance()); - cap_ = const_cast< ::CaptionRuleProto*>(&::CaptionRuleProto::default_instance()); - cir_ = const_cast< ::CircleRuleProto*>(&::CircleRuleProto::default_instance()); + symbol_ = const_cast< ::SymbolRuleProto*>(&::SymbolRuleProto::default_instance()); + caption_ = const_cast< ::CaptionRuleProto*>(&::CaptionRuleProto::default_instance()); + circle_ = const_cast< ::CircleRuleProto*>(&::CircleRuleProto::default_instance()); } DrawElementProto::DrawElementProto(const DrawElementProto& from) - : ::google::protobuf::MessageLite() { + : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); } @@ -1531,9 +1905,9 @@ void DrawElementProto::SharedCtor() { _cached_size_ = 0; scale_ = 0; area_ = NULL; - sym_ = NULL; - cap_ = NULL; - cir_ = NULL; + symbol_ = NULL; + caption_ = NULL; + circle_ = NULL; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -1544,9 +1918,9 @@ DrawElementProto::~DrawElementProto() { void DrawElementProto::SharedDtor() { if (this != default_instance_) { delete area_; - delete sym_; - delete cap_; - delete cir_; + delete symbol_; + delete caption_; + delete circle_; } } @@ -1555,6 +1929,11 @@ void DrawElementProto::SetCachedSize(int size) const { _cached_size_ = size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); } +const ::google::protobuf::Descriptor* DrawElementProto::descriptor() { + protobuf_AssignDescriptorsOnce(); + return DrawElementProto_descriptor_; +} + const DrawElementProto& DrawElementProto::default_instance() { if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; } @@ -1571,18 +1950,19 @@ void DrawElementProto::Clear() { if (has_area()) { if (area_ != NULL) area_->::AreaRuleProto::Clear(); } - if (has_sym()) { - if (sym_ != NULL) sym_->::SymbolRuleProto::Clear(); + if (has_symbol()) { + if (symbol_ != NULL) symbol_->::SymbolRuleProto::Clear(); } - if (has_cap()) { - if (cap_ != NULL) cap_->::CaptionRuleProto::Clear(); + if (has_caption()) { + if (caption_ != NULL) caption_->::CaptionRuleProto::Clear(); } - if (has_cir()) { - if (cir_ != NULL) cir_->::CircleRuleProto::Clear(); + if (has_circle()) { + if (circle_ != NULL) circle_->::CircleRuleProto::Clear(); } } lines_.Clear(); ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); } bool DrawElementProto::MergePartialFromCodedStream( @@ -1631,45 +2011,45 @@ bool DrawElementProto::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(34)) goto parse_sym; + if (input->ExpectTag(34)) goto parse_symbol; break; } - // optional .SymbolRuleProto sym = 4; + // optional .SymbolRuleProto symbol = 4; case 4: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { - parse_sym: + parse_symbol: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_sym())); + input, mutable_symbol())); } else { goto handle_uninterpreted; } - if (input->ExpectTag(42)) goto parse_cap; + if (input->ExpectTag(42)) goto parse_caption; break; } - // optional .CaptionRuleProto cap = 5; + // optional .CaptionRuleProto caption = 5; case 5: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { - parse_cap: + parse_caption: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_cap())); + input, mutable_caption())); } else { goto handle_uninterpreted; } - if (input->ExpectTag(50)) goto parse_cir; + if (input->ExpectTag(50)) goto parse_circle; break; } - // optional .CircleRuleProto cir = 6; + // optional .CircleRuleProto circle = 6; case 6: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { - parse_cir: + parse_circle: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_cir())); + input, mutable_circle())); } else { goto handle_uninterpreted; } @@ -1683,7 +2063,8 @@ bool DrawElementProto::MergePartialFromCodedStream( ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { return true; } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); break; } } @@ -1701,34 +2082,87 @@ void DrawElementProto::SerializeWithCachedSizes( // repeated .LineRuleProto lines = 2; for (int i = 0; i < this->lines_size(); i++) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->lines(i), output); } // optional .AreaRuleProto area = 3; if (has_area()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->area(), output); } - // optional .SymbolRuleProto sym = 4; - if (has_sym()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 4, this->sym(), output); + // optional .SymbolRuleProto symbol = 4; + if (has_symbol()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 4, this->symbol(), output); } - // optional .CaptionRuleProto cap = 5; - if (has_cap()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 5, this->cap(), output); + // optional .CaptionRuleProto caption = 5; + if (has_caption()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 5, this->caption(), output); } - // optional .CircleRuleProto cir = 6; - if (has_cir()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 6, this->cir(), output); + // optional .CircleRuleProto circle = 6; + if (has_circle()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 6, this->circle(), output); } + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } +} + +::google::protobuf::uint8* DrawElementProto::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // required int32 scale = 1; + if (has_scale()) { + target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->scale(), target); + } + + // repeated .LineRuleProto lines = 2; + for (int i = 0; i < this->lines_size(); i++) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 2, this->lines(i), target); + } + + // optional .AreaRuleProto area = 3; + if (has_area()) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 3, this->area(), target); + } + + // optional .SymbolRuleProto symbol = 4; + if (has_symbol()) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 4, this->symbol(), target); + } + + // optional .CaptionRuleProto caption = 5; + if (has_caption()) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 5, this->caption(), target); + } + + // optional .CircleRuleProto circle = 6; + if (has_circle()) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 6, this->circle(), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + return target; } int DrawElementProto::ByteSize() const { @@ -1749,25 +2183,25 @@ int DrawElementProto::ByteSize() const { this->area()); } - // optional .SymbolRuleProto sym = 4; - if (has_sym()) { + // optional .SymbolRuleProto symbol = 4; + if (has_symbol()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->sym()); + this->symbol()); } - // optional .CaptionRuleProto cap = 5; - if (has_cap()) { + // optional .CaptionRuleProto caption = 5; + if (has_caption()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->cap()); + this->caption()); } - // optional .CircleRuleProto cir = 6; - if (has_cir()) { + // optional .CircleRuleProto circle = 6; + if (has_circle()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->cir()); + this->circle()); } } @@ -1779,15 +2213,27 @@ int DrawElementProto::ByteSize() const { this->lines(i)); } + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = total_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } -void DrawElementProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); +void DrawElementProto::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const DrawElementProto* source = + ::google::protobuf::internal::dynamic_cast_if_available( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } } void DrawElementProto::MergeFrom(const DrawElementProto& from) { @@ -1800,16 +2246,23 @@ void DrawElementProto::MergeFrom(const DrawElementProto& from) { if (from.has_area()) { mutable_area()->::AreaRuleProto::MergeFrom(from.area()); } - if (from.has_sym()) { - mutable_sym()->::SymbolRuleProto::MergeFrom(from.sym()); + if (from.has_symbol()) { + mutable_symbol()->::SymbolRuleProto::MergeFrom(from.symbol()); } - if (from.has_cap()) { - mutable_cap()->::CaptionRuleProto::MergeFrom(from.cap()); + if (from.has_caption()) { + mutable_caption()->::CaptionRuleProto::MergeFrom(from.caption()); } - if (from.has_cir()) { - mutable_cir()->::CircleRuleProto::MergeFrom(from.cir()); + if (from.has_circle()) { + mutable_circle()->::CircleRuleProto::MergeFrom(from.circle()); } } + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void DrawElementProto::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); } void DrawElementProto::CopyFrom(const DrawElementProto& from) { @@ -1827,14 +2280,14 @@ bool DrawElementProto::IsInitialized() const { if (has_area()) { if (!this->area().IsInitialized()) return false; } - if (has_sym()) { - if (!this->sym().IsInitialized()) return false; + if (has_symbol()) { + if (!this->symbol().IsInitialized()) return false; } - if (has_cap()) { - if (!this->cap().IsInitialized()) return false; + if (has_caption()) { + if (!this->caption().IsInitialized()) return false; } - if (has_cir()) { - if (!this->cir().IsInitialized()) return false; + if (has_circle()) { + if (!this->circle().IsInitialized()) return false; } return true; } @@ -1844,16 +2297,21 @@ void DrawElementProto::Swap(DrawElementProto* other) { std::swap(scale_, other->scale_); lines_.Swap(&other->lines_); std::swap(area_, other->area_); - std::swap(sym_, other->sym_); - std::swap(cap_, other->cap_); - std::swap(cir_, other->cir_); + std::swap(symbol_, other->symbol_); + std::swap(caption_, other->caption_); + std::swap(circle_, other->circle_); std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); } } -::std::string DrawElementProto::GetTypeName() const { - return "DrawElementProto"; +::google::protobuf::Metadata DrawElementProto::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = DrawElementProto_descriptor_; + metadata.reflection = DrawElementProto_reflection_; + return metadata; } @@ -1861,11 +2319,11 @@ void DrawElementProto::Swap(DrawElementProto* other) { #ifndef _MSC_VER const int ClassifElementProto::kNameFieldNumber; -const int ClassifElementProto::kLinesFieldNumber; +const int ClassifElementProto::kElementFieldNumber; #endif // !_MSC_VER ClassifElementProto::ClassifElementProto() - : ::google::protobuf::MessageLite() { + : ::google::protobuf::Message() { SharedCtor(); } @@ -1873,7 +2331,7 @@ void ClassifElementProto::InitAsDefaultInstance() { } ClassifElementProto::ClassifElementProto(const ClassifElementProto& from) - : ::google::protobuf::MessageLite() { + : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); } @@ -1901,6 +2359,11 @@ void ClassifElementProto::SetCachedSize(int size) const { _cached_size_ = size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); } +const ::google::protobuf::Descriptor* ClassifElementProto::descriptor() { + protobuf_AssignDescriptorsOnce(); + return ClassifElementProto_descriptor_; +} + const ClassifElementProto& ClassifElementProto::default_instance() { if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; } @@ -1919,8 +2382,9 @@ void ClassifElementProto::Clear() { } } } - lines_.Clear(); + element_.Clear(); ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); } bool ClassifElementProto::MergePartialFromCodedStream( @@ -1935,24 +2399,27 @@ bool ClassifElementProto::MergePartialFromCodedStream( ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); + ::google::protobuf::internal::WireFormat::VerifyUTF8String( + this->name().data(), this->name().length(), + ::google::protobuf::internal::WireFormat::PARSE); } else { goto handle_uninterpreted; } - if (input->ExpectTag(18)) goto parse_lines; + if (input->ExpectTag(18)) goto parse_element; break; } - // repeated .DrawElementProto lines = 2; + // repeated .DrawElementProto element = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { - parse_lines: + parse_element: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, add_lines())); + input, add_element())); } else { goto handle_uninterpreted; } - if (input->ExpectTag(18)) goto parse_lines; + if (input->ExpectTag(18)) goto parse_element; if (input->ExpectAtEnd()) return true; break; } @@ -1963,7 +2430,8 @@ bool ClassifElementProto::MergePartialFromCodedStream( ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { return true; } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); break; } } @@ -1976,16 +2444,49 @@ void ClassifElementProto::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { // required string name = 1; if (has_name()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8String( + this->name().data(), this->name().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE); ::google::protobuf::internal::WireFormatLite::WriteString( 1, this->name(), output); } - // repeated .DrawElementProto lines = 2; - for (int i = 0; i < this->lines_size(); i++) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 2, this->lines(i), output); + // repeated .DrawElementProto element = 2; + for (int i = 0; i < this->element_size(); i++) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 2, this->element(i), output); } + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } +} + +::google::protobuf::uint8* ClassifElementProto::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // required string name = 1; + if (has_name()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8String( + this->name().data(), this->name().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 1, this->name(), target); + } + + // repeated .DrawElementProto element = 2; + for (int i = 0; i < this->element_size(); i++) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 2, this->element(i), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + return target; } int ClassifElementProto::ByteSize() const { @@ -2000,33 +2501,52 @@ int ClassifElementProto::ByteSize() const { } } - // repeated .DrawElementProto lines = 2; - total_size += 1 * this->lines_size(); - for (int i = 0; i < this->lines_size(); i++) { + // repeated .DrawElementProto element = 2; + total_size += 1 * this->element_size(); + for (int i = 0; i < this->element_size(); i++) { total_size += ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->lines(i)); + this->element(i)); } + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = total_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } -void ClassifElementProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); +void ClassifElementProto::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const ClassifElementProto* source = + ::google::protobuf::internal::dynamic_cast_if_available( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } } void ClassifElementProto::MergeFrom(const ClassifElementProto& from) { GOOGLE_CHECK_NE(&from, this); - lines_.MergeFrom(from.lines_); + element_.MergeFrom(from.element_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_name()) { set_name(from.name()); } } + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void ClassifElementProto::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); } void ClassifElementProto::CopyFrom(const ClassifElementProto& from) { @@ -2038,8 +2558,8 @@ void ClassifElementProto::CopyFrom(const ClassifElementProto& from) { bool ClassifElementProto::IsInitialized() const { if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false; - for (int i = 0; i < lines_size(); i++) { - if (!this->lines(i).IsInitialized()) return false; + for (int i = 0; i < element_size(); i++) { + if (!this->element(i).IsInitialized()) return false; } return true; } @@ -2047,14 +2567,19 @@ bool ClassifElementProto::IsInitialized() const { void ClassifElementProto::Swap(ClassifElementProto* other) { if (other != this) { std::swap(name_, other->name_); - lines_.Swap(&other->lines_); + element_.Swap(&other->element_); std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); } } -::std::string ClassifElementProto::GetTypeName() const { - return "ClassifElementProto"; +::google::protobuf::Metadata ClassifElementProto::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = ClassifElementProto_descriptor_; + metadata.reflection = ClassifElementProto_reflection_; + return metadata; } @@ -2065,7 +2590,7 @@ const int ContainerProto::kContFieldNumber; #endif // !_MSC_VER ContainerProto::ContainerProto() - : ::google::protobuf::MessageLite() { + : ::google::protobuf::Message() { SharedCtor(); } @@ -2073,7 +2598,7 @@ void ContainerProto::InitAsDefaultInstance() { } ContainerProto::ContainerProto(const ContainerProto& from) - : ::google::protobuf::MessageLite() { + : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); } @@ -2097,6 +2622,11 @@ void ContainerProto::SetCachedSize(int size) const { _cached_size_ = size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); } +const ::google::protobuf::Descriptor* ContainerProto::descriptor() { + protobuf_AssignDescriptorsOnce(); + return ContainerProto_descriptor_; +} + const ContainerProto& ContainerProto::default_instance() { if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; } @@ -2110,6 +2640,7 @@ ContainerProto* ContainerProto::New() const { void ContainerProto::Clear() { cont_.Clear(); ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); } bool ContainerProto::MergePartialFromCodedStream( @@ -2139,7 +2670,8 @@ bool ContainerProto::MergePartialFromCodedStream( ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { return true; } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); break; } } @@ -2152,10 +2684,30 @@ void ContainerProto::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { // repeated .ClassifElementProto cont = 1; for (int i = 0; i < this->cont_size(); i++) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->cont(i), output); } + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } +} + +::google::protobuf::uint8* ContainerProto::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // repeated .ClassifElementProto cont = 1; + for (int i = 0; i < this->cont_size(); i++) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 1, this->cont(i), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + return target; } int ContainerProto::ByteSize() const { @@ -2169,20 +2721,39 @@ int ContainerProto::ByteSize() const { this->cont(i)); } + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = total_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } -void ContainerProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); +void ContainerProto::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const ContainerProto* source = + ::google::protobuf::internal::dynamic_cast_if_available( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } } void ContainerProto::MergeFrom(const ContainerProto& from) { GOOGLE_CHECK_NE(&from, this); cont_.MergeFrom(from.cont_); + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void ContainerProto::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); } void ContainerProto::CopyFrom(const ContainerProto& from) { @@ -2203,12 +2774,17 @@ void ContainerProto::Swap(ContainerProto* other) { if (other != this) { cont_.Swap(&other->cont_); std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); } } -::std::string ContainerProto::GetTypeName() const { - return "ContainerProto"; +::google::protobuf::Metadata ContainerProto::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = ContainerProto_descriptor_; + metadata.reflection = ContainerProto_reflection_; + return metadata; } diff --git a/indexer/drules_struct.pb.h b/indexer/drules_struct.pb.h index c342e371ce..b13710b6c1 100644 --- a/indexer/drules_struct.pb.h +++ b/indexer/drules_struct.pb.h @@ -22,6 +22,7 @@ #include #include #include +#include // @@protoc_insertion_point(includes) // Internal implementation detail -- do not call these. @@ -29,7 +30,6 @@ void protobuf_AddDesc_drules_5fstruct_2eproto(); void protobuf_AssignDesc_drules_5fstruct_2eproto(); void protobuf_ShutdownFile_drules_5fstruct_2eproto(); -class ColorProto; class DashDotProto; class LineRuleProto; class AreaRuleProto; @@ -42,86 +42,7 @@ class ContainerProto; // =================================================================== -class ColorProto : public ::google::protobuf::MessageLite { - public: - ColorProto(); - virtual ~ColorProto(); - - ColorProto(const ColorProto& from); - - inline ColorProto& operator=(const ColorProto& from) { - CopyFrom(from); - return *this; - } - - static const ColorProto& default_instance(); - - void Swap(ColorProto* other); - - // implements Message ---------------------------------------------- - - ColorProto* New() const; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); - void CopyFrom(const ColorProto& from); - void MergeFrom(const ColorProto& from); - void Clear(); - bool IsInitialized() const; - - int ByteSize() const; - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input); - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const; - int GetCachedSize() const { return _cached_size_; } - private: - void SharedCtor(); - void SharedDtor(); - void SetCachedSize(int size) const; - public: - - ::std::string GetTypeName() const; - - // nested types ---------------------------------------------------- - - // accessors ------------------------------------------------------- - - // required int32 color = 1; - inline bool has_color() const; - inline void clear_color(); - static const int kColorFieldNumber = 1; - inline ::google::protobuf::int32 color() const; - inline void set_color(::google::protobuf::int32 value); - - // optional int32 opacity = 2; - inline bool has_opacity() const; - inline void clear_opacity(); - static const int kOpacityFieldNumber = 2; - inline ::google::protobuf::int32 opacity() const; - inline void set_opacity(::google::protobuf::int32 value); - - // @@protoc_insertion_point(class_scope:ColorProto) - private: - inline void set_has_color(); - inline void clear_has_color(); - inline void set_has_opacity(); - inline void clear_has_opacity(); - - ::google::protobuf::int32 color_; - ::google::protobuf::int32 opacity_; - - mutable int _cached_size_; - ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32]; - - friend void protobuf_AddDesc_drules_5fstruct_2eproto(); - friend void protobuf_AssignDesc_drules_5fstruct_2eproto(); - friend void protobuf_ShutdownFile_drules_5fstruct_2eproto(); - - void InitAsDefaultInstance(); - static ColorProto* default_instance_; -}; -// ------------------------------------------------------------------- - -class DashDotProto : public ::google::protobuf::MessageLite { +class DashDotProto : public ::google::protobuf::Message { public: DashDotProto(); virtual ~DashDotProto(); @@ -133,6 +54,15 @@ class DashDotProto : public ::google::protobuf::MessageLite { return *this; } + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); static const DashDotProto& default_instance(); void Swap(DashDotProto* other); @@ -140,7 +70,8 @@ class DashDotProto : public ::google::protobuf::MessageLite { // implements Message ---------------------------------------------- DashDotProto* New() const; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); void CopyFrom(const DashDotProto& from); void MergeFrom(const DashDotProto& from); void Clear(); @@ -151,6 +82,7 @@ class DashDotProto : public ::google::protobuf::MessageLite { ::google::protobuf::io::CodedInputStream* input); void SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; int GetCachedSize() const { return _cached_size_; } private: void SharedCtor(); @@ -158,7 +90,7 @@ class DashDotProto : public ::google::protobuf::MessageLite { void SetCachedSize(int size) const; public: - ::std::string GetTypeName() const; + ::google::protobuf::Metadata GetMetadata() const; // nested types ---------------------------------------------------- @@ -179,6 +111,8 @@ class DashDotProto : public ::google::protobuf::MessageLite { // @@protoc_insertion_point(class_scope:DashDotProto) private: + ::google::protobuf::UnknownFieldSet _unknown_fields_; + ::google::protobuf::RepeatedField< double > dd_; mutable int _cached_size_; @@ -193,7 +127,7 @@ class DashDotProto : public ::google::protobuf::MessageLite { }; // ------------------------------------------------------------------- -class LineRuleProto : public ::google::protobuf::MessageLite { +class LineRuleProto : public ::google::protobuf::Message { public: LineRuleProto(); virtual ~LineRuleProto(); @@ -205,6 +139,15 @@ class LineRuleProto : public ::google::protobuf::MessageLite { return *this; } + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); static const LineRuleProto& default_instance(); void Swap(LineRuleProto* other); @@ -212,7 +155,8 @@ class LineRuleProto : public ::google::protobuf::MessageLite { // implements Message ---------------------------------------------- LineRuleProto* New() const; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); void CopyFrom(const LineRuleProto& from); void MergeFrom(const LineRuleProto& from); void Clear(); @@ -223,6 +167,7 @@ class LineRuleProto : public ::google::protobuf::MessageLite { ::google::protobuf::io::CodedInputStream* input); void SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; int GetCachedSize() const { return _cached_size_; } private: void SharedCtor(); @@ -230,7 +175,7 @@ class LineRuleProto : public ::google::protobuf::MessageLite { void SetCachedSize(int size) const; public: - ::std::string GetTypeName() const; + ::google::protobuf::Metadata GetMetadata() const; // nested types ---------------------------------------------------- @@ -243,13 +188,12 @@ class LineRuleProto : public ::google::protobuf::MessageLite { inline double width() const; inline void set_width(double value); - // required .ColorProto color = 2; + // required int32 color = 2; inline bool has_color() const; inline void clear_color(); static const int kColorFieldNumber = 2; - inline const ::ColorProto& color() const; - inline ::ColorProto* mutable_color(); - inline ::ColorProto* release_color(); + inline ::google::protobuf::int32 color() const; + inline void set_color(::google::protobuf::int32 value); // optional .DashDotProto dashdot = 3; inline bool has_dashdot() const; @@ -268,9 +212,11 @@ class LineRuleProto : public ::google::protobuf::MessageLite { inline void set_has_dashdot(); inline void clear_has_dashdot(); + ::google::protobuf::UnknownFieldSet _unknown_fields_; + double width_; - ::ColorProto* color_; ::DashDotProto* dashdot_; + ::google::protobuf::int32 color_; mutable int _cached_size_; ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32]; @@ -284,7 +230,7 @@ class LineRuleProto : public ::google::protobuf::MessageLite { }; // ------------------------------------------------------------------- -class AreaRuleProto : public ::google::protobuf::MessageLite { +class AreaRuleProto : public ::google::protobuf::Message { public: AreaRuleProto(); virtual ~AreaRuleProto(); @@ -296,6 +242,15 @@ class AreaRuleProto : public ::google::protobuf::MessageLite { return *this; } + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); static const AreaRuleProto& default_instance(); void Swap(AreaRuleProto* other); @@ -303,7 +258,8 @@ class AreaRuleProto : public ::google::protobuf::MessageLite { // implements Message ---------------------------------------------- AreaRuleProto* New() const; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); void CopyFrom(const AreaRuleProto& from); void MergeFrom(const AreaRuleProto& from); void Clear(); @@ -314,6 +270,7 @@ class AreaRuleProto : public ::google::protobuf::MessageLite { ::google::protobuf::io::CodedInputStream* input); void SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; int GetCachedSize() const { return _cached_size_; } private: void SharedCtor(); @@ -321,19 +278,18 @@ class AreaRuleProto : public ::google::protobuf::MessageLite { void SetCachedSize(int size) const; public: - ::std::string GetTypeName() const; + ::google::protobuf::Metadata GetMetadata() const; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- - // required .ColorProto color = 1; + // required int32 color = 1; inline bool has_color() const; inline void clear_color(); static const int kColorFieldNumber = 1; - inline const ::ColorProto& color() const; - inline ::ColorProto* mutable_color(); - inline ::ColorProto* release_color(); + inline ::google::protobuf::int32 color() const; + inline void set_color(::google::protobuf::int32 value); // optional .LineRuleProto border = 2; inline bool has_border() const; @@ -350,8 +306,10 @@ class AreaRuleProto : public ::google::protobuf::MessageLite { inline void set_has_border(); inline void clear_has_border(); - ::ColorProto* color_; + ::google::protobuf::UnknownFieldSet _unknown_fields_; + ::LineRuleProto* border_; + ::google::protobuf::int32 color_; mutable int _cached_size_; ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32]; @@ -365,7 +323,7 @@ class AreaRuleProto : public ::google::protobuf::MessageLite { }; // ------------------------------------------------------------------- -class SymbolRuleProto : public ::google::protobuf::MessageLite { +class SymbolRuleProto : public ::google::protobuf::Message { public: SymbolRuleProto(); virtual ~SymbolRuleProto(); @@ -377,6 +335,15 @@ class SymbolRuleProto : public ::google::protobuf::MessageLite { return *this; } + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); static const SymbolRuleProto& default_instance(); void Swap(SymbolRuleProto* other); @@ -384,7 +351,8 @@ class SymbolRuleProto : public ::google::protobuf::MessageLite { // implements Message ---------------------------------------------- SymbolRuleProto* New() const; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); void CopyFrom(const SymbolRuleProto& from); void MergeFrom(const SymbolRuleProto& from); void Clear(); @@ -395,6 +363,7 @@ class SymbolRuleProto : public ::google::protobuf::MessageLite { ::google::protobuf::io::CodedInputStream* input); void SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; int GetCachedSize() const { return _cached_size_; } private: void SharedCtor(); @@ -402,7 +371,7 @@ class SymbolRuleProto : public ::google::protobuf::MessageLite { void SetCachedSize(int size) const; public: - ::std::string GetTypeName() const; + ::google::protobuf::Metadata GetMetadata() const; // nested types ---------------------------------------------------- @@ -424,6 +393,8 @@ class SymbolRuleProto : public ::google::protobuf::MessageLite { inline void set_has_name(); inline void clear_has_name(); + ::google::protobuf::UnknownFieldSet _unknown_fields_; + ::std::string* name_; mutable int _cached_size_; @@ -438,7 +409,7 @@ class SymbolRuleProto : public ::google::protobuf::MessageLite { }; // ------------------------------------------------------------------- -class CaptionRuleProto : public ::google::protobuf::MessageLite { +class CaptionRuleProto : public ::google::protobuf::Message { public: CaptionRuleProto(); virtual ~CaptionRuleProto(); @@ -450,6 +421,15 @@ class CaptionRuleProto : public ::google::protobuf::MessageLite { return *this; } + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); static const CaptionRuleProto& default_instance(); void Swap(CaptionRuleProto* other); @@ -457,7 +437,8 @@ class CaptionRuleProto : public ::google::protobuf::MessageLite { // implements Message ---------------------------------------------- CaptionRuleProto* New() const; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); void CopyFrom(const CaptionRuleProto& from); void MergeFrom(const CaptionRuleProto& from); void Clear(); @@ -468,6 +449,7 @@ class CaptionRuleProto : public ::google::protobuf::MessageLite { ::google::protobuf::io::CodedInputStream* input); void SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; int GetCachedSize() const { return _cached_size_; } private: void SharedCtor(); @@ -475,7 +457,7 @@ class CaptionRuleProto : public ::google::protobuf::MessageLite { void SetCachedSize(int size) const; public: - ::std::string GetTypeName() const; + ::google::protobuf::Metadata GetMetadata() const; // nested types ---------------------------------------------------- @@ -488,21 +470,19 @@ class CaptionRuleProto : public ::google::protobuf::MessageLite { inline ::google::protobuf::int32 height() const; inline void set_height(::google::protobuf::int32 value); - // optional .ColorProto color = 2; + // optional int32 color = 2; inline bool has_color() const; inline void clear_color(); static const int kColorFieldNumber = 2; - inline const ::ColorProto& color() const; - inline ::ColorProto* mutable_color(); - inline ::ColorProto* release_color(); + inline ::google::protobuf::int32 color() const; + inline void set_color(::google::protobuf::int32 value); - // optional .ColorProto stroke_color = 3; + // optional int32 stroke_color = 3; inline bool has_stroke_color() const; inline void clear_stroke_color(); static const int kStrokeColorFieldNumber = 3; - inline const ::ColorProto& stroke_color() const; - inline ::ColorProto* mutable_stroke_color(); - inline ::ColorProto* release_stroke_color(); + inline ::google::protobuf::int32 stroke_color() const; + inline void set_stroke_color(::google::protobuf::int32 value); // @@protoc_insertion_point(class_scope:CaptionRuleProto) private: @@ -513,9 +493,11 @@ class CaptionRuleProto : public ::google::protobuf::MessageLite { inline void set_has_stroke_color(); inline void clear_has_stroke_color(); - ::ColorProto* color_; - ::ColorProto* stroke_color_; + ::google::protobuf::UnknownFieldSet _unknown_fields_; + ::google::protobuf::int32 height_; + ::google::protobuf::int32 color_; + ::google::protobuf::int32 stroke_color_; mutable int _cached_size_; ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32]; @@ -529,7 +511,7 @@ class CaptionRuleProto : public ::google::protobuf::MessageLite { }; // ------------------------------------------------------------------- -class CircleRuleProto : public ::google::protobuf::MessageLite { +class CircleRuleProto : public ::google::protobuf::Message { public: CircleRuleProto(); virtual ~CircleRuleProto(); @@ -541,6 +523,15 @@ class CircleRuleProto : public ::google::protobuf::MessageLite { return *this; } + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); static const CircleRuleProto& default_instance(); void Swap(CircleRuleProto* other); @@ -548,7 +539,8 @@ class CircleRuleProto : public ::google::protobuf::MessageLite { // implements Message ---------------------------------------------- CircleRuleProto* New() const; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); void CopyFrom(const CircleRuleProto& from); void MergeFrom(const CircleRuleProto& from); void Clear(); @@ -559,6 +551,7 @@ class CircleRuleProto : public ::google::protobuf::MessageLite { ::google::protobuf::io::CodedInputStream* input); void SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; int GetCachedSize() const { return _cached_size_; } private: void SharedCtor(); @@ -566,26 +559,25 @@ class CircleRuleProto : public ::google::protobuf::MessageLite { void SetCachedSize(int size) const; public: - ::std::string GetTypeName() const; + ::google::protobuf::Metadata GetMetadata() const; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- - // required double rad = 1; - inline bool has_rad() const; - inline void clear_rad(); - static const int kRadFieldNumber = 1; - inline double rad() const; - inline void set_rad(double value); + // required double radius = 1; + inline bool has_radius() const; + inline void clear_radius(); + static const int kRadiusFieldNumber = 1; + inline double radius() const; + inline void set_radius(double value); - // required .ColorProto color = 2; + // required int32 color = 2; inline bool has_color() const; inline void clear_color(); static const int kColorFieldNumber = 2; - inline const ::ColorProto& color() const; - inline ::ColorProto* mutable_color(); - inline ::ColorProto* release_color(); + inline ::google::protobuf::int32 color() const; + inline void set_color(::google::protobuf::int32 value); // optional .LineRuleProto border = 3; inline bool has_border() const; @@ -597,16 +589,18 @@ class CircleRuleProto : public ::google::protobuf::MessageLite { // @@protoc_insertion_point(class_scope:CircleRuleProto) private: - inline void set_has_rad(); - inline void clear_has_rad(); + inline void set_has_radius(); + inline void clear_has_radius(); inline void set_has_color(); inline void clear_has_color(); inline void set_has_border(); inline void clear_has_border(); - double rad_; - ::ColorProto* color_; + ::google::protobuf::UnknownFieldSet _unknown_fields_; + + double radius_; ::LineRuleProto* border_; + ::google::protobuf::int32 color_; mutable int _cached_size_; ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32]; @@ -620,7 +614,7 @@ class CircleRuleProto : public ::google::protobuf::MessageLite { }; // ------------------------------------------------------------------- -class DrawElementProto : public ::google::protobuf::MessageLite { +class DrawElementProto : public ::google::protobuf::Message { public: DrawElementProto(); virtual ~DrawElementProto(); @@ -632,6 +626,15 @@ class DrawElementProto : public ::google::protobuf::MessageLite { return *this; } + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); static const DrawElementProto& default_instance(); void Swap(DrawElementProto* other); @@ -639,7 +642,8 @@ class DrawElementProto : public ::google::protobuf::MessageLite { // implements Message ---------------------------------------------- DrawElementProto* New() const; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); void CopyFrom(const DrawElementProto& from); void MergeFrom(const DrawElementProto& from); void Clear(); @@ -650,6 +654,7 @@ class DrawElementProto : public ::google::protobuf::MessageLite { ::google::protobuf::io::CodedInputStream* input); void SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; int GetCachedSize() const { return _cached_size_; } private: void SharedCtor(); @@ -657,7 +662,7 @@ class DrawElementProto : public ::google::protobuf::MessageLite { void SetCachedSize(int size) const; public: - ::std::string GetTypeName() const; + ::google::protobuf::Metadata GetMetadata() const; // nested types ---------------------------------------------------- @@ -690,29 +695,29 @@ class DrawElementProto : public ::google::protobuf::MessageLite { inline ::AreaRuleProto* mutable_area(); inline ::AreaRuleProto* release_area(); - // optional .SymbolRuleProto sym = 4; - inline bool has_sym() const; - inline void clear_sym(); - static const int kSymFieldNumber = 4; - inline const ::SymbolRuleProto& sym() const; - inline ::SymbolRuleProto* mutable_sym(); - inline ::SymbolRuleProto* release_sym(); + // optional .SymbolRuleProto symbol = 4; + inline bool has_symbol() const; + inline void clear_symbol(); + static const int kSymbolFieldNumber = 4; + inline const ::SymbolRuleProto& symbol() const; + inline ::SymbolRuleProto* mutable_symbol(); + inline ::SymbolRuleProto* release_symbol(); - // optional .CaptionRuleProto cap = 5; - inline bool has_cap() const; - inline void clear_cap(); - static const int kCapFieldNumber = 5; - inline const ::CaptionRuleProto& cap() const; - inline ::CaptionRuleProto* mutable_cap(); - inline ::CaptionRuleProto* release_cap(); + // optional .CaptionRuleProto caption = 5; + inline bool has_caption() const; + inline void clear_caption(); + static const int kCaptionFieldNumber = 5; + inline const ::CaptionRuleProto& caption() const; + inline ::CaptionRuleProto* mutable_caption(); + inline ::CaptionRuleProto* release_caption(); - // optional .CircleRuleProto cir = 6; - inline bool has_cir() const; - inline void clear_cir(); - static const int kCirFieldNumber = 6; - inline const ::CircleRuleProto& cir() const; - inline ::CircleRuleProto* mutable_cir(); - inline ::CircleRuleProto* release_cir(); + // optional .CircleRuleProto circle = 6; + inline bool has_circle() const; + inline void clear_circle(); + static const int kCircleFieldNumber = 6; + inline const ::CircleRuleProto& circle() const; + inline ::CircleRuleProto* mutable_circle(); + inline ::CircleRuleProto* release_circle(); // @@protoc_insertion_point(class_scope:DrawElementProto) private: @@ -720,18 +725,20 @@ class DrawElementProto : public ::google::protobuf::MessageLite { inline void clear_has_scale(); inline void set_has_area(); inline void clear_has_area(); - inline void set_has_sym(); - inline void clear_has_sym(); - inline void set_has_cap(); - inline void clear_has_cap(); - inline void set_has_cir(); - inline void clear_has_cir(); + inline void set_has_symbol(); + inline void clear_has_symbol(); + inline void set_has_caption(); + inline void clear_has_caption(); + inline void set_has_circle(); + inline void clear_has_circle(); + + ::google::protobuf::UnknownFieldSet _unknown_fields_; ::google::protobuf::RepeatedPtrField< ::LineRuleProto > lines_; ::AreaRuleProto* area_; - ::SymbolRuleProto* sym_; - ::CaptionRuleProto* cap_; - ::CircleRuleProto* cir_; + ::SymbolRuleProto* symbol_; + ::CaptionRuleProto* caption_; + ::CircleRuleProto* circle_; ::google::protobuf::int32 scale_; mutable int _cached_size_; @@ -746,7 +753,7 @@ class DrawElementProto : public ::google::protobuf::MessageLite { }; // ------------------------------------------------------------------- -class ClassifElementProto : public ::google::protobuf::MessageLite { +class ClassifElementProto : public ::google::protobuf::Message { public: ClassifElementProto(); virtual ~ClassifElementProto(); @@ -758,6 +765,15 @@ class ClassifElementProto : public ::google::protobuf::MessageLite { return *this; } + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); static const ClassifElementProto& default_instance(); void Swap(ClassifElementProto* other); @@ -765,7 +781,8 @@ class ClassifElementProto : public ::google::protobuf::MessageLite { // implements Message ---------------------------------------------- ClassifElementProto* New() const; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); void CopyFrom(const ClassifElementProto& from); void MergeFrom(const ClassifElementProto& from); void Clear(); @@ -776,6 +793,7 @@ class ClassifElementProto : public ::google::protobuf::MessageLite { ::google::protobuf::io::CodedInputStream* input); void SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; int GetCachedSize() const { return _cached_size_; } private: void SharedCtor(); @@ -783,7 +801,7 @@ class ClassifElementProto : public ::google::protobuf::MessageLite { void SetCachedSize(int size) const; public: - ::std::string GetTypeName() const; + ::google::protobuf::Metadata GetMetadata() const; // nested types ---------------------------------------------------- @@ -800,25 +818,27 @@ class ClassifElementProto : public ::google::protobuf::MessageLite { inline ::std::string* mutable_name(); inline ::std::string* release_name(); - // repeated .DrawElementProto lines = 2; - inline int lines_size() const; - inline void clear_lines(); - static const int kLinesFieldNumber = 2; - inline const ::DrawElementProto& lines(int index) const; - inline ::DrawElementProto* mutable_lines(int index); - inline ::DrawElementProto* add_lines(); + // repeated .DrawElementProto element = 2; + inline int element_size() const; + inline void clear_element(); + static const int kElementFieldNumber = 2; + inline const ::DrawElementProto& element(int index) const; + inline ::DrawElementProto* mutable_element(int index); + inline ::DrawElementProto* add_element(); inline const ::google::protobuf::RepeatedPtrField< ::DrawElementProto >& - lines() const; + element() const; inline ::google::protobuf::RepeatedPtrField< ::DrawElementProto >* - mutable_lines(); + mutable_element(); // @@protoc_insertion_point(class_scope:ClassifElementProto) private: inline void set_has_name(); inline void clear_has_name(); + ::google::protobuf::UnknownFieldSet _unknown_fields_; + ::std::string* name_; - ::google::protobuf::RepeatedPtrField< ::DrawElementProto > lines_; + ::google::protobuf::RepeatedPtrField< ::DrawElementProto > element_; mutable int _cached_size_; ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32]; @@ -832,7 +852,7 @@ class ClassifElementProto : public ::google::protobuf::MessageLite { }; // ------------------------------------------------------------------- -class ContainerProto : public ::google::protobuf::MessageLite { +class ContainerProto : public ::google::protobuf::Message { public: ContainerProto(); virtual ~ContainerProto(); @@ -844,6 +864,15 @@ class ContainerProto : public ::google::protobuf::MessageLite { return *this; } + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); static const ContainerProto& default_instance(); void Swap(ContainerProto* other); @@ -851,7 +880,8 @@ class ContainerProto : public ::google::protobuf::MessageLite { // implements Message ---------------------------------------------- ContainerProto* New() const; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); void CopyFrom(const ContainerProto& from); void MergeFrom(const ContainerProto& from); void Clear(); @@ -862,6 +892,7 @@ class ContainerProto : public ::google::protobuf::MessageLite { ::google::protobuf::io::CodedInputStream* input); void SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; int GetCachedSize() const { return _cached_size_; } private: void SharedCtor(); @@ -869,7 +900,7 @@ class ContainerProto : public ::google::protobuf::MessageLite { void SetCachedSize(int size) const; public: - ::std::string GetTypeName() const; + ::google::protobuf::Metadata GetMetadata() const; // nested types ---------------------------------------------------- @@ -890,6 +921,8 @@ class ContainerProto : public ::google::protobuf::MessageLite { // @@protoc_insertion_point(class_scope:ContainerProto) private: + ::google::protobuf::UnknownFieldSet _unknown_fields_; + ::google::protobuf::RepeatedPtrField< ::ClassifElementProto > cont_; mutable int _cached_size_; @@ -907,54 +940,6 @@ class ContainerProto : public ::google::protobuf::MessageLite { // =================================================================== -// ColorProto - -// required int32 color = 1; -inline bool ColorProto::has_color() const { - return (_has_bits_[0] & 0x00000001u) != 0; -} -inline void ColorProto::set_has_color() { - _has_bits_[0] |= 0x00000001u; -} -inline void ColorProto::clear_has_color() { - _has_bits_[0] &= ~0x00000001u; -} -inline void ColorProto::clear_color() { - color_ = 0; - clear_has_color(); -} -inline ::google::protobuf::int32 ColorProto::color() const { - return color_; -} -inline void ColorProto::set_color(::google::protobuf::int32 value) { - set_has_color(); - color_ = value; -} - -// optional int32 opacity = 2; -inline bool ColorProto::has_opacity() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void ColorProto::set_has_opacity() { - _has_bits_[0] |= 0x00000002u; -} -inline void ColorProto::clear_has_opacity() { - _has_bits_[0] &= ~0x00000002u; -} -inline void ColorProto::clear_opacity() { - opacity_ = 0; - clear_has_opacity(); -} -inline ::google::protobuf::int32 ColorProto::opacity() const { - return opacity_; -} -inline void ColorProto::set_opacity(::google::protobuf::int32 value) { - set_has_opacity(); - opacity_ = value; -} - -// ------------------------------------------------------------------- - // DashDotProto // repeated double dd = 1; @@ -1008,7 +993,7 @@ inline void LineRuleProto::set_width(double value) { width_ = value; } -// required .ColorProto color = 2; +// required int32 color = 2; inline bool LineRuleProto::has_color() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -1019,22 +1004,15 @@ inline void LineRuleProto::clear_has_color() { _has_bits_[0] &= ~0x00000002u; } inline void LineRuleProto::clear_color() { - if (color_ != NULL) color_->::ColorProto::Clear(); + color_ = 0; clear_has_color(); } -inline const ::ColorProto& LineRuleProto::color() const { - return color_ != NULL ? *color_ : *default_instance_->color_; -} -inline ::ColorProto* LineRuleProto::mutable_color() { - set_has_color(); - if (color_ == NULL) color_ = new ::ColorProto; +inline ::google::protobuf::int32 LineRuleProto::color() const { return color_; } -inline ::ColorProto* LineRuleProto::release_color() { - clear_has_color(); - ::ColorProto* temp = color_; - color_ = NULL; - return temp; +inline void LineRuleProto::set_color(::google::protobuf::int32 value) { + set_has_color(); + color_ = value; } // optional .DashDotProto dashdot = 3; @@ -1070,7 +1048,7 @@ inline ::DashDotProto* LineRuleProto::release_dashdot() { // AreaRuleProto -// required .ColorProto color = 1; +// required int32 color = 1; inline bool AreaRuleProto::has_color() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -1081,22 +1059,15 @@ inline void AreaRuleProto::clear_has_color() { _has_bits_[0] &= ~0x00000001u; } inline void AreaRuleProto::clear_color() { - if (color_ != NULL) color_->::ColorProto::Clear(); + color_ = 0; clear_has_color(); } -inline const ::ColorProto& AreaRuleProto::color() const { - return color_ != NULL ? *color_ : *default_instance_->color_; -} -inline ::ColorProto* AreaRuleProto::mutable_color() { - set_has_color(); - if (color_ == NULL) color_ = new ::ColorProto; +inline ::google::protobuf::int32 AreaRuleProto::color() const { return color_; } -inline ::ColorProto* AreaRuleProto::release_color() { - clear_has_color(); - ::ColorProto* temp = color_; - color_ = NULL; - return temp; +inline void AreaRuleProto::set_color(::google::protobuf::int32 value) { + set_has_color(); + color_ = value; } // optional .LineRuleProto border = 2; @@ -1216,7 +1187,7 @@ inline void CaptionRuleProto::set_height(::google::protobuf::int32 value) { height_ = value; } -// optional .ColorProto color = 2; +// optional int32 color = 2; inline bool CaptionRuleProto::has_color() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -1227,25 +1198,18 @@ inline void CaptionRuleProto::clear_has_color() { _has_bits_[0] &= ~0x00000002u; } inline void CaptionRuleProto::clear_color() { - if (color_ != NULL) color_->::ColorProto::Clear(); + color_ = 0; clear_has_color(); } -inline const ::ColorProto& CaptionRuleProto::color() const { - return color_ != NULL ? *color_ : *default_instance_->color_; -} -inline ::ColorProto* CaptionRuleProto::mutable_color() { - set_has_color(); - if (color_ == NULL) color_ = new ::ColorProto; +inline ::google::protobuf::int32 CaptionRuleProto::color() const { return color_; } -inline ::ColorProto* CaptionRuleProto::release_color() { - clear_has_color(); - ::ColorProto* temp = color_; - color_ = NULL; - return temp; +inline void CaptionRuleProto::set_color(::google::protobuf::int32 value) { + set_has_color(); + color_ = value; } -// optional .ColorProto stroke_color = 3; +// optional int32 stroke_color = 3; inline bool CaptionRuleProto::has_stroke_color() const { return (_has_bits_[0] & 0x00000004u) != 0; } @@ -1256,51 +1220,44 @@ inline void CaptionRuleProto::clear_has_stroke_color() { _has_bits_[0] &= ~0x00000004u; } inline void CaptionRuleProto::clear_stroke_color() { - if (stroke_color_ != NULL) stroke_color_->::ColorProto::Clear(); + stroke_color_ = 0; clear_has_stroke_color(); } -inline const ::ColorProto& CaptionRuleProto::stroke_color() const { - return stroke_color_ != NULL ? *stroke_color_ : *default_instance_->stroke_color_; -} -inline ::ColorProto* CaptionRuleProto::mutable_stroke_color() { - set_has_stroke_color(); - if (stroke_color_ == NULL) stroke_color_ = new ::ColorProto; +inline ::google::protobuf::int32 CaptionRuleProto::stroke_color() const { return stroke_color_; } -inline ::ColorProto* CaptionRuleProto::release_stroke_color() { - clear_has_stroke_color(); - ::ColorProto* temp = stroke_color_; - stroke_color_ = NULL; - return temp; +inline void CaptionRuleProto::set_stroke_color(::google::protobuf::int32 value) { + set_has_stroke_color(); + stroke_color_ = value; } // ------------------------------------------------------------------- // CircleRuleProto -// required double rad = 1; -inline bool CircleRuleProto::has_rad() const { +// required double radius = 1; +inline bool CircleRuleProto::has_radius() const { return (_has_bits_[0] & 0x00000001u) != 0; } -inline void CircleRuleProto::set_has_rad() { +inline void CircleRuleProto::set_has_radius() { _has_bits_[0] |= 0x00000001u; } -inline void CircleRuleProto::clear_has_rad() { +inline void CircleRuleProto::clear_has_radius() { _has_bits_[0] &= ~0x00000001u; } -inline void CircleRuleProto::clear_rad() { - rad_ = 0; - clear_has_rad(); +inline void CircleRuleProto::clear_radius() { + radius_ = 0; + clear_has_radius(); } -inline double CircleRuleProto::rad() const { - return rad_; +inline double CircleRuleProto::radius() const { + return radius_; } -inline void CircleRuleProto::set_rad(double value) { - set_has_rad(); - rad_ = value; +inline void CircleRuleProto::set_radius(double value) { + set_has_radius(); + radius_ = value; } -// required .ColorProto color = 2; +// required int32 color = 2; inline bool CircleRuleProto::has_color() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -1311,22 +1268,15 @@ inline void CircleRuleProto::clear_has_color() { _has_bits_[0] &= ~0x00000002u; } inline void CircleRuleProto::clear_color() { - if (color_ != NULL) color_->::ColorProto::Clear(); + color_ = 0; clear_has_color(); } -inline const ::ColorProto& CircleRuleProto::color() const { - return color_ != NULL ? *color_ : *default_instance_->color_; -} -inline ::ColorProto* CircleRuleProto::mutable_color() { - set_has_color(); - if (color_ == NULL) color_ = new ::ColorProto; +inline ::google::protobuf::int32 CircleRuleProto::color() const { return color_; } -inline ::ColorProto* CircleRuleProto::release_color() { - clear_has_color(); - ::ColorProto* temp = color_; - color_ = NULL; - return temp; +inline void CircleRuleProto::set_color(::google::protobuf::int32 value) { + set_has_color(); + color_ = value; } // optional .LineRuleProto border = 3; @@ -1438,90 +1388,90 @@ inline ::AreaRuleProto* DrawElementProto::release_area() { return temp; } -// optional .SymbolRuleProto sym = 4; -inline bool DrawElementProto::has_sym() const { +// optional .SymbolRuleProto symbol = 4; +inline bool DrawElementProto::has_symbol() const { return (_has_bits_[0] & 0x00000008u) != 0; } -inline void DrawElementProto::set_has_sym() { +inline void DrawElementProto::set_has_symbol() { _has_bits_[0] |= 0x00000008u; } -inline void DrawElementProto::clear_has_sym() { +inline void DrawElementProto::clear_has_symbol() { _has_bits_[0] &= ~0x00000008u; } -inline void DrawElementProto::clear_sym() { - if (sym_ != NULL) sym_->::SymbolRuleProto::Clear(); - clear_has_sym(); +inline void DrawElementProto::clear_symbol() { + if (symbol_ != NULL) symbol_->::SymbolRuleProto::Clear(); + clear_has_symbol(); } -inline const ::SymbolRuleProto& DrawElementProto::sym() const { - return sym_ != NULL ? *sym_ : *default_instance_->sym_; +inline const ::SymbolRuleProto& DrawElementProto::symbol() const { + return symbol_ != NULL ? *symbol_ : *default_instance_->symbol_; } -inline ::SymbolRuleProto* DrawElementProto::mutable_sym() { - set_has_sym(); - if (sym_ == NULL) sym_ = new ::SymbolRuleProto; - return sym_; +inline ::SymbolRuleProto* DrawElementProto::mutable_symbol() { + set_has_symbol(); + if (symbol_ == NULL) symbol_ = new ::SymbolRuleProto; + return symbol_; } -inline ::SymbolRuleProto* DrawElementProto::release_sym() { - clear_has_sym(); - ::SymbolRuleProto* temp = sym_; - sym_ = NULL; +inline ::SymbolRuleProto* DrawElementProto::release_symbol() { + clear_has_symbol(); + ::SymbolRuleProto* temp = symbol_; + symbol_ = NULL; return temp; } -// optional .CaptionRuleProto cap = 5; -inline bool DrawElementProto::has_cap() const { +// optional .CaptionRuleProto caption = 5; +inline bool DrawElementProto::has_caption() const { return (_has_bits_[0] & 0x00000010u) != 0; } -inline void DrawElementProto::set_has_cap() { +inline void DrawElementProto::set_has_caption() { _has_bits_[0] |= 0x00000010u; } -inline void DrawElementProto::clear_has_cap() { +inline void DrawElementProto::clear_has_caption() { _has_bits_[0] &= ~0x00000010u; } -inline void DrawElementProto::clear_cap() { - if (cap_ != NULL) cap_->::CaptionRuleProto::Clear(); - clear_has_cap(); +inline void DrawElementProto::clear_caption() { + if (caption_ != NULL) caption_->::CaptionRuleProto::Clear(); + clear_has_caption(); } -inline const ::CaptionRuleProto& DrawElementProto::cap() const { - return cap_ != NULL ? *cap_ : *default_instance_->cap_; +inline const ::CaptionRuleProto& DrawElementProto::caption() const { + return caption_ != NULL ? *caption_ : *default_instance_->caption_; } -inline ::CaptionRuleProto* DrawElementProto::mutable_cap() { - set_has_cap(); - if (cap_ == NULL) cap_ = new ::CaptionRuleProto; - return cap_; +inline ::CaptionRuleProto* DrawElementProto::mutable_caption() { + set_has_caption(); + if (caption_ == NULL) caption_ = new ::CaptionRuleProto; + return caption_; } -inline ::CaptionRuleProto* DrawElementProto::release_cap() { - clear_has_cap(); - ::CaptionRuleProto* temp = cap_; - cap_ = NULL; +inline ::CaptionRuleProto* DrawElementProto::release_caption() { + clear_has_caption(); + ::CaptionRuleProto* temp = caption_; + caption_ = NULL; return temp; } -// optional .CircleRuleProto cir = 6; -inline bool DrawElementProto::has_cir() const { +// optional .CircleRuleProto circle = 6; +inline bool DrawElementProto::has_circle() const { return (_has_bits_[0] & 0x00000020u) != 0; } -inline void DrawElementProto::set_has_cir() { +inline void DrawElementProto::set_has_circle() { _has_bits_[0] |= 0x00000020u; } -inline void DrawElementProto::clear_has_cir() { +inline void DrawElementProto::clear_has_circle() { _has_bits_[0] &= ~0x00000020u; } -inline void DrawElementProto::clear_cir() { - if (cir_ != NULL) cir_->::CircleRuleProto::Clear(); - clear_has_cir(); +inline void DrawElementProto::clear_circle() { + if (circle_ != NULL) circle_->::CircleRuleProto::Clear(); + clear_has_circle(); } -inline const ::CircleRuleProto& DrawElementProto::cir() const { - return cir_ != NULL ? *cir_ : *default_instance_->cir_; +inline const ::CircleRuleProto& DrawElementProto::circle() const { + return circle_ != NULL ? *circle_ : *default_instance_->circle_; } -inline ::CircleRuleProto* DrawElementProto::mutable_cir() { - set_has_cir(); - if (cir_ == NULL) cir_ = new ::CircleRuleProto; - return cir_; +inline ::CircleRuleProto* DrawElementProto::mutable_circle() { + set_has_circle(); + if (circle_ == NULL) circle_ = new ::CircleRuleProto; + return circle_; } -inline ::CircleRuleProto* DrawElementProto::release_cir() { - clear_has_cir(); - ::CircleRuleProto* temp = cir_; - cir_ = NULL; +inline ::CircleRuleProto* DrawElementProto::release_circle() { + clear_has_circle(); + ::CircleRuleProto* temp = circle_; + circle_ = NULL; return temp; } @@ -1587,29 +1537,29 @@ inline ::std::string* ClassifElementProto::release_name() { } } -// repeated .DrawElementProto lines = 2; -inline int ClassifElementProto::lines_size() const { - return lines_.size(); +// repeated .DrawElementProto element = 2; +inline int ClassifElementProto::element_size() const { + return element_.size(); } -inline void ClassifElementProto::clear_lines() { - lines_.Clear(); +inline void ClassifElementProto::clear_element() { + element_.Clear(); } -inline const ::DrawElementProto& ClassifElementProto::lines(int index) const { - return lines_.Get(index); +inline const ::DrawElementProto& ClassifElementProto::element(int index) const { + return element_.Get(index); } -inline ::DrawElementProto* ClassifElementProto::mutable_lines(int index) { - return lines_.Mutable(index); +inline ::DrawElementProto* ClassifElementProto::mutable_element(int index) { + return element_.Mutable(index); } -inline ::DrawElementProto* ClassifElementProto::add_lines() { - return lines_.Add(); +inline ::DrawElementProto* ClassifElementProto::add_element() { + return element_.Add(); } inline const ::google::protobuf::RepeatedPtrField< ::DrawElementProto >& -ClassifElementProto::lines() const { - return lines_; +ClassifElementProto::element() const { + return element_; } inline ::google::protobuf::RepeatedPtrField< ::DrawElementProto >* -ClassifElementProto::mutable_lines() { - return &lines_; +ClassifElementProto::mutable_element() { + return &element_; } // ------------------------------------------------------------------- @@ -1644,6 +1594,15 @@ ContainerProto::mutable_cont() { // @@protoc_insertion_point(namespace_scope) +#ifndef SWIG +namespace google { +namespace protobuf { + + +} // namespace google +} // namespace protobuf +#endif // SWIG + // @@protoc_insertion_point(global_scope) #endif // PROTOBUF_drules_5fstruct_2eproto__INCLUDED diff --git a/indexer/drules_struct.proto b/indexer/drules_struct.proto index 512617ec5f..a9dc086635 100644 --- a/indexer/drules_struct.proto +++ b/indexer/drules_struct.proto @@ -1,10 +1,4 @@ -option optimize_for = LITE_RUNTIME; - -message ColorProto -{ - required int32 color = 1; - optional int32 opacity = 2; // opacity : 0 - completely invisible, 255 - completely visible -} +// option optimize_for = LITE_RUNTIME; message DashDotProto { @@ -14,13 +8,13 @@ message DashDotProto message LineRuleProto { required double width = 1; - required ColorProto color = 2; + required int32 color = 2; optional DashDotProto dashdot = 3; } message AreaRuleProto { - required ColorProto color = 1; + required int32 color = 1; optional LineRuleProto border = 2; } @@ -32,14 +26,14 @@ message SymbolRuleProto message CaptionRuleProto { required int32 height = 1; - optional ColorProto color = 2; - optional ColorProto stroke_color = 3; + optional int32 color = 2; + optional int32 stroke_color = 3; } message CircleRuleProto { - required double rad = 1; - required ColorProto color = 2; + required double radius = 1; + required int32 color = 2; optional LineRuleProto border = 3; } @@ -55,15 +49,15 @@ message DrawElementProto required int32 scale = 1; repeated LineRuleProto lines = 2; optional AreaRuleProto area = 3; - optional SymbolRuleProto sym = 4; - optional CaptionRuleProto cap = 5; - optional CircleRuleProto cir = 6; + optional SymbolRuleProto symbol = 4; + optional CaptionRuleProto caption = 5; + optional CircleRuleProto circle = 6; } message ClassifElementProto { required string name = 1; - repeated DrawElementProto lines = 2; + repeated DrawElementProto element = 2; } message ContainerProto