TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-05 11:28:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixes a crash when building models after compiling with msvc9

Browse Source
This commit is contained in:
Chris Brunner 2008-09-16 18:57:59 +00:00
parent f5e0ba66ba
commit db18c32b23
1 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
panda/src/mathutil/fftCompressor.cxx
View File

@ -405,9 +405,15 @@ write_hprs(Datagram &datagram, const LVecBase3f *array, int length) {
r.push_back(array[i][2]); r.push_back(array[i][2]);
} }
if (length == 0) {
write_reals(datagram, NULL, length);
write_reals(datagram, NULL, length);
write_reals(datagram, NULL, length);
} else {
write_reals(datagram, &h[0], length); write_reals(datagram, &h[0], length);
write_reals(datagram, &p[0], length); write_reals(datagram, &p[0], length);
write_reals(datagram, &r[0], length); write_reals(datagram, &r[0], length);
}
return; return;
} }
if (_quality >= 103) { if (_quality >= 103) {
@ -432,6 +438,17 @@ write_hprs(Datagram &datagram, const LVecBase3f *array, int length) {
m22.push_back(mat(2, 2)); m22.push_back(mat(2, 2));
} }
if (length == 0) {
write_reals(datagram, NULL, length);
write_reals(datagram, NULL, length);
write_reals(datagram, NULL, length);
write_reals(datagram, NULL, length);
write_reals(datagram, NULL, length);
write_reals(datagram, NULL, length);
write_reals(datagram, NULL, length);
write_reals(datagram, NULL, length);
write_reals(datagram, NULL, length);
} else {
write_reals(datagram, &m00[0], length); write_reals(datagram, &m00[0], length);
write_reals(datagram, &m01[0], length); write_reals(datagram, &m01[0], length);
write_reals(datagram, &m02[0], length); write_reals(datagram, &m02[0], length);
@ -441,6 +458,7 @@ write_hprs(Datagram &datagram, const LVecBase3f *array, int length) {
write_reals(datagram, &m20[0], length); write_reals(datagram, &m20[0], length);
write_reals(datagram, &m21[0], length); write_reals(datagram, &m21[0], length);
write_reals(datagram, &m22[0], length); write_reals(datagram, &m22[0], length);
}
return; return;
} }
#endif #endif
@ -515,13 +533,23 @@ write_hprs(Datagram &datagram, const LVecBase3f *array, int length) {
// instead of just the three. This is just for debugging. // instead of just the three. This is just for debugging.
#ifndef NDEBUG #ifndef NDEBUG
if (_quality >= 102) { if (_quality >= 102) {
if (length == 0) {
write_reals(datagram, NULL, length);
} else {
write_reals(datagram, &qr[0], length); write_reals(datagram, &qr[0], length);
} }
}
#endif #endif
if (length == 0) {
write_reals(datagram, NULL, length);
write_reals(datagram, NULL, length);
write_reals(datagram, NULL, length);
} else {
write_reals(datagram, &qi[0], length); write_reals(datagram, &qi[0], length);
write_reals(datagram, &qj[0], length); write_reals(datagram, &qj[0], length);
write_reals(datagram, &qk[0], length); write_reals(datagram, &qk[0], length);
} }
}
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: FFTCompressor::read_header // Function: FFTCompressor::read_header