TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 01:44:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix another deadlock

Browse Source
This commit is contained in:
rdb 2009-05-19 06:20:03 +00:00
parent 5fc21e0779
commit 490eeac5ba
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,7 +249,7 @@ update_frame(int frame, int z) {
const unsigned char *source = page._color.get_frame_data(frame); const unsigned char *source = page._color.get_frame_data(frame);
if (source != NULL) { if (source != NULL) {
nassertv(get_video_width() <= _x_size && get_video_height() <= _y_size); nassertv(get_video_width() <= _x_size && get_video_height() <= _y_size);
unsigned char *dest = _ram_images[0]._image.p() + get_expected_ram_page_size() * z; unsigned char *dest = _ram_images[0]._image.p() + do_get_expected_ram_page_size() * z;
int dest_row_width = (_x_size * _num_components * _component_width); int dest_row_width = (_x_size * _num_components * _component_width);
int source_row_width = get_video_width() * 3; int source_row_width = get_video_width() * 3;
@ -288,7 +288,7 @@ update_frame(int frame, int z) {
const unsigned char *source = page._alpha.get_frame_data(frame); const unsigned char *source = page._alpha.get_frame_data(frame);
if (source != NULL) { if (source != NULL) {
nassertv(get_video_width() <= _x_size && get_video_height() <= _y_size); nassertv(get_video_width() <= _x_size && get_video_height() <= _y_size);
unsigned char *dest = _ram_images[0]._image.p() + get_expected_ram_page_size() * z; unsigned char *dest = _ram_images[0]._image.p() + do_get_expected_ram_page_size() * z;
int dest_row_width = (_x_size * _num_components * _component_width); int dest_row_width = (_x_size * _num_components * _component_width);
int source_row_width = get_video_width() * 3; int source_row_width = get_video_width() * 3;