archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

jp2.c has a non-utf8 char which stopped python from reading it, removed unused vars from CMP_chromaMatte.c

Browse Source
This commit is contained in:
Campbell Barton
2010-08-16 06:38:30 +00:00
parent d1759639dc
commit 8177a765ab
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/imbuf/intern/jp2.c
View File

@@ -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<EFBFBD>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 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 * In 2K, for Flat (1.85:1) presentation 1998x1080 pixels of the imager is used

4
source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
View File

@@ -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) static void do_chroma_key(bNode *node, float *out, float *in)
{ {
NodeChroma *c; NodeChroma *c;
float x, z, kx, kz, alpha; float x, z, alpha;
float theta, beta, angle, angle2; float theta, beta, angle, angle2;
float kfg, newY, newCb, newCr; float kfg;
c=node->storage; c=node->storage;