Fix clang warnings

nokiatech · Jun 20, 2016 · f23fcf8 · f23fcf8
1 parent f22d3a0
commit f23fcf8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/Srcs/common/hevcsampleentry.hpp b/Srcs/common/hevcsampleentry.hpp
@@ -43,12 +43,12 @@ class HevcSampleEntry : public VisualSampleEntryBox
 
     /** @brief Creates the bitstream that represents the box in the ISOBMFF file
      *  @param [out] bitstr Bitstream that contains the box data. */
-    virtual void writeBox(BitStream& bitstr);
+    virtual void writeBox(BitStream& bitstr) override;
 
     /** @brief Parses a HevcSampleEntry Box bitstream and fills in the necessary member variables
      *  @details If there is an unknown box present then a warning is logged
      *  @param [in]  bitstr Bitstream that contains the box data */
-    virtual void parseBox(BitStream& bitstr);
+    virtual void parseBox(BitStream& bitstr) override;
 
 private:
     HevcConfigurationBox mHevcConfigurationBox;

diff --git a/Srcs/common/itemreferencebox.cpp b/Srcs/common/itemreferencebox.cpp
@@ -157,7 +157,7 @@ std::vector<SingleItemTypeReferenceBox> ItemReferenceBox::getReferencesOfType(co
             references.push_back(reference);
         }
     }
-    return std::move(references);
+    return references;
 }
 
 void ItemReferenceBox::add(const std::string& type, const std::uint32_t fromId, const std::uint32_t toId)

diff --git a/Srcs/reader/hevcimagefilereader.cpp b/Srcs/reader/hevcimagefilereader.cpp
@@ -1507,8 +1507,6 @@ HevcImageFileReader::Properties HevcImageFileReader::processItemProperties(const
     const std::vector<uint32_t> itemIds = mMetaBoxMap.at(contextId).getItemInfoBox().getItemIds();
     for (const auto itemId : itemIds)
     {
-        const ItemInfoEntry& item = mMetaBoxMap.at(contextId).getItemInfoBox().getItemById(itemId);
-
         ItemPropertiesBox::PropertyInfos propertyVector = iprp.getItemProperties(itemId);
 
         // The following loop copies item property information to interface. Data structures are essentially identical
@@ -1624,7 +1622,7 @@ std::vector<std::uint8_t> HevcImageFileReader::loadItemData(const MetaBox& metaB
     std::vector<uint8_t> data;
     readItem(metaBox, itemId, data);
     mInputStream->seekg(oldPosition);
-    return std::move(data);
+    return data;
 }
 
 /** @details Method can not handle items located in different files. Therefore also zero length items are not supported.

diff --git a/Srcs/writer/filewriter.cpp b/Srcs/writer/filewriter.cpp
@@ -346,7 +346,7 @@ BitStream FileWriter::writeFtyp(const IsoMediaFile::Brands& config)
 
     ftypBox = ftypWriter.writeBox(output);
     mBoxSizes.insert(std::make_pair(OffsetMapKeys::FTYP, ftypBox.getSize()));
-    return std::move(output);
+    return output;
 }
 
 BitStream FileWriter::writeMeta(const OffsetMap& offsets)
@@ -422,7 +422,7 @@ std::vector<MediaDataBox> FileWriter::writeMdat()
         mBoxSizes.insert(std::make_pair(mediaWriter.first, boxes.back().getSize()));
     }
 
-    return std::move(boxes);
+    return boxes;
 }
 
 FileWriter::OffsetMap FileWriter::makeOffsetMap(const SizesMap& boxSizes) const

diff --git a/Srcs/writer/trackwriter.cpp b/Srcs/writer/trackwriter.cpp
@@ -262,7 +262,7 @@ std::unique_ptr<HevcSampleEntry> TrackWriter::getHevcSampleEntry()
     hevcSampleEntry->setWidth(imageWidth);
     hevcSampleEntry->setHeight(imageHeight);
 
-    return std::move(hevcSampleEntry);
+    return hevcSampleEntry;
 }