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

fix win32 link issue

Browse Source
This commit is contained in:
David Rose 2012-10-01 17:59:36 +00:00
parent bc900d2555
commit a098df8670
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/pnmimage/pfmFile.I
View File

@ -485,7 +485,7 @@ compute_planar_bounds(const LPoint2d &center, PN_float32 point_dist, PN_float32
// floating-point numbers. Use this method at your own // floating-point numbers. Use this method at your own
// risk. // risk.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE const pvector<PN_float32> &PfmFile:: INLINE const vector_float &PfmFile::
get_table() const { get_table() const {
return _table; return _table;
} }
@ -500,6 +500,6 @@ get_table() const {
// this method at your own risk. // this method at your own risk.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void PfmFile:: void PfmFile::
swap_table(pvector<PN_float32> &table) { swap_table(vector_float &table) {
_table.swap(table); _table.swap(table);
} }

7
panda/src/pnmimage/pfmFile.h
View File

@ -19,6 +19,7 @@
#include "pnmImageHeader.h" #include "pnmImageHeader.h"
#include "luse.h" #include "luse.h"
#include "boundingHexahedron.h" #include "boundingHexahedron.h"
#include "vector_float.h"
class PNMImage; class PNMImage;
class PNMReader; class PNMReader;
@ -109,8 +110,8 @@ PUBLISHED:
void output(ostream &out) const; void output(ostream &out) const;
public: public:
INLINE const pvector<PN_float32> &get_table() const; INLINE const vector_float &get_table() const;
INLINE void swap_table(pvector<PN_float32> &table); INLINE void swap_table(vector_float &table);
private: private:
void box_filter_region(PN_float32 &result, void box_filter_region(PN_float32 &result,
@ -149,7 +150,7 @@ private:
static bool has_point_chan4(const PfmFile *file, int x, int y); static bool has_point_chan4(const PfmFile *file, int x, int y);
private: private:
typedef pvector<PN_float32> Table; typedef vector_float Table;
Table _table; Table _table;
PN_float32 _scale; PN_float32 _scale;