From 02a275302dc62e4af3a9dc6873e1dd08022bfabf Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 4 Jun 2013 11:29:19 +0100
Subject: Allow SoundAssetWriter to be destroyed without being finalised.

---
 src/sound_asset.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index 9b6b48aa..3335f2e3 100644
--- a/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@ -404,5 +404,5 @@ SoundAssetWriter::finalize ()
 
 SoundAssetWriter::~SoundAssetWriter ()
 {
-	assert (_finalized);
+
 }
-- 
cgit v1.2.3


From e1e4934599bc244817ae63f4bc9f4a2ba81b1a29 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 4 Jun 2013 11:35:58 +0100
Subject: Remove _finalized check from picture writer too.

---
 src/picture_asset.cc | 5 -----
 src/picture_asset.h  | 2 --
 src/sound_asset.cc   | 5 -----
 src/sound_asset.h    | 2 --
 4 files changed, 14 deletions(-)

(limited to 'src')

diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index 788e3dc4..0019d562 100644
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -534,8 +534,3 @@ MonoPictureAssetWriter::finalize ()
 	_asset->set_intrinsic_duration (_frames_written);
 	_asset->set_duration (_frames_written);
 }
-
-MonoPictureAssetWriter::~MonoPictureAssetWriter ()
-{
-	assert (_finalized);
-}
diff --git a/src/picture_asset.h b/src/picture_asset.h
index 59c4dc00..2041abb3 100644
--- a/src/picture_asset.h
+++ b/src/picture_asset.h
@@ -113,8 +113,6 @@ struct FrameInfo
 class MonoPictureAssetWriter
 {
 public:
-	~MonoPictureAssetWriter ();
-
 	FrameInfo write (uint8_t* data, int size);
 	void fake_write (int size);
 	void finalize ();
diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index 3335f2e3..efef3ba7 100644
--- a/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@ -401,8 +401,3 @@ SoundAssetWriter::finalize ()
 	_asset->set_intrinsic_duration (_frames_written);
 	_asset->set_duration (_frames_written);
 }
-
-SoundAssetWriter::~SoundAssetWriter ()
-{
-
-}
diff --git a/src/sound_asset.h b/src/sound_asset.h
index 5c230e06..b95b34be 100644
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -37,8 +37,6 @@ class SoundAsset;
 class SoundAssetWriter
 {
 public:
-	~SoundAssetWriter ();
-
 	void write (float const * const *, int);
 	void finalize ();
 
-- 
cgit v1.2.3