diff options
author | Guillermo S. Romero <gsr.b3d@infernal-iceberg.com> | 2010-12-31 23:01:38 +0300 |
---|---|---|
committer | Guillermo S. Romero <gsr.b3d@infernal-iceberg.com> | 2010-12-31 23:01:38 +0300 |
commit | c169ccc711edc182d4983f59c1124aee91e7acd5 (patch) | |
tree | 7bcba51b81366d24dc67d5c90533b74c6d8ecf0e /source | |
parent | 91f0e13686a6f394bc85a7025dab5435a134d2f6 (diff) |
Silence more compiler warnings.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/font.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/math_color.c | 9 | ||||
-rw-r--r-- | source/blender/editors/curve/editcurve.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_logic/logic_window.c | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index e178beaaa50..03d31549214 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -611,7 +611,7 @@ static int mdisp_rot_face_to_crn(int corners, int face_side, float u, float v, f static void mdisp_apply_weight(int S, int corners, int x, int y, int face_side, float crn_weight[4][2], float *u_r, float *v_r) { - float u, v, xl, yl; + float u = 0.f, v = 0.f, xl, yl; float mid1[2], mid2[2], mid3[2]; mdisp_rot_crn_to_face(S, corners, face_side, x, y, &u, &v); diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index 500ccf0781b..ec63975a3c0 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -670,7 +670,7 @@ struct chartrans *BKE_text_to_curve(Scene *scene, Object *ob, int mode) VFont *vfont, *oldvfont; VFontData *vfd= NULL; Curve *cu; - CharInfo *info, *custrinfo; + CharInfo *info = NULL, *custrinfo; TextBox *tb; VChar *che; struct chartrans *chartransdata=NULL, *ct; diff --git a/source/blender/blenlib/intern/math_color.c b/source/blender/blenlib/intern/math_color.c index cf7a122e1bf..9d93168590f 100644 --- a/source/blender/blenlib/intern/math_color.c +++ b/source/blender/blenlib/intern/math_color.c @@ -112,7 +112,7 @@ void yuv_to_rgb(float y, float u, float v, float *lr, float *lg, float *lb) void rgb_to_ycc(float r, float g, float b, float *ly, float *lcb, float *lcr, int colorspace) { float sr,sg, sb; - float y, cr, cb; + float y = 128.f, cr = 128.f, cb = 128.f; sr=255.0f*r; sg=255.0f*g; @@ -144,11 +144,12 @@ void rgb_to_ycc(float r, float g, float b, float *ly, float *lcb, float *lcr, in } -/* YCC input have a range of 16-235 and 16-240 exepect with JFIF_0_255 where the range is 0-255 */ +/* YCC input have a range of 16-235 and 16-240 except with JFIF_0_255 where the range is 0-255 */ /* RGB outputs are in the range 0 - 1.0f */ +/* FIXME comment above must be wrong because BLI_YCC_ITU_BT601 y 16.0 cr 16.0 -> r -0.7009 */ void ycc_to_rgb(float y, float cb, float cr, float *lr, float *lg, float *lb, int colorspace) { - float r,g,b; + float r = 128.f, g = 128.f, b = 128.f; switch (colorspace) { case BLI_YCC_ITU_BT601 : @@ -182,7 +183,7 @@ void hex_to_rgb(char *hexcol, float *r, float *g, float *b) if (sscanf(hexcol, "%02x%02x%02x", &ri, &gi, &bi)==3) { *r = ri / 255.0f; - *g = gi / 255.0f; + *g = gi / 255.0f; *b = bi / 255.0f; CLAMP(*r, 0.0f, 1.0f); CLAMP(*g, 0.0f, 1.0f); diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 3dbf71b5ec7..47b9dd3733b 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -3928,7 +3928,7 @@ static int make_segment_exec(bContext *C, wmOperator *op) Curve *cu= obedit->data; ListBase *nubase= curve_get_editcurve(obedit); Nurb *nu, *nu1=0, *nu2=0; - BezTriple *bezt; + BezTriple *bezt = NULL; BPoint *bp; float *fp, offset; int a, ok= 0; diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index bd97e1e4a81..d5450a1369c 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -3691,7 +3691,7 @@ static void draw_actuator_armature(uiLayout *layout, PointerRNA *ptr) bArmatureActuator *aa = (bArmatureActuator *) act->data; Object *ob = (Object *)ptr->id.data; PointerRNA pose_ptr, pchan_ptr; - PropertyRNA *bones_prop; + PropertyRNA *bones_prop = NULL; if(ob->type != OB_ARMATURE){ uiItemL(layout, "Actuator only available for armatures", ICON_NULL); |