X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbccmdl.py;h=97b2fc0ebfa78b881eccb85e87d6ff40642e83b0;hb=5c1aff2fd123b65be6e51ca7652185e14ddaf168;hp=bae50c50a119b5c9245e702a89d7d5b833f1e030;hpb=8f0d97d1da0cd4cfcacf76c2c1788204749b6757;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/bccmdl.py b/cinelerra-5.1/guicast/bccmdl.py
index bae50c50..97b2fc0e 100755
--- a/cinelerra-5.1/guicast/bccmdl.py
+++ b/cinelerra-5.1/guicast/bccmdl.py
@@ -327,17 +327,17 @@ base = {
 
   "gbrp": {
     "i8": {
-      "r": " int g = *gip++, b = *bip++, r = *rip++;",
-      "w": " *gop++ = g; *bop++ = b; *rop++ = r;",
+      "r": " int g = *rip++, b = *gip++, r = *bip++;",
+      "w": " *rop++ = g; *gop++ = b; *bop++ = r;",
     },
     "i16": {
-      "r": " int ig = *gip++, g = (ig<<8) | ig, ib = *bip++, b = (ib<<8) | ib," +
-           " ir = *rip++, r = (ir<<8) | ir;",
-      "w": " *gop++ = g >> 8; *bop++ = b >> 8; *rop++ = r >> 8;",
+      "r": " int ig = *rip++, g = (ig<<8) | ig, ib = *gip++, b = (ib<<8) | ib," +
+           " ir = *bip++, r = (ir<<8) | ir;",
+      "w": " *rop++ = g >> 8; *gop++ = b >> 8; *bop++ = r >> 8;",
     },
     "fp": {
-      "r": " float g = *gip++/255.f, b = *bip++/255.f, r = *rip++/255.f;",
-      "w": " *gop++ = clp(256,g); *bop++ = clp(256,b); *rop++ = clp(256,r);",
+      "r": " float g = *rip++/255.f, b = *gip++/255.f, r = *bip++/255.f;",
+      "w": " *rop++ = clp(256,g); *gop++ = clp(256,b); *bop++ = clp(256,r);",
     },
   },
 
@@ -628,7 +628,7 @@ class_qual = "BC_Xfer::"
 xfn = "xfer/xfer.h"
 fd = open(xfn, "w")
 xid = "".join([chr(x) if chr(x).isalnum() else '_' for x in range(256)])
-xid = "__" + xfn.upper()[xfn.rfind("/")+1:].translate("".join(xid)) + "__"
+xid = "__" + xfn.upper()[xfn.rfind("/")+1:].translate(xid) + "__"
 print >>fd, "#ifndef %s" % xid
 print >>fd, "#define %s" % xid
 print >>fd, ""