Merge "DALi Version 1.0.31" into tizen

[platform/core/uifw/dali-core.git] / dali / internal / common / blending-options.cpp

diff --git a/dali/internal/common/blending-options.cpp b/dali/internal/common/blending-options.cpp
index 7e7b6ac..181b8f6 100644 (file)
--- a/dali/internal/common/blending-options.cpp
+++ b/dali/internal/common/blending-options.cpp
@@ -1,18 +1,19 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // CLASS HEADER
 #include <dali/internal/common/blending-options.h>
@@ -108,10 +109,6 @@ void StoreBlendingFactor( unsigned int& options, BlendingFactor::Type factor, in
     case BlendingFactor::ONE_MINUS_CONSTANT_ALPHA:
       options |= ( 14u << bitShift );
       break;
-
-    default:
-      DALI_ASSERT_ALWAYS( false && "Invalid BlendingFactor" );
-      break;
   }
 }
 
@@ -136,10 +133,6 @@ void StoreBlendingEquation( unsigned int& options, BlendingEquation::Type factor
     case BlendingEquation::REVERSE_SUBTRACT:
       options |= ( 2u << bitShift );
       break;
-
-    default:
-      DALI_ASSERT_ALWAYS( false && "Invalid BlendingEquation" );
-      break;
   }
 }