From 22fa5dff1e35ae5bf08b82d3d25270e4eda04ed1 Mon Sep 17 00:00:00 2001 From: David Rose Date: Fri, 17 Jun 2011 17:36:50 +0000 Subject: [PATCH] fix MovieTexture::orig_file_size bug --- panda/src/grutil/movieTexture.cxx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/panda/src/grutil/movieTexture.cxx b/panda/src/grutil/movieTexture.cxx index 16723096f8..0244c2f0e9 100644 --- a/panda/src/grutil/movieTexture.cxx +++ b/panda/src/grutil/movieTexture.cxx @@ -199,7 +199,12 @@ do_recalculate_image_properties(CDWriter &cdata, const LoaderOptions &options) { do_reconsider_image_properties(x_max, y_max, alpha?4:3, T_unsigned_byte, cdata->_pages.size(), options); - do_set_pad_size(x_max - x_size, y_max - y_size, 0); + _orig_file_x_size = cdata->_video_width; + _orig_file_y_size = cdata->_video_height; + + do_set_pad_size(max(_x_size - _orig_file_x_size, 0), + max(_y_size - _orig_file_y_size, 0), + 0); } ////////////////////////////////////////////////////////////////////