[Exif] Fixing warning: control reaches end of non-void function 42/159042/3
authorSzymon Jastrzebski <s.jastrzebsk@partner.samsung.com>
Tue, 7 Nov 2017 10:44:27 +0000 (11:44 +0100)
committerPiotr Kosko <p.kosko@samsung.com>
Tue, 7 Nov 2017 12:58:55 +0000 (12:58 +0000)
[Verification] Code compiles

Change-Id: I8d89d09dc864bfa4b43f2aec78327a38a0960c81
Signed-off-by: Szymon Jastrzebski <s.jastrzebsk@partner.samsung.com>
src/exif/get_exif_info.cc

index e80f8f09c7f7df4893375f510e1123d8cc380843..a5e4e81c25dbd5712ebd942bf4d9f46f613da598 100644 (file)
@@ -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) {