X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcxfer.h;h=d743956fe66e6acda66fd1f4b0a958998ff50b4d;hb=refs%2Fheads%2Fmaster;hp=efcbc41fb70109a5277f641b80dcd9a27e2cca29;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/guicast/bcxfer.h b/cinelerra-5.1/guicast/bcxfer.h
index efcbc41f..0ac9efcd 100644
--- a/cinelerra-5.1/guicast/bcxfer.h
+++ b/cinelerra-5.1/guicast/bcxfer.h
@@ -1,3 +1,24 @@
+/*
+ * CINELERRA
+ * Copyright (C) 2016-2020 William Morrow
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
 #include "bccmodels.h"
 #include "bcresources.h"
 #include "condition.h"
@@ -32,6 +53,9 @@ ZTYP(float);
     for( unsigned j=0; j<out_w; ++j ) { \
       ity_t *inp = (ity_t *)(inp_row + column_table[j]); \
 
+#define xfer_clear(s) \
+    for( unsigned j=0; j<out_w; ++j ) { \
+
 #define xfer_end } }
 
 // yuv420p  2x2
@@ -216,15 +240,16 @@ class BC_Xfer {
   BC_Xfer(const BC_Xfer&) {}
 public:
   BC_Xfer(uint8_t **output_rows, uint8_t **input_rows,
-    uint8_t *out_yp, uint8_t *out_up, uint8_t *out_vp,
-    uint8_t *in_yp, uint8_t *in_up, uint8_t *in_vp,
-    int in_x, int in_y, int in_w, int in_h, int out_x, int out_y, int out_w, int out_h,
-    int in_colormodel, int out_colormodel, int bg_color, int in_rowspan, int out_rowspan);
+  uint8_t *out_yp, uint8_t *out_up, uint8_t *out_vp,
+  uint8_t *in_yp, uint8_t *in_up, uint8_t *in_vp,
+  int in_x, int in_y, int in_w, int in_h, int out_x, int out_y, int out_w, int out_h,
+  int in_colormodel, int out_colormodel, int bg_color, int bg_alpha,
+  int in_rowspan, int out_rowspan);
   BC_Xfer(uint8_t **output_ptrs, int out_colormodel,
       int out_x, int out_y, int out_w, int out_h, int out_rowspan,
     uint8_t **input_ptrs, int in_colormodel,
       int in_x, int in_y, int in_w, int in_h, int in_rowspan,
-    int bg_color);
+    int bg_color, int bg_alpha);
   ~BC_Xfer();
 
   uint8_t **output_rows, **input_rows;
@@ -233,14 +258,15 @@ public:
   int in_x, in_y; unsigned in_w, in_h;
   int out_x, out_y; unsigned out_w, out_h;
   int in_colormodel, out_colormodel;
-  uint32_t bg_color, total_in_w, total_out_w;
+  uint32_t total_in_w, total_out_w;
   int scale;
   int out_pixelsize, in_pixelsize;
   int *row_table, *column_table;
-  uint32_t bg_r, bg_g, bg_b;
+  uint32_t bg_r, bg_g, bg_b, bg_a;
+  float bg_fr, bg_fg, bg_fb, bg_fa;
 
-  void xfer();
-  void xfer_slices(int slices);
+  int xfer();
+  int xfer_slices(int slices);
   typedef void (BC_Xfer::*xfer_fn)(unsigned y0, unsigned y1);
   xfer_fn xfn;
 
@@ -270,6 +296,6 @@ public:
       uint8_t *out_yp, uint8_t *out_up, uint8_t *out_vp, uint8_t *out_ap, int out_rowspan,
     uint8_t **input_rows, int in_colormodel, int in_x, int in_y, int in_w, int in_h,
       uint8_t *in_yp, uint8_t *in_up, uint8_t *in_vp, uint8_t *in_ap, int in_rowspan,
-    int bg_color);
+    int bg_color, int bg_alpha);
 
 // generated code concatentated here