Avoid warning from g++ 4.3.

git-svn-id: http://svn.voria.com/code@1476 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp
index b721476..c844f57 100644 (file)
--- a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp
+++ b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp
@@ -463,9 +463,9 @@ Layer_Freetype::set_param(const String & param, const ValueBase &value)
        IMPORT_PLUS(size, if(old_version){size/=2.0;} needs_sync_=true );
        IMPORT_PLUS(text,needs_sync_=true);
        IMPORT_PLUS(pos,needs_sync_=true);
-       IMPORT_PLUS(color, { if (color.get_a() == 0) if (converted_blend_) {
+       IMPORT_PLUS(color, { if (color.get_a() == 0) { if (converted_blend_) {
                                        set_blend_method(Color::BLEND_ALPHA_OVER);
-                                       color.set_a(1); } else transparent_color_ = true; });
+                                       color.set_a(1); } else transparent_color_ = true; } });
        IMPORT(invert);
        IMPORT_PLUS(orient,needs_sync_=true);
        IMPORT_PLUS(compress,needs_sync_=true);

diff --git a/synfig-core/trunk/src/modules/lyr_std/shade.cpp b/synfig-core/trunk/src/modules/lyr_std/shade.cpp
index 5c5b129..d37409f 100644 (file)
--- a/synfig-core/trunk/src/modules/lyr_std/shade.cpp
+++ b/synfig-core/trunk/src/modules/lyr_std/shade.cpp
@@ -90,9 +90,9 @@ Layer_Shade::set_param(const String &param, const ValueBase &value)
 {
        IMPORT_PLUS(size,clamp(size));
        IMPORT(type);
-       IMPORT_PLUS(color, { if (color.get_a() == 0) if (converted_blend_) {
+       IMPORT_PLUS(color, { if (color.get_a() == 0) { if (converted_blend_) {
                                        set_blend_method(Color::BLEND_ALPHA_OVER);
-                                       color.set_a(1); } else transparent_color_ = true; });
+                                       color.set_a(1); } else transparent_color_ = true; } });
        IMPORT(offset);
        IMPORT(invert);
 

diff --git a/synfig-core/trunk/src/modules/mod_geometry/checkerboard.cpp b/synfig-core/trunk/src/modules/mod_geometry/checkerboard.cpp
index ad79c1d..60fe5aa 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_geometry/checkerboard.cpp
+++ b/synfig-core/trunk/src/modules/mod_geometry/checkerboard.cpp
@@ -87,9 +87,9 @@ CheckerBoard::point_test(const synfig::Point& getpos)const
 bool
 CheckerBoard::set_param(const String &param, const ValueBase &value)
 {
-       IMPORT_PLUS(color, { if (color.get_a() == 0) if (converted_blend_) {
+       IMPORT_PLUS(color, { if (color.get_a() == 0) { if (converted_blend_) {
                                        set_blend_method(Color::BLEND_ALPHA_OVER);
-                                       color.set_a(1); } else transparent_color_ = true; });
+                                       color.set_a(1); } else transparent_color_ = true; } });
        IMPORT(pos);
        IMPORT(pos[0]);
        IMPORT(pos[1]);

diff --git a/synfig-core/trunk/src/modules/mod_geometry/circle.cpp b/synfig-core/trunk/src/modules/mod_geometry/circle.cpp
index cef640a..d9d8bed 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_geometry/circle.cpp
+++ b/synfig-core/trunk/src/modules/mod_geometry/circle.cpp
@@ -73,9 +73,9 @@ Circle::Circle():
 bool
 Circle::ImportParameters(const String &param, const ValueBase &value)
 {
-       IMPORT_PLUS(color, { if (color.get_a() == 0) if (converted_blend_) {
+       IMPORT_PLUS(color, { if (color.get_a() == 0) { if (converted_blend_) {
                                        set_blend_method(Color::BLEND_ALPHA_OVER);
-                                       color.set_a(1); } else transparent_color_ = true; });
+                                       color.set_a(1); } else transparent_color_ = true; } });
        IMPORT(radius);
        IMPORT(feather);
        IMPORT(invert);