[OMPT-svn-commit] SF.net SVN: modplug:[4310] trunk/OpenMPT

[<man...@us...>]

Revision: 4310
          http://sourceforge.net/p/modplug/code/4310
Author:   manxorist
Date:     2014-09-24 15:16:00 +0000 (Wed, 24 Sep 2014)
Log Message:
-----------
[Ref] mptIO: Allow NULL FILE* in mpt::FILE_ostream and related streambufs.
[Fix] IT Compression: WriteSample(f=NULL, ...) broke for IT compressed samples in r4309 .

Revision Links:
--------------
    http://sourceforge.net/p/modplug/code/4309

Modified Paths:
--------------
    trunk/OpenMPT/common/mptIO.h
    trunk/OpenMPT/soundlib/SampleIO.cpp

Modified: trunk/OpenMPT/common/mptIO.h
===================================================================
--- trunk/OpenMPT/common/mptIO.h	2014-09-24 14:25:52 UTC (rev 4309)
+++ trunk/OpenMPT/common/mptIO.h	2014-09-24 15:16:00 UTC (rev 4310)
@@ -374,10 +374,13 @@
 // Only output functionality is implemented because we have no need for an input wrapper.
 //
 // During the whole lifetime of the iostream wrappers, the FILE* object is assumend to be
-//  - valid
-//  - opened for writing in non-append mode
-//  - opened in binary mode
-//  - seekable
+//  either
+//   - NULL
+//  or
+//   - valid
+//   - opened for writing in non-append mode
+//   - opened in binary mode
+//   - seekable
 // Some of these preconditions cannot be verified,
 //  and even the others do not get verified.
 // Behaviour in case of any unmet preconditions is undefined.
@@ -417,6 +420,10 @@
 protected:
 	virtual int_type overflow(int_type ch)
 	{
+		if(!mpt::IO::IsValid(f))
+		{
+			return traits_type::eof();
+		}
 		if(traits_type::eq_int_type(ch, traits_type::eof()))
 		{
 			return traits_type::eof();
@@ -430,6 +437,10 @@
 	}
 	virtual int sync()
 	{
+		if(!mpt::IO::IsValid(f))
+		{
+			return -1;
+		}
 		if(!mpt::IO::Flush(f))
 		{
 			return -1;
@@ -438,10 +449,18 @@
 	}
 	virtual pos_type seekpos(pos_type pos, std::ios_base::openmode which)
 	{
+		if(!mpt::IO::IsValid(f))
+		{
+			return pos_type(off_type(-1));
+		}
 		return seekoff(pos, std::ios_base::beg, which);
 	}
 	virtual pos_type seekoff(off_type off, std::ios_base::seekdir dir, std::ios_base::openmode which)
 	{
+		if(!mpt::IO::IsValid(f))
+		{
+			return pos_type(off_type(-1));
+		}
 		if(which & std::ios_base::in)
 		{
 			return pos_type(off_type(-1));
@@ -507,6 +526,10 @@
 	}
 	~FILE_output_buffered_streambuf()
 	{
+		if(!mpt::IO::IsValid(f))
+		{
+			return;
+		}
 		WriteOut();
 	}
 private:
@@ -523,6 +546,10 @@
 protected:
 	virtual int_type overflow(int_type ch)
 	{
+		if(!mpt::IO::IsValid(f))
+		{
+			return traits_type::eof();
+		}
 		if(traits_type::eq_int_type(ch, traits_type::eof()))
 		{
 			return traits_type::eof();
@@ -538,6 +565,10 @@
 	}
 	virtual int sync()
 	{
+		if(!mpt::IO::IsValid(f))
+		{
+			return -1;
+		}
 		if(!WriteOut())
 		{
 			return -1;
@@ -546,6 +577,10 @@
 	}
 	virtual pos_type seekpos(pos_type pos, std::ios_base::openmode which)
 	{
+		if(!mpt::IO::IsValid(f))
+		{
+			return pos_type(off_type(-1));
+		}
 		if(!WriteOut())
 		{
 			return pos_type(off_type(-1));
@@ -554,6 +589,10 @@
 	}
 	virtual pos_type seekoff(off_type off, std::ios_base::seekdir dir, std::ios_base::openmode which)
 	{
+		if(!mpt::IO::IsValid(f))
+		{
+			return pos_type(off_type(-1));
+		}
 		if(!WriteOut())
 		{
 			return pos_type(off_type(-1));
@@ -573,13 +612,13 @@
 		, f(f)
 		, buf(f, bufSize)
 	{
-		mpt::IO::Flush(f);
+		if(mpt::IO::IsValid(f)) mpt::IO::Flush(f);
 	}
 	~FILE_ostream()
 	{
 		flush();
 		buf.pubsync();
-		mpt::IO::Flush(f);
+		if(mpt::IO::IsValid(f)) mpt::IO::Flush(f);
 	}
 }; // class FILE_ostream                                                                                        
 

Modified: trunk/OpenMPT/soundlib/SampleIO.cpp
===================================================================
--- trunk/OpenMPT/soundlib/SampleIO.cpp	2014-09-24 14:25:52 UTC (rev 4309)
+++ trunk/OpenMPT/soundlib/SampleIO.cpp	2014-09-24 15:16:00 UTC (rev 4310)
@@ -738,7 +738,7 @@
 	{
 		// IT2.14-encoded samples
 		mpt::FILE_ostream s(f);
-		ITCompression its(sample, GetEncoding() == IT215, &s);
+		ITCompression its(sample, GetEncoding() == IT215, f ? &s : nullptr);
 		len = its.GetCompressedSize();
 	}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.