From 06ed6e8cba23e5993112e3c853727af93a559291 Mon Sep 17 00:00:00 2001 From: David Rose Date: Tue, 21 Oct 2008 18:43:58 +0000 Subject: [PATCH] more oopses --- panda/src/grutil/openCVTexture.cxx | 2 +- panda/src/grutil/openCVTexture.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/panda/src/grutil/openCVTexture.cxx b/panda/src/grutil/openCVTexture.cxx index 21539e1d43..a212d52f54 100644 --- a/panda/src/grutil/openCVTexture.cxx +++ b/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; } diff --git a/panda/src/grutil/openCVTexture.h b/panda/src/grutil/openCVTexture.h index d18d9aaba0..f501cb2256 100644 --- a/panda/src/grutil/openCVTexture.h +++ b/panda/src/grutil/openCVTexture.h @@ -47,7 +47,7 @@ public: protected: virtual PT(Texture) do_make_copy(); - void do_assign(const FFMpegTexture ©); + void do_assign(const OpenCVTexture ©); virtual void update_frame(int frame);