X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fvframe.h;h=951e0364b92869a55df2da2f957dbdb1fcdc323b;hp=dacbe712d879d8544ddb19b489bde7a2c94cdef7;hb=9d832a1fff11b11aaa1108c460690ed05e2bdc05;hpb=5a1b2bb96f2bd6b7ef4f8031763683726c02219d

diff --git a/cinelerra-5.1/guicast/vframe.h b/cinelerra-5.1/guicast/vframe.h
index dacbe712..951e0364 100644
--- a/cinelerra-5.1/guicast/vframe.h
+++ b/cinelerra-5.1/guicast/vframe.h
@@ -151,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; }
-	double get_timestamp() { return timestamp; } 
+	double get_timestamp() { return timestamp; }
 	void set_timestamp(double time) { timestamp = time; }
 
 // return an array of pointers to rows
@@ -200,9 +200,6 @@ public:
 // Set keyframe status
 	void set_keyframe(int value);
 	int get_keyframe();
-// Overlay src onto this with blending and translation of input.
-// Source and this must have alpha
-	void overlay(VFrame *src, int out_x1, int out_y1);
 
 // If the opengl state is RAM, transfer image from RAM to the texture
 // referenced by this frame.
@@ -344,10 +341,20 @@ public:
 // This clears the stacks and the param table
 	void clear_stacks();
 
-	void draw_rect(int x1, int y1, int x2, int y2);
+	int (VFrame::*draw_point)(int x, int y);
+	int pixel_rgb, pixel_yuv, stipple;
+
+	void set_pixel_color(int rgb);
+	void set_stiple(int mask);
+	int draw_pixel(int x, int y);
 	void draw_line(int x1, int y1, int x2, int y2);
-	void draw_pixel(int x, int y);
-	void draw_arrow(int x1, int y1, int x2, int y2);
+	void draw_smooth(int x1, int y1, int x2, int y2, int x3, int y3);
+	void smooth_draw(int x1, int y1, int x2, int y2, int x3, int y3);
+	void draw_rect(int x1, int y1, int x2, int y2);
+	void draw_arrow(int x1, int y1, int x2, int y2, int sz=10);
+	void draw_x(int x1, int y1, int sz=2);
+	void draw_t(int x1, int y1, int sz=2);
+	void draw_oval(int x1, int y1, int x2, int y2);
 
 // 3D scene graphs
 // Not integrated with shmem because that only affects codecs
@@ -455,9 +462,11 @@ class VFramePng : public VFrame {
 // Read a PNG into the frame with alpha
 	int read_png(const unsigned char *data, long image_size, double xscale, double yscale);
 public:
-	VFramePng(unsigned char *png_data, double scale=0);
+	VFramePng(unsigned char *png_data, double s=0);
 	VFramePng(unsigned char *png_data, long image_size, double xs=0, double ys=0);
 	~VFramePng();
+	static VFrame *vframe_png(int fd, double xs=1, double ys=1);
+	static VFrame *vframe_png(const char *png_path, double xs=1, double ys=1);
 };
 
 #endif