X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fvframe.C;h=e6f0d9d5b9d5d56141c5a4e73399cb5cb137cf3a;hb=9db053d413fde01439cc72ec2109913dfda2ec7b;hp=a0a597441876a1e42e27fc2e8074fee2a10f4fe6;hpb=9f917bc27389ebc36568a1f465b42208f7e8e46a;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/guicast/vframe.C b/cinelerra-5.1/guicast/vframe.C index a0a59744..e6f0d9d5 100644 --- a/cinelerra-5.1/guicast/vframe.C +++ b/cinelerra-5.1/guicast/vframe.C @@ -482,6 +482,7 @@ int VFrame::allocate_data(unsigned char *data, int shmid, } else { // Have to use malloc for libpng +//printf("==vframe %d from %p\n", size, __builtin_return_address(0)); this->data = (unsigned char *)malloc(size); } @@ -1081,7 +1082,7 @@ int VFrame::transfer_from(VFrame *that, int bg_color, int in_x, int in_y, int in inp = in_ptrs; } else - inp = that->get_rows(); + inp = that->get_rows(); if( BC_CModels::is_planar(this->get_color_model()) ) { out_ptrs[0] = this->get_y(); out_ptrs[1] = this->get_u(); @@ -1090,7 +1091,7 @@ int VFrame::transfer_from(VFrame *that, int bg_color, int in_x, int in_y, int in outp = out_ptrs; } else - outp = this->get_rows(); + outp = this->get_rows(); BC_CModels::transfer(outp, this->get_color_model(), 0, 0, this->get_w(), this->get_h(), this->get_bytes_per_line(),