Browse Source

more oopses

David Rose 17 years ago
parent
commit
06ed6e8cba
2 changed files with 2 additions and 2 deletions
  1. 1 1
      panda/src/grutil/openCVTexture.cxx
  2. 1 1
      panda/src/grutil/openCVTexture.h

+ 1 - 1
panda/src/grutil/openCVTexture.cxx

@@ -181,7 +181,7 @@ do_reconsider_video_properties(const OpenCVTexture::VideoStream &stream,
   }
 
   if (!do_reconsider_image_properties(x_size, y_size, num_components,
-                                   T_unsigned_byte, z)) {
+                                      T_unsigned_byte, z, options)) {
     return false;
   }
 

+ 1 - 1
panda/src/grutil/openCVTexture.h

@@ -47,7 +47,7 @@ public:
 
 protected:
   virtual PT(Texture) do_make_copy();
-  void do_assign(const FFMpegTexture &copy);
+  void do_assign(const OpenCVTexture &copy);
 
   virtual void update_frame(int frame);