[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31368] trunk/blender/source/blender: jp2. c has a non-utf8 char which stopped python from reading it, removed unused vars from CMP_chromaMatte.c

[Campbell Barton]

Revision: 31368
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31368
Author:   campbellbarton
Date:     2010-08-16 08:38:30 +0200 (Mon, 16 Aug 2010)

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

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/jp2.c
    trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c

Modified: trunk/blender/source/blender/imbuf/intern/jp2.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/jp2.c	2010-08-16 06:31:49 UTC (rev 31367)
+++ trunk/blender/source/blender/imbuf/intern/jp2.c	2010-08-16 06:38:30 UTC (rev 31368)
@@ -287,7 +287,7 @@
 
 
 /*
-2048x1080 (2K) at 24 fps or 48 fps, or 4096x2160 (4K) at 24 fps; 3\xD712 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

Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c	2010-08-16 06:31:49 UTC (rev 31367)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c	2010-08-16 06:38:30 UTC (rev 31368)
@@ -83,9 +83,9 @@
 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;