diff --git a/panda/src/pnmimage/pfmFile.I b/panda/src/pnmimage/pfmFile.I index ea38adbecd..1158b675c0 100644 --- a/panda/src/pnmimage/pfmFile.I +++ b/panda/src/pnmimage/pfmFile.I @@ -485,7 +485,7 @@ compute_planar_bounds(const LPoint2d ¢er, PN_float32 point_dist, PN_float32 // floating-point numbers. Use this method at your own // risk. //////////////////////////////////////////////////////////////////// -INLINE const pvector &PfmFile:: +INLINE const vector_float &PfmFile:: get_table() const { return _table; } @@ -500,6 +500,6 @@ get_table() const { // this method at your own risk. //////////////////////////////////////////////////////////////////// void PfmFile:: -swap_table(pvector &table) { +swap_table(vector_float &table) { _table.swap(table); } diff --git a/panda/src/pnmimage/pfmFile.h b/panda/src/pnmimage/pfmFile.h index ed317fcf17..7af3ab0fda 100644 --- a/panda/src/pnmimage/pfmFile.h +++ b/panda/src/pnmimage/pfmFile.h @@ -19,6 +19,7 @@ #include "pnmImageHeader.h" #include "luse.h" #include "boundingHexahedron.h" +#include "vector_float.h" class PNMImage; class PNMReader; @@ -109,8 +110,8 @@ PUBLISHED: void output(ostream &out) const; public: - INLINE const pvector &get_table() const; - INLINE void swap_table(pvector &table); + INLINE const vector_float &get_table() const; + INLINE void swap_table(vector_float &table); private: void box_filter_region(PN_float32 &result, @@ -149,7 +150,7 @@ private: static bool has_point_chan4(const PfmFile *file, int x, int y); private: - typedef pvector Table; + typedef vector_float Table; Table _table; PN_float32 _scale;