From 135f7c04ae98ce694efcfc6d9a0d2bc38f4c3653 Mon Sep 17 00:00:00 2001 From: Emilian Peev Date: Mon, 28 Jan 2019 13:50:06 -0800 Subject: Sync libimage_io to CL: #231067980 Changes included: - [ddepth] Add GetItemPayload for istream - Adds IStreamRefDataSource and OStreamRefDataDestination to the ImageIO library. - Adds GDepthMetadata and readers and writers. - Adds XmpGImageMetadata and related classes/changes. - Adds a motion photo builder program and enhances/fixes other components. - Adds some new util classes for use with motion photos builder/checker. - Eliminates the global vars used by image_io::MessageHandler::Get(). - Adds ability to read and check the MP4 part of a motion photo. - [rosie] Unify all minimum_os_version flags to a minimum_os.bzl file. - Adds the beginnings of the motion photo checker feature. - Adds camera and container metadata to motion_photos and updates video metadata. - Adds classes/functions to xml/xmp in preparation for motion photo XMP processing. - Adds classes/functions to base/xmp in preparation for motion photo XMP processing. - Adds the photos/editing/formats/motion_photo and image_io/iso libraries. Bug: 123316622 Test: Camera CTS Change-Id: Ida94bd36cbe45346e493959c32dd713e1b786abb --- src/jpeg/jpeg_xmp_data_extractor.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/jpeg/jpeg_xmp_data_extractor.cc') diff --git a/src/jpeg/jpeg_xmp_data_extractor.cc b/src/jpeg/jpeg_xmp_data_extractor.cc index f59dea5..68475f0 100644 --- a/src/jpeg/jpeg_xmp_data_extractor.cc +++ b/src/jpeg/jpeg_xmp_data_extractor.cc @@ -50,8 +50,10 @@ DataDestination::TransferStatus JpegXmpDataExtractor::Transfer( } } if (xmp_data_begin == encoded_data_begin) { - MessageHandler::Get()->ReportMessage(Message::kStringNotFoundError, - property_name + "=\""); + if (message_handler_) { + message_handler_->ReportMessage(Message::kStringNotFoundError, + property_name + "=\""); + } has_error_ = true; return kTransferError; } @@ -59,7 +61,9 @@ DataDestination::TransferStatus JpegXmpDataExtractor::Transfer( if (segment_index_ == last_segment_index_) { xmp_data_end = data_segment.Find(xmp_data_begin, '"'); if (xmp_data_end == transfer_range.GetEnd()) { - MessageHandler::Get()->ReportMessage(Message::kStringNotFoundError, "\""); + if (message_handler_) { + message_handler_->ReportMessage(Message::kStringNotFoundError, "\""); + } has_error_ = true; return kTransferError; } -- cgit v1.2.3