Merge pull request #155 from davidgiven/amigawriter

Fix stray bytes at the end of images
davidgiven · Apr 7, 2020 · 5be7249 · 5be7249
2 parents 8dbd2a7 + 067af18
commit 5be7249
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/lib/bytes.cc b/lib/bytes.cc
@@ -258,6 +258,11 @@ void Bytes::writeToFile(const std::string& filename) const
     f.close();
 }
 
+void Bytes::writeTo(std::ostream& stream) const
+{
+	stream.write((const char*) cbegin(), size());
+}
+
 ByteReader Bytes::reader() const
 {
     return ByteReader(*this);

diff --git a/lib/bytes.h b/lib/bytes.h
@@ -57,6 +57,7 @@ class Bytes
     ByteWriter writer();
 
     void writeToFile(const std::string& filename) const;
+	void writeTo(std::ostream& stream) const;
 
 private:
     std::shared_ptr<std::vector<uint8_t>> _data;

diff --git a/lib/imagewriter/imgimagewriter.cc b/lib/imagewriter/imgimagewriter.cc
@@ -46,7 +46,7 @@ class ImgImageWriter : public ImageWriter
 					if (sector)
 					{
 						outputFile.seekp(sector->logicalTrack*trackSize + sector->logicalSide*headSize + sector->logicalSector*numBytes, std::ios::beg);
-						outputFile.write((const char*) sector->data.cbegin(), sector->data.size());
+						sector->data.slice(0, numBytes).writeTo(outputFile);
 					}
 				}
 			}