X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fvframe.h;h=dc907821efca0fb90f721cb444b6c9127bc21994;hp=5c717200ab16bb7b2099133b40eb174a7716c974;hb=eb9df615719cf3afe2bc08035900e5d3451034e1;hpb=8fd64d1d3770c95e2a7cba1049e909cadb4e1fbf

diff --git a/cinelerra-5.1/guicast/vframe.h b/cinelerra-5.1/guicast/vframe.h
index 5c717200..dc907821 100644
--- a/cinelerra-5.1/guicast/vframe.h
+++ b/cinelerra-5.1/guicast/vframe.h
@@ -35,6 +35,13 @@
 #define MAX_STACK_ELEMENTS 255
 #define SHM_MIN_SIZE 2048
 
+#define ALIAS_OFF 0
+#define ALIAS_TOP 1
+#define ALIAS_CTR 2
+#define ALIAS_BOT 4
+#define ALIAS_DBL 5
+#define ALIAS_NRM 6
+
 // Scene graph for 3D models
 // Defined by the subclass
 class VFrameScene
@@ -49,6 +56,7 @@ public:
 class VFrame
 {
 	friend class VFramePng;
+	friend class VFrameJpeg;
 	friend class PngReadFunction;
 public:
 // Create new frame with shared data if *data is nonzero.
@@ -342,16 +350,20 @@ public:
 	void copy_stacks(VFrame *src);
 // Updates the params with values from src
 	void copy_params(VFrame *src);
-
 // This clears the stacks and the param table
 	void clear_stacks();
 
-	virtual int draw_pixel(int x, int y);
-	int pixel_rgb, pixel_yuv, stipple;
+// pixel drawing
+	virtual int draw_pixel(float x, float y, float a=1.f);
+	virtual int draw_pixel(float x, float y, float frac, int axis);
+	void set_draw_alpha(float a);
+	void set_draw_flags(int flags);
+	int pixel_rgb, pixel_yuv, stipple, draw_flags;
+	float draw_alpha;
 
 	void set_pixel_color(int rgb, int a=0xff);
 	void set_stiple(int mask);
-	void draw_line(int x1, int y1, int x2, int y2);
+	void draw_line(float x1, float y1, float x2, float 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);
@@ -405,7 +417,7 @@ private:
 	{
 		PRIVATE,
 		SHARED,
-		SHMGET
+		SHM_GET
 	};
 
 // Data pointer is pointing to someone else's buffer.
@@ -475,4 +487,21 @@ public:
 	static VFrame *vframe_png(const char *png_path, double xs=1, double ys=1);
 };
 
+// Create a frame with the jpeg image
+//  jpeg_model must be BC_RGB888, BC_YUV888, or BC_GREY8
+class VFrameJpeg : public VFrame
+{
+// Read a JPEG into the frame (no alpha)
+	int read_jpeg(const unsigned char *data, long sz,
+		double xscale, double yscale, int jpeg_model);
+public:
+	VFrameJpeg(const unsigned char *jpeg_data, double s=0);
+	VFrameJpeg(const unsigned char *jpeg_data, long image_size, double xs=0, double ys=0);
+	virtual ~VFrameJpeg();
+	static VFrame *vframe_jpeg(int fd,
+		double xs=1, double ys=1, int jpeg_model=BC_RGB888);
+	static VFrame *vframe_jpeg(const char *jpeg_path,
+		double xs=1, double ys=1, int jpeg_model=BC_RGB888);
+};
+
 #endif