mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-18 12:43:44 -04:00
fix build break
This commit is contained in:
parent
85de2b40df
commit
89f6b97a07
@ -393,13 +393,13 @@ do_read_one(const Filename &fullpath, const Filename &alpha_fullpath,
|
||||
// texture) to the indicated static image.
|
||||
////////////////////////////////////////////////////////////////////
|
||||
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()) {
|
||||
VideoPage &page = modify_page(z);
|
||||
page._color.clear();
|
||||
}
|
||||
|
||||
return Texture::do_load_one(pnmimage, z, n);
|
||||
return Texture::do_load_one(pnmimage, name, z, n);
|
||||
}
|
||||
|
||||
|
||||
|
@ -52,7 +52,8 @@ protected:
|
||||
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);
|
||||
|
||||
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:
|
||||
class VideoPage;
|
||||
|
Loading…
x
Reference in New Issue
Block a user