Remove use after moves (#1155)

* Remove use after moves

* Remove unnecessary dependency

android/filamat-android/CMakeLists.txt

@@ -14,10 +14,6 @@ add_library(filabridge STATIC IMPORTED)
 set_target_properties(filabridge PROPERTIES IMPORTED_LOCATION
         ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libfilabridge.a)
 
-add_library(backend STATIC IMPORTED)
-set_target_properties(backend PROPERTIES IMPORTED_LOCATION
-        ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libbackend.a)
-
 add_library(smol-v STATIC IMPORTED)
 set_target_properties(smol-v PROPERTIES IMPORTED_LOCATION
         ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libsmol-v.a)
@@ -46,7 +42,6 @@ add_library(filamat-jni SHARED
 target_link_libraries(filamat-jni
         filamat
         filabridge
-        backend
         shaders
         utils
         log

libs/filamat/CMakeLists.txt

@@ -61,7 +61,7 @@ include_directories(${CMAKE_BINARY_DIR})
 add_library(${TARGET} STATIC ${HDRS} ${PRIVATE_HDRS} ${SRCS})
 target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
 
-target_link_libraries(${TARGET} shaders filabridge backend utils smol-v)
+target_link_libraries(${TARGET} shaders filabridge utils smol-v)
 
 # We are being naughty and accessing private headers here
 # For spirv-tools, we're just following glslang's example

libs/filamat/src/eiff/BlobDictionary.cpp

@@ -45,9 +45,10 @@ size_t BlobDictionary::addBlob(const std::vector<uint32_t>& vblob) noexcept {
         return iter->second;
     }
     mBlobIndices[blob] = mBlobs.size();
+    size_t size = blob.size();
     mBlobs.push_back(std::move(blob));
-    mStorageSize += blob.size();
-    return mBlobs.size() - 1;
+    mStorageSize += size;
+    return size - 1;
 }
 
 } // namespace filamat

libs/filamat/src/eiff/Chunk.cpp

@@ -21,7 +21,6 @@ namespace filamat {
 Chunk::Chunk(ChunkType type) : mType(type), mFlattenedSize(0) {
 }
 
-Chunk::~Chunk() {
-}
+Chunk::~Chunk() = default;
 
 } // namespace filamat

libs/filamat/src/eiff/LineDictionary.cpp

@@ -66,8 +66,9 @@ void LineDictionary::addLine(const std::string&& line) noexcept {
     }
 
     mLineIndices[line] = mStrings.size();
+    size_t size = line.size();
     mStrings.push_back(std::move(line));
-    mStorageSize += line.size() + 1;
+    mStorageSize += size + 1;
 }
 
 } // namespace filamat