TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

regularize allocate()

Browse Source
This commit is contained in:
David Rose 2002-08-05 17:24:00 +00:00
parent d6ed3123bb
commit 0521410926
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
panda/src/express/subStreamBuf.cxx
View File

@ -54,12 +54,19 @@ SubStreamBuf() {
// buffer. // buffer.
_unused = 0; _unused = 0;
#ifndef WIN32_VC
// These lines, which are essential on Irix and Linux, seem to be #ifdef WIN32_VC
// unnecessary and not understood on Windows. // In spite of the claims of the MSDN Library to the contrary,
// Windows doesn't seem to provide an allocate() function, so we'll
// do it by hand.
char *buf = new char[4096];
char *ebuf = buf + 4096;
setg(buf, ebuf, ebuf);
#else
allocate(); allocate();
setg(base(), ebuf(), ebuf()); setg(base(), ebuf(), ebuf());
#endif /* WIN32_VC */ #endif
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -208,15 +215,6 @@ sync() {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
int SubStreamBuf:: int SubStreamBuf::
underflow() { underflow() {
if ((eback() == (char *)NULL) || (gptr() == (char *)NULL) ||
(egptr() == (char *)NULL)) {
// No buffer; allocate a new one. Rumor has it this is only
// possible in Win32.
char *buf = new char[4096];
char *ebuf = buf + 4096;
setg(buf, ebuf, ebuf);
}
// Sometimes underflow() is called even if the buffer is not empty. // Sometimes underflow() is called even if the buffer is not empty.
if (gptr() >= egptr()) { if (gptr() >= egptr()) {
if (_end != (streampos)0 && _cur >= _end) { if (_end != (streampos)0 && _cur >= _end) {