Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-08-16 10:38:30 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-08-16 10:38:30 +0400
commit8177a765ab1892aa570eaee2275552dd0a29bb6c (patch)
treeafbabf21437935fa0f0ff9938a91d0827a5c8eb0
parentd1759639dc5a02d2ccde16d1c2fb1e951b15f1ea (diff)
jp2.c has a non-utf8 char which stopped python from reading it, removed unused vars from CMP_chromaMatte.c
-rw-r--r--source/blender/imbuf/intern/jp2.c2
-rw-r--r--source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c
index a76c6e780ca..09b3fac08af 100644
--- a/source/blender/imbuf/intern/jp2.c
+++ b/source/blender/imbuf/intern/jp2.c
@@ -287,7 +287,7 @@ struct ImBuf *imb_jp2_decode(unsigned char *mem, int size, int flags)
/*
-2048x1080 (2K) at 24 fps or 48 fps, or 4096x2160 (4K) at 24 fps; 3×12 bits per pixel, XYZ color space
+2048x1080 (2K) at 24 fps or 48 fps, or 4096x2160 (4K) at 24 fps; 3x12 bits per pixel, XYZ color space
* In 2K, for Scope (2.39:1) presentation 2048x858 pixels of the imager is used
* In 2K, for Flat (1.85:1) presentation 1998x1080 pixels of the imager is used
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c b/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
index b14109d1b52..e502129c3d3 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
@@ -83,9 +83,9 @@ static void do_ycca_to_rgba_normalized(bNode *node, float *out, float *in)
static void do_chroma_key(bNode *node, float *out, float *in)
{
NodeChroma *c;
- float x, z, kx, kz, alpha;
+ float x, z, alpha;
float theta, beta, angle, angle2;
- float kfg, newY, newCb, newCr;
+ float kfg;
c=node->storage;