Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added wxSound for Windows support (successful WAV playback on VC++ 5)

Browse Source 
Fixes/Updates for the rest.
PNM decoder uses now wxBufferedInputStream to (to be tested).
Support for G72X is on the road ...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guilhem Lavaux
1999-08-25 17:22:26 +00:00
parent 641d87d868
commit 503aa33d55
8 changed files with 652 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/imagpnm.cpp
View File

@@ -64,10 +64,11 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
* Read the PNM header
*/
wxTextInputStream text_stream(stream);
wxBufferedInputStream buf_stream(stream);
wxTextInputStream text_stream(buf_stream);
Skip_Comment(stream);
if (stream.GetC()==_T('P')) c=stream.GetC();
Skip_Comment(buf_stream);
if (buf_stream.GetC()==_T('P')) c=buf_stream.GetC();
switch (c)
{
@@ -84,9 +85,9 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
}
text_stream >> line; // for the \n
Skip_Comment(stream);
Skip_Comment(buf_stream);
text_stream >> width >> height ;
Skip_Comment(stream);
Skip_Comment(buf_stream);
text_stream >> maxval;
//cout << width << " " << height << " " << maxval << endl;
@@ -108,7 +109,7 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
value=text_stream.Read32();
*ptr++=(unsigned char)value;
if (stream.LastError()!=wxSTREAM_NOERROR)
if (buf_stream.LastError()!=wxSTREAM_NOERROR)
{
wxLogError(_T("Loading PNM image : file seems truncated."));
return FALSE;
@@ -116,11 +117,11 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
}
}
if (c=='6') // Raw RGB
stream.Read( ptr, 3*width*height );
buf_stream.Read( ptr, 3*width*height );
image->SetMask( FALSE );
return (stream.LastError()==wxStream_NOERROR || stream.LastError()==wxStream_EOF);
return (buf_stream.LastError()==wxStream_NOERROR || buf_stream.LastError()==wxStream_EOF);
}
bool wxPNMHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool WXUNUSED(verbose) )