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/xmpmeta/xmp_parser.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/xmpmeta/xmp_parser.h')
| -rw-r--r-- | includes/xmpmeta/xmp_parser.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/includes/xmpmeta/xmp_parser.h b/includes/xmpmeta/xmp_parser.h index e2781ec..16b2f72 100644 --- a/includes/xmpmeta/xmp_parser.h +++ b/includes/xmpmeta/xmp_parser.h @@ -7,7 +7,8 @@ #include "base/port.h" #include "xmpmeta/xmp_data.h" -namespace photos_editing_formats { +namespace dynamic_depth { +namespace xmpmeta { // Populates a XmpData from the header of the JPEG file. bool ReadXmpHeader(const string& filename, bool skip_extended, @@ -22,6 +23,7 @@ bool ReadXmpFromMemory(const string& jpeg_contents, bool skip_extended, // in JPEG format). bool ReadXmpHeader(std::istream* input_stream, bool skip_extended, XmpData* xmp_data); -} // namespace photos_editing_formats +} // namespace xmpmeta +} // namespace dynamic_depth #endif // DYNAMIC_DEPTH_INCLUDES_XMPMETA_XMP_PARSER_H_ // NOLINT |