projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove whitespace at eol
[goodguy/history.git]
/
cinelerra-5.1
/
guicast
/
vframe.h
diff --git
a/cinelerra-5.1/guicast/vframe.h
b/cinelerra-5.1/guicast/vframe.h
index f0d8877727f41543be4551fe294f85d7d63e39b2..adb8d792f1f7727c97028c925b4676872fcce554 100644
(file)
--- a/
cinelerra-5.1/guicast/vframe.h
+++ b/
cinelerra-5.1/guicast/vframe.h
@@
-131,7
+131,10
@@
public:
// direct copy with no alpha
int copy_from(VFrame *frame);
// BC_CModels::transfer
// direct copy with no alpha
int copy_from(VFrame *frame);
// BC_CModels::transfer
- int transfer_from(VFrame *frame, int bg_color=0);
+ int transfer_from(VFrame *frame, int bg_color, int in_x, int in_y, int in_w, int in_h);
+ int transfer_from(VFrame *frame, int bg_color=0) {
+ return transfer_from(frame, bg_color, 0,0, frame->get_w(),frame->get_h());
+ }
// Required for YUV
int clear_frame();
int allocate_compressed_data(long bytes);
// Required for YUV
int clear_frame();
int allocate_compressed_data(long bytes);
@@
-148,7
+151,7
@@
public:
long get_compressed_allocated() { return compressed_allocated; }
long get_compressed_size() { return compressed_size; }
void set_compressed_size(long size) { compressed_size = size; }
long get_compressed_allocated() { return compressed_allocated; }
long get_compressed_size() { return compressed_size; }
void set_compressed_size(long size) { compressed_size = size; }
- double get_timestamp() { return timestamp; }
+ double get_timestamp() { return timestamp; }
void set_timestamp(double time) { timestamp = time; }
// return an array of pointers to rows
void set_timestamp(double time) { timestamp = time; }
// return an array of pointers to rows
@@
-241,8
+244,6
@@
public:
-
-
// ================================ OpenGL functions ===========================
// Defined in vframe3d.C
// Location of working image if OpenGL playback
// ================================ OpenGL functions ===========================
// Defined in vframe3d.C
// Location of working image if OpenGL playback