From da9fe758fe5d0aa8fecafe5c33da7d4e6d4218a8 Mon Sep 17 00:00:00 2001 From: Lukasz Bardeli Date: Wed, 2 Dec 2015 09:26:32 +0100 Subject: [PATCH] [Exif] update logs Verification] Code compiles without errors Change-Id: I9d36d497a193947811f4ceb47e5cb54472faa055 Signed-off-by: Lukasz Bardeli --- src/exif/exif_information.cc | 4 +- src/exif/exif_instance.cc | 17 ++-- src/exif/exif_tag_saver.cc | 45 +++++------ src/exif/get_exif_info.cc | 12 ++- src/exif/jpeg_file.cc | 153 +++++++++++++++++------------------ 5 files changed, 108 insertions(+), 123 deletions(-) diff --git a/src/exif/exif_information.cc b/src/exif/exif_information.cc index 927c5330..e1541a10 100755 --- a/src/exif/exif_information.cc +++ b/src/exif/exif_information.cc @@ -943,8 +943,8 @@ PlatformResult ExifInformation::saveToFile(const std::string& file_path) { exif_data = exif_data_new(); if (!exif_data) { - LoggerE("Couldn't allocate new ExifData"); - return PlatformResult(ErrorCode::UNKNOWN_ERR, "Memory allocation failed"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Memory allocation failed", + ("Couldn't allocate new ExifData")); } exif_data_set_option(exif_data, EXIF_DATA_OPTION_FOLLOW_SPECIFICATION); diff --git a/src/exif/exif_instance.cc b/src/exif/exif_instance.cc index 46870205..8be6a26e 100755 --- a/src/exif/exif_instance.cc +++ b/src/exif/exif_instance.cc @@ -68,7 +68,7 @@ void ExifInstance::ExifManagerGetExifInfo(const picojson::value& args, picojson: if (status) ReportSuccess(result, response->get()); else - ReportError(status, &response->get()); + LogAndReportError(status, &response->get()); }; auto get_response = [callback_id, this](const std::shared_ptr& response)->void { @@ -101,7 +101,7 @@ void ExifInstance::ExifManagerSaveExifInfo(const picojson::value& args, if (status) ReportSuccess(result, response->get()); else - ReportError(status, &response->get()); + LogAndReportError(status, &response->get()); }; auto get_response = [callback_id, this](const std::shared_ptr& response) -> void { @@ -136,30 +136,29 @@ void ExifInstance::ExifManagerGetThumbnail(const picojson::value& args, } if ("jpeg" != ext && "png" != ext && "gif" != ext) { - LoggerE("extension: %s is not valid (jpeg/jpg/png/gif is supported)", - ext.c_str()); status = PlatformResult(ErrorCode::INVALID_VALUES_ERR, "getThumbnail support only jpeg/jpg/png/gif"); - ReportError(status, &response->get()); + LogAndReportError(status, &response->get(), + ("extension: %s is not valid (jpeg/jpg/png/gif is supported)", ext.c_str())); return; } LoggerD("Get thumbnail from Exif in file: [%s]", file_path.c_str()); ExifData *exif_data = exif_data_new_from_file(file_path.c_str()); if (!exif_data) { - LoggerE("Error reading from file [%s]", file_path.c_str()); status = PlatformResult(ErrorCode::UNKNOWN_ERR, "Error reading from file"); - ReportError(status, &response->get()); + LogAndReportError(status, &response->get(), + ("Error reading from file [%s]", file_path.c_str())); return; } if (!exif_data->data || !exif_data->size) { exif_data_unref(exif_data); - LoggerE("File [%s] doesn't contain thumbnail", file_path.c_str()); status = PlatformResult(ErrorCode::UNKNOWN_ERR, "File doesn't contain thumbnail"); - ReportError(status, &response->get()); + LogAndReportError(status, &response->get(), + ("File [%s] doesn't contain thumbnail", file_path.c_str())); return; } diff --git a/src/exif/exif_tag_saver.cc b/src/exif/exif_tag_saver.cc index fa41aa62..dc49cba0 100755 --- a/src/exif/exif_tag_saver.cc +++ b/src/exif/exif_tag_saver.cc @@ -45,8 +45,7 @@ common::PlatformResult ExifTagSaver::saveToExif(long int value, ExifTag tag, ExifEntry* entry = prepareEntry(exif_data, tag); if (!entry) { - LoggerE("Exif entry is null"); - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, "Exif entry is null"); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, "Exif entry is null"); } ExifByteOrder order = exif_data_get_byte_order(exif_data); @@ -72,8 +71,8 @@ common::PlatformResult ExifTagSaver::saveToExif(long int value, ExifTag tag, break; } default: { - LoggerE("Error: wrong format: %d \n", entry->format); - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, "Wrong format"); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, "Wrong format", + ("Error: wrong format: %d \n", entry->format)); } } return common::PlatformResult(common::ErrorCode::NO_ERROR); @@ -85,8 +84,7 @@ common::PlatformResult ExifTagSaver::saveToExif(const std::string& value, ExifTa LoggerD("Entered"); ExifEntry* entry = prepareEntry(exif_data, tag); if (!entry) { - LoggerE("Exif entry is null"); - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, "Exif entry is null"); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, "Exif entry is null"); } if (!value.empty()) { @@ -106,8 +104,7 @@ common::PlatformResult ExifTagSaver::saveToExif(const std::string& value, ExifTa entry->data = static_cast(malloc(entry->size)); if (entry->data == nullptr) { - LoggerE("Function malloc returned nullptr"); - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, "Function malloc returned nullptr"); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, "Function malloc returned nullptr"); } memcpy(entry->data, value.c_str(), value.length()); @@ -123,8 +120,7 @@ common::PlatformResult ExifTagSaver::saveToExif(const Rational& value, ExifTag t LoggerD("Entered"); ExifEntry* entry = prepareEntry(exif_data, tag); if (!entry) { - LoggerE("Exif entry is null"); - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, "Exif entry is null"); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, "Exif entry is null"); } entry->format = EXIF_FORMAT_RATIONAL; @@ -137,8 +133,7 @@ common::PlatformResult ExifTagSaver::saveToExif(const Rational& value, ExifTag t entry->size = ExifTypeInfo::RationalSize; entry->data = static_cast(malloc(entry->size)); if (entry->data == nullptr) { - LoggerE("Function malloc returned nullptr"); - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, "Function malloc returned nullptr"); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, "Function malloc returned nullptr"); } memset(entry->data, 0, entry->size); } @@ -159,8 +154,7 @@ common::PlatformResult ExifTagSaver::saveToExif(const Rationals& value, ExifTag LoggerD("Entered"); ExifEntry* entry = prepareEntry(exif_data, tag); if (!entry) { - LoggerE("Exif entry is null"); - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, "Exif entry is null"); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, "Exif entry is null"); } ExifByteOrder order = exif_data_get_byte_order(exif_data); entry->format = EXIF_FORMAT_RATIONAL; @@ -175,8 +169,7 @@ common::PlatformResult ExifTagSaver::saveToExif(const Rationals& value, ExifTag entry->size = required_size; entry->data = static_cast(malloc(entry->size)); if (entry->data == nullptr) { - LoggerE("Function malloc returned nullptr"); - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, "Function malloc returned nullptr"); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, "Function malloc returned nullptr"); } memset(entry->data, 0, entry->size); } @@ -198,8 +191,7 @@ common::PlatformResult ExifTagSaver::saveToExif(std::vector& valu LoggerD("Entered"); ExifEntry* entry = prepareEntry(exif_data, tag); if (!entry) { - LoggerE("Exif entry is null"); - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, "Exif entry is null"); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, "Exif entry is null"); } const ExifByteOrder order = exif_data_get_byte_order(exif_data); @@ -212,8 +204,8 @@ common::PlatformResult ExifTagSaver::saveToExif(std::vector& valu case EXIF_FORMAT_SLONG: break; default: - LoggerE("output ExifFormat: %d is not supported!", store_as); - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, "ExifFormat is not supported!"); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, "ExifFormat is not supported!", + ("output ExifFormat: %d is not supported!", store_as)); } entry->format = store_as; @@ -228,8 +220,7 @@ common::PlatformResult ExifTagSaver::saveToExif(std::vector& valu entry->size = required_size; entry->data = static_cast(malloc(entry->size)); if (entry->data == nullptr) { - LoggerE("Function malloc returned nullptr"); - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, "Function malloc returned nullptr"); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, "Function malloc returned nullptr"); } memset(entry->data, 0, entry->size); } @@ -275,7 +266,7 @@ common::PlatformResult ExifTagSaver::saveToExif(std::vector& valu LoggerE("output ExifFormat: %d is not supported!", store_as); free(entry->data); entry->data = nullptr; - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, "ExifFormat is not supported!"); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, "ExifFormat is not supported!"); } } @@ -423,8 +414,8 @@ common::PlatformResult ExifTagSaver::deduceIfdSection(ExifTag tag, ExifIfd* exif // Tags in other sections default: - LoggerE("Unsupported tag: %d", tag); - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, "Unsupported tag"); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, "Unsupported tag", + ("Unsupported tag: %d", tag)); } return common::PlatformResult(common::ErrorCode::NO_ERROR); @@ -483,8 +474,8 @@ common::PlatformResult ExifTagSaver::deduceDataFormat(ExifTag tag, ExifFormat* e // Unsupported tags: default: - LoggerE("Unsupported tag: %d", tag); - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, "Unsupported tag"); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, "Unsupported tag", + ("Unsupported tag: %d", tag)); } return common::PlatformResult(common::ErrorCode::NO_ERROR); diff --git a/src/exif/get_exif_info.cc b/src/exif/get_exif_info.cc index 5092a5e5..07758f67 100755 --- a/src/exif/get_exif_info.cc +++ b/src/exif/get_exif_info.cc @@ -221,8 +221,7 @@ PlatformResult GetExifInfo::ProcessEntry(ExifEntry* entry, pair = std::make_pair("isoSpeedRatings", JsonValue(array)); result_obj->insert(pair); } else { - LoggerE("iso speed ratings: format or components count is invalid!"); - return PlatformResult(ErrorCode::TYPE_MISMATCH_ERR, + return LogAndCreateResult(ErrorCode::TYPE_MISMATCH_ERR, "iso speed ratings: format or components count is invalid!"); } break; @@ -246,8 +245,7 @@ PlatformResult GetExifInfo::ProcessEntry(ExifEntry* entry, exp_time.toString().c_str()); } } else { - LoggerE("exposure time: format or components count is invalid!"); - return PlatformResult(ErrorCode::TYPE_MISMATCH_ERR, + return LogAndCreateResult(ErrorCode::TYPE_MISMATCH_ERR, "exposure time: format or components count is invalid!"); } break; @@ -502,9 +500,9 @@ PlatformResult GetExifInfo::LoadFromURI(const std::string& uri, const std::string& file_path = ExifUtil::convertUriToPath(uri); ExifData* ed = exif_data_new_from_file(file_path.c_str()); if (!ed) { - LoggerE("Error reading exif from file %s", file_path.c_str()); - return PlatformResult(ErrorCode::UNKNOWN_ERR, - "Error reading exif from file"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, + "Error reading exif from file", + ("Error reading exif from file %s", file_path.c_str())); } LoggerD("loadFromURI_into_json exif_data_foreach_content START"); diff --git a/src/exif/jpeg_file.cc b/src/exif/jpeg_file.cc index b8c6f25e..65bc4f50 100755 --- a/src/exif/jpeg_file.cc +++ b/src/exif/jpeg_file.cc @@ -121,8 +121,8 @@ PlatformResult JpegFile::loadFile(const std::string& path, JpegFilePtr* jpg_ptr) LoggerD("Entered"); JpegFile* new_jpg = new (std::nothrow) JpegFile(); if (!new_jpg) { - LoggerE("Couldn't allocate Jpegfile!"); - return PlatformResult(ErrorCode::UNKNOWN_ERR, "Memory allocation failed"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Memory allocation failed", + ("Couldn't allocate Jpegfile!")); } jpg_ptr->reset(new_jpg); @@ -142,39 +142,38 @@ PlatformResult JpegFile::load(const std::string& path) { m_in_file = fopen(path.c_str(), "rb"); if (!m_in_file) { - LoggerE("Couldn't open Jpeg file: [%s]", path.c_str()); - return PlatformResult(ErrorCode::NOT_FOUND_ERR, "Could not open JPEG file"); + return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR, "Could not open JPEG file", + ("Couldn't open Jpeg file: [%s]", path.c_str())); } fseek(m_in_file, 0, SEEK_END); long ftell_val = ftell(m_in_file); if (0 > ftell_val) { - LoggerE("Input file [%s] access error! [%d]", path.c_str(), errno); - return PlatformResult(ErrorCode::UNKNOWN_ERR, "JPEG file is invalid"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "JPEG file is invalid", + ("Input file [%s] access error! [%d]", path.c_str(), errno)); } const std::size_t in_file_size = static_cast(ftell_val); fseek(m_in_file, 0, SEEK_SET); LoggerD("JPEG file: [%s] size:%d", path.c_str(), in_file_size); if (0 == in_file_size) { - LoggerE("Input file [%s] is empty!", path.c_str()); - return PlatformResult(ErrorCode::UNKNOWN_ERR, "JPEG file is invalid"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "JPEG file is invalid", + ("Input file [%s] is empty!", path.c_str())); } m_in_data = new (std::nothrow) unsigned char[in_file_size]; if (!m_in_data) { - LoggerE("Couldn't allocate buffer with size: %d", in_file_size); - return PlatformResult(ErrorCode::UNKNOWN_ERR, "Memory allocation failed"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Memory allocation failed", + ("Couldn't allocate buffer with size: %d", in_file_size)); } m_in_data_size = in_file_size; const std::size_t read_bytes = fread(m_in_data, 1, m_in_data_size, m_in_file); if (read_bytes != m_in_data_size) { - LoggerE("Couldn't read all: %d bytes. Read only: %d bytes!", m_in_data_size, - read_bytes); - return PlatformResult(ErrorCode::UNKNOWN_ERR, "Could not read JPEG file"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Could not read JPEG file", + ("Couldn't read all: %d bytes. Read only: %d bytes!", m_in_data_size, read_bytes)); } if (fclose(m_in_file) == EOF) { @@ -189,19 +188,19 @@ std::string JpegFile::getPartOfFile(const std::size_t offset, const std::size_t num_bytes_before, const std::size_t num_bytes_after) { LoggerD("Entered"); - long long int start = static_cast(offset) - num_bytes_before; - if (start < 0) { + auto start = offset - num_bytes_before; + if (offset < num_bytes_before) { start = 0; } - long long int end = static_cast(offset) + num_bytes_after; - if (end >= m_in_data_size) { + auto end = offset + num_bytes_after; + if (end >= m_in_data_size || end < start) { end = m_in_data_size - 1; } std::stringstream ss; ss << std::setfill('0') << std::setw(2) << std::hex; - for (long long int i = start; i <= end; ++i) { + for (size_t i = start; i <= end; ++i) { ss << static_cast(m_in_data[i]); } return ss.str(); @@ -245,9 +244,8 @@ common::PlatformResult JpegFile::generateListOfSections() { } if (search_len == search_offset) { - LoggerE("offset:%d | Couldn't find marker! RAW DATA:{%s}", offset, - getPartOfFile(offset, 0, 10).c_str()); - return PlatformResult(ErrorCode::UNKNOWN_ERR, "JPEG file is invalid"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "JPEG file is invalid", + ("offset:%d | Couldn't find marker! RAW DATA:{%s}", offset, getPartOfFile(offset, 0, 10).c_str())); } const std::size_t section_offset = offset + search_offset - 1; @@ -257,9 +255,9 @@ common::PlatformResult JpegFile::generateListOfSections() { LoggerD("offset:%d | Moved to section begin", offset); if (!isJpegMarker(section_begin[1])) { - LoggerE("offset:%d | Is not valid marker: 0x%x RAW DATA:{%s}", offset, - section_begin[1], getPartOfFile(section_offset, 0, 4).c_str()); - return PlatformResult(ErrorCode::UNKNOWN_ERR, "JPEG file is invalid"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "JPEG file is invalid", + ("offset:%d | Is not valid marker: 0x%x RAW DATA:{%s}", offset, + section_begin[1], getPartOfFile(section_offset, 0, 4).c_str())); } const JpegMarker cur_marker = castToJpegMarker(section_begin[1]); @@ -273,8 +271,8 @@ common::PlatformResult JpegFile::generateListOfSections() { { JpegFileSection* sec = new (std::nothrow) JpegFileSection(); if (!sec) { - LoggerE("Couldn't allocate JpegFileSection"); - return PlatformResult(ErrorCode::UNKNOWN_ERR, "Memory allocation failed"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Memory allocation failed", + ("Couldn't allocate JpegFileSection")); } section = JpegFileSectionPtr(sec); @@ -317,18 +315,18 @@ common::PlatformResult JpegFile::generateListOfSections() { offset += 2; // Read data size - 2 bytes if (total_section_len < 0) { - LoggerE("offset:%d tag:0x%x | Error: total_section_len is: %d < 0", - offset, cur_marker, total_section_len); - return PlatformResult(ErrorCode::UNKNOWN_ERR, "JPEG file is invalid"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "JPEG file is invalid", + ("offset:%d tag:0x%x | Error: total_section_len is: %d < 0", + offset, cur_marker, total_section_len)); } if (section_offset + 2 + total_section_len > m_in_data_size) { - LoggerE("offset:%d tag:0x%x | Error: current section offset:%d" - " + 2 + total_section_len:%d = %d is greater then file size:%d", - offset, cur_marker, - section_offset, total_section_len, - section_offset + total_section_len, m_in_data_size); - return PlatformResult(ErrorCode::UNKNOWN_ERR, "JPEG file is invalid"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "JPEG file is invalid", + ("offset:%d tag:0x%x | Error: current section offset:%d" + " + 2 + total_section_len:%d = %d is greater then file size:%d", + offset, cur_marker, + section_offset, total_section_len, + section_offset + total_section_len, m_in_data_size)); } if (JPEG_MARKER_APP1 == cur_marker) { @@ -458,9 +456,9 @@ PlatformResult JpegFile::setNewExifData(ExifData* new_exif_data) { { JpegFileSection* new_sec = new (std::nothrow) JpegFileSection(); if (!new_sec) { - LoggerE("Couldn't allocate JpegFileSection"); - return PlatformResult(ErrorCode::UNKNOWN_ERR, - "Memory allocation failed"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, + "Memory allocation failed", + ("Couldn't allocate JpegFileSection")); } new_sec->type = JPEG_MARKER_APP1; @@ -479,8 +477,8 @@ PlatformResult JpegFile::setNewExifData(ExifData* new_exif_data) { } if (!soi_is_present) { - LoggerW("SOI section is missing"); - return PlatformResult(ErrorCode::UNKNOWN_ERR, "JPEG file is invalid"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "JPEG file is invalid", + ("SOI section is missing")); } // Insert new Exif sections just after SOI @@ -534,21 +532,21 @@ PlatformResult JpegFile::saveToFile(const std::string& out_path) { FILE* outf = fopen(out_path.c_str(), "wb"); if (!outf) { - LoggerE("Couldn't open output file:" - " [%s] - JPEG file will not be restored!", out_path.c_str()); - return PlatformResult(ErrorCode::UNKNOWN_ERR, - "Couldn't open output file"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, + "Couldn't open output file", + ("Couldn't open output file:" + " [%s] - JPEG file will not be restored!", out_path.c_str())); } std::size_t bytes_wrote = fwrite(m_in_data, 1, m_in_data_size, outf); if (bytes_wrote != m_in_data_size) { fclose(outf); - LoggerE("Couldn't restore whole JPEG! " - "Only %d of %d bytes have been wrote!", - bytes_wrote, m_in_data_size); - return PlatformResult(ErrorCode::UNKNOWN_ERR, - "Couldn't restore whole file"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, + "Couldn't restore whole file", + ("Couldn't restore whole JPEG! " + "Only %d of %d bytes have been wrote!", + bytes_wrote, m_in_data_size)); } if (EOF == fclose(outf)) { LoggerE("Couldn't close restore output file: [%s]", out_path.c_str()); @@ -565,8 +563,8 @@ PlatformResult JpegFile::saveToFilePriv(const std::string& out_path) { m_out_file = fopen(out_path.c_str(), "wb"); if (!m_out_file) { - LoggerE("Couldn't open output file: %s", out_path.c_str()); - return PlatformResult(ErrorCode::UNKNOWN_ERR, "Could not write JPEG file"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Could not write JPEG file", + ("Couldn't open output file: %s", out_path.c_str())); } unsigned char tmp_buf[128]; @@ -602,8 +600,7 @@ PlatformResult JpegFile::saveToFilePriv(const std::string& out_path) { unsigned char* tmp = NULL; exif_data_save_data(cur->exif_data, &tmp, &exif_output_size); if (!tmp || 0 == exif_output_size) { - LoggerE("Couldn't generate RAW Exif data!"); - return PlatformResult(ErrorCode::UNKNOWN_ERR, + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Could not save Exif in JPEG file"); } @@ -613,11 +610,11 @@ PlatformResult JpegFile::saveToFilePriv(const std::string& out_path) { exif_output_data.reset(tmp); if (exif_output_size > MAX_AVAILABLE_JPEG_SECTION_DATA_SIZE) { - LoggerE("exif_output_size:%d is greater then maximum JPEG section" - "data block size: %d", exif_output_size, - MAX_AVAILABLE_JPEG_SECTION_DATA_SIZE); - return PlatformResult(ErrorCode::UNKNOWN_ERR, - "Exif data is to big to be saved in JPEG file"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, + "Exif data is to big to be saved in JPEG file", + ("exif_output_size:%d is greater then maximum JPEG section" + "data block size: %d", exif_output_size, + MAX_AVAILABLE_JPEG_SECTION_DATA_SIZE)); } section_size += exif_output_size; write_exif_data = true; @@ -637,10 +634,10 @@ PlatformResult JpegFile::saveToFilePriv(const std::string& out_path) { offset += bytes_wrote; if (bytes_wrote != bytes_to_write) { - LoggerE("Couldn't wrote %d bytes! Only %d bytes wrote", bytes_to_write, - bytes_wrote); - return PlatformResult(ErrorCode::UNKNOWN_ERR, - "Could not write JPEG file"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, + "Could not write JPEG file", + ("Couldn't wrote %d bytes! Only %d bytes wrote", bytes_to_write, + bytes_wrote)); } if (write_section_data && cur->size > 0) { @@ -651,10 +648,10 @@ PlatformResult JpegFile::saveToFilePriv(const std::string& out_path) { offset += bytes_wrote; if (bytes_wrote != bytes_to_write) { - LoggerE("Couldn't wrote %d bytes! Only %d bytes wrote", bytes_to_write, - bytes_wrote); - return PlatformResult(ErrorCode::UNKNOWN_ERR, - "Could not write JPEG file"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, + "Could not write JPEG file", + ("Couldn't wrote %d bytes! Only %d bytes wrote", bytes_to_write, + bytes_wrote)); } } @@ -668,10 +665,10 @@ PlatformResult JpegFile::saveToFilePriv(const std::string& out_path) { offset += bytes_wrote; if (bytes_wrote != bytes_to_write) { - LoggerE("Couldn't wrote %d bytes! Only %d bytes wrote", bytes_to_write, - bytes_wrote); - return PlatformResult(ErrorCode::UNKNOWN_ERR, - "Could not write JPEG file"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, + "Could not write JPEG file", + ("Couldn't wrote %d bytes! Only %d bytes wrote", bytes_to_write, + bytes_wrote)); } } @@ -684,10 +681,10 @@ PlatformResult JpegFile::saveToFilePriv(const std::string& out_path) { offset += bytes_wrote; if (bytes_wrote != bytes_to_write) { - LoggerE("Couldn't wrote %d bytes! Only %d bytes wrote", bytes_to_write, - bytes_wrote); - return PlatformResult(ErrorCode::UNKNOWN_ERR, - "Could not write JPEG file"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, + "Could not write JPEG file", + ("Couldn't wrote %d bytes! Only %d bytes wrote", bytes_to_write, + bytes_wrote)); } } } @@ -698,10 +695,10 @@ PlatformResult JpegFile::saveToFilePriv(const std::string& out_path) { m_out_file); if (bytes_wrote != m_padding_data_size) { - LoggerE("Couldn't wrote %d bytes! Only %d bytes wrote", - m_padding_data_size, bytes_wrote); - return PlatformResult(ErrorCode::UNKNOWN_ERR, - "Could not write JPEG file"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, + "Could not write JPEG file", + ("Couldn't wrote %d bytes! Only %d bytes wrote", + m_padding_data_size, bytes_wrote)); } } -- 2.34.1