diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-01-28 22:21:51 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-01-28 22:21:51 +0000 |
commit | 938d58078455ad446fb1196cb9978429faff36cc (patch) | |
tree | 651b48226356b70dbd99d471abd462bad303aa02 /includes/dynamic_depth/profile.h | |
parent | 6b9f1f428665620ad0577a2b9bcf5c9834c711aa (diff) | |
parent | cf24597915ce4f06730cd9236f3bfdd07cb87311 (diff) | |
download | dynamic_depth-938d58078455ad446fb1196cb9978429faff36cc.tar.gz |
Merge changes from topic "dynamic_depth"
* changes:
Add Android dynamic depth buffer validation sequence
Sync libdynamic_depth to CL #228913159
Diffstat (limited to 'includes/dynamic_depth/profile.h')
-rw-r--r-- | includes/dynamic_depth/profile.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/includes/dynamic_depth/profile.h b/includes/dynamic_depth/profile.h index b1a311c..7dfb0ea 100644 --- a/includes/dynamic_depth/profile.h +++ b/includes/dynamic_depth/profile.h @@ -9,7 +9,6 @@ #include "xmpmeta/xml/deserializer.h" #include "xmpmeta/xml/serializer.h" -namespace photos_editing_formats { namespace dynamic_depth { // Implements the Profile element in the Dynamic Depth specification, with @@ -19,7 +18,8 @@ class Profile : public Element { void GetNamespaces( std::unordered_map<string, string>* ns_name_href_map) override; - bool Serialize(xml::Serializer* serializer) const override; + bool Serialize( + ::dynamic_depth::xmpmeta::xml::Serializer* serializer) const override; // Creates a Profile element from the given fields. Returns null if // the type is empty, or if the camera_indices are shorter than the @@ -31,7 +31,7 @@ class Profile : public Element { // Returns the deserialized Profile, null if parsing fails. static std::unique_ptr<Profile> FromDeserializer( - const xml::Deserializer& parent_deserializer); + const ::dynamic_depth::xmpmeta::xml::Deserializer& parent_deserializer); // Returns the Profile type. const string& GetType() const; @@ -51,6 +51,5 @@ class Profile : public Element { }; } // namespace dynamic_depth -} // namespace photos_editing_formats #endif // DYNAMIC_DEPTH_INCLUDES_DYNAMIC_DEPTH_PROFILE_H_ // NOLINT |