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

minor compilation issues

Browse Source
This commit is contained in:
David Rose 2016-04-28 16:14:44 -07:00
parent 723c1de520
commit 063f9bbc4d
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/express/zStreamBuf.cxx
View File

@ -178,7 +178,7 @@ streampos ZStreamBuf::
seekoff(streamoff off, ios_seekdir dir, ios_openmode which) { seekoff(streamoff off, ios_seekdir dir, ios_openmode which) {
// Necessary for tellg() to work after seeking to 0. // Necessary for tellg() to work after seeking to 0.
if (dir == ios::cur && off == 0) { if (dir == ios::cur && off == 0) {
if (_source->tellg() == 0) { if (_source->tellg() == (streampos)0) {
return 0; return 0;
} else { } else {
return -1; return -1;
@ -199,7 +199,7 @@ seekoff(streamoff off, ios_seekdir dir, ios_openmode which) {
gbump(n); gbump(n);
_source->seekg(0, ios::beg); _source->seekg(0, ios::beg);
if (_source->tellg() == 0) { if (_source->tellg() == (streampos)0) {
_z_source.next_in = Z_NULL; _z_source.next_in = Z_NULL;
_z_source.avail_in = 0; _z_source.avail_in = 0;
_z_source.next_out = Z_NULL; _z_source.next_out = Z_NULL;

2
panda/src/grutil/shaderTerrainMesh.cxx
View File

@ -386,7 +386,7 @@ void ShaderTerrainMesh::do_create_chunk_geom() {
vtx_pos.set_x(max(0.0f, min(1.0f, vtx_pos.get_x()))); vtx_pos.set_x(max(0.0f, min(1.0f, vtx_pos.get_x())));
vtx_pos.set_y(max(0.0f, min(1.0f, vtx_pos.get_y()))); vtx_pos.set_y(max(0.0f, min(1.0f, vtx_pos.get_y())));
} }
vertex_writer.add_data3f(vtx_pos); vertex_writer.add_data3(vtx_pos);
} }
} }

6
panda/src/movies/dr_flac.h
View File

@ -332,11 +332,7 @@ static drflac* drflac_open_memory(const void* data, size_t dataSize);
#include <endian.h> #include <endian.h>
#endif #endif
#ifdef _MSC_VER #define DRFLAC_INLINE ALWAYS_INLINE
#define DRFLAC_INLINE __forceinline
#else
#define DRFLAC_INLINE inline
#endif
#define DRFLAC_BLOCK_TYPE_STREAMINFO 0 #define DRFLAC_BLOCK_TYPE_STREAMINFO 0
#define DRFLAC_BLOCK_TYPE_PADDING 1 #define DRFLAC_BLOCK_TYPE_PADDING 1

4
panda/src/pnmimagetypes/pnmFileTypeStbImage.cxx
View File

@ -276,7 +276,7 @@ read_pfm(PfmFile &pfm) {
// Reposition the file at the beginning. // Reposition the file at the beginning.
_file->seekg(0, ios::beg); _file->seekg(0, ios::beg);
if (_file->tellg() != 0) { if (_file->tellg() != (streampos)0) {
pnmimage_cat.error() pnmimage_cat.error()
<< "Could not reposition file pointer to the beginning.\n"; << "Could not reposition file pointer to the beginning.\n";
return false; return false;
@ -427,7 +427,7 @@ int StbImageReader::
read_data(xel *array, xelval *alpha) { read_data(xel *array, xelval *alpha) {
// Reposition the file at the beginning. // Reposition the file at the beginning.
_file->seekg(0, ios::beg); _file->seekg(0, ios::beg);
if (_file->tellg() != 0) { if (_file->tellg() != (streampos)0) {
pnmimage_cat.error() pnmimage_cat.error()
<< "Could not reposition file pointer to the beginning.\n"; << "Could not reposition file pointer to the beginning.\n";
return 0; return 0;