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

fix build break

Browse Source
This commit is contained in:
David Rose 2006-06-15 01:54:11 +00:00
parent 85de2b40df
commit 89f6b97a07
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/grutil/ffmpegTexture.cxx
View File

@ -393,13 +393,13 @@ do_read_one(const Filename &fullpath, const Filename &alpha_fullpath,
// texture) to the indicated static image. // texture) to the indicated static image.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
bool FFMpegTexture:: bool FFMpegTexture::
do_load_one(const PNMImage &pnmimage, int z, int n) { do_load_one(const PNMImage &pnmimage, const string &name, int z, int n) {
if (z <= (int)_pages.size()) { if (z <= (int)_pages.size()) {
VideoPage &page = modify_page(z); VideoPage &page = modify_page(z);
page._color.clear(); page._color.clear();
} }
return Texture::do_load_one(pnmimage, z, n); return Texture::do_load_one(pnmimage, name, z, n);
} }

3
panda/src/grutil/ffmpegTexture.h
View File

@ -52,7 +52,8 @@ protected:
virtual bool do_read_one(const Filename &fullpath, const Filename &alpha_fullpath, virtual bool do_read_one(const Filename &fullpath, const Filename &alpha_fullpath,
int z, int n, int primary_file_num_channels, int alpha_file_channel); int z, int n, int primary_file_num_channels, int alpha_file_channel);
virtual bool do_load_one(const PNMImage &pnmimage, int z, int n); virtual bool do_load_one(const PNMImage &pnmimage, const string &name,
int z, int n);
private: private:
class VideoPage; class VideoPage;