From 5533f3660b192829686ef1fef88e216a62df6ece Mon Sep 17 00:00:00 2001 From: Szymon Jastrzebski Date: Tue, 7 Nov 2017 11:44:27 +0100 Subject: [PATCH] [Exif] Fixing warning: control reaches end of non-void function [Verification] Code compiles Change-Id: I8d89d09dc864bfa4b43f2aec78327a38a0960c81 Signed-off-by: Szymon Jastrzebski --- src/exif/get_exif_info.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/exif/get_exif_info.cc b/src/exif/get_exif_info.cc index e80f8f09..a5e4e81c 100644 --- a/src/exif/get_exif_info.cc +++ b/src/exif/get_exif_info.cc @@ -42,9 +42,8 @@ Rational GetRationalFromEntry(ExifEntry* entry, ExifData* exif_data) { if (EXIF_FORMAT_RATIONAL == entry->format && entry->components >= 1 && entry->data) { const ExifByteOrder order = exif_data_get_byte_order(exif_data); return Rational(exif_get_rational(entry->data, order)); - } else { - return Rational::createInvalid(); } + return Rational::createInvalid(); } bool GetRationalsFromEntry(ExifEntry* entry, ExifData* exif_data, unsigned long required_count, @@ -60,9 +59,8 @@ bool GetRationalsFromEntry(ExifEntry* entry, ExifData* exif_data, unsigned long } return true; - } else { - return false; } + return false; } bool GetGCSPositionFromEntry(ExifEntry* entry, ExifData* exif_data, GCSPosition& out_pos) { @@ -75,9 +73,8 @@ bool GetGCSPositionFromEntry(ExifEntry* entry, ExifData* exif_data, GCSPosition& out_pos.seconds = Rational(exif_get_rational(entry->data + 2 * ExifTypeInfo::RationalSize, order)); return true; - } else { - return false; } + return false; } bool DecomposeExifUndefined(ExifEntry* entry, std::string& type, std::string& value) { -- 2.34.1