Merge "TextInput & TextView: Klocwork issues fix" into tizen

[platform/core/uifw/dali-toolkit.git] / optional / dali-toolkit / public-api / shader-effects / displacement-effect.cpp

diff --git a/optional/dali-toolkit/public-api/shader-effects/displacement-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/displacement-effect.cpp
index 6594657..c0c142c 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/displacement-effect.cpp
+++ b/optional/dali-toolkit/public-api/shader-effects/displacement-effect.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.
+ *
+ */
 
 #include <dali-toolkit/public-api/shader-effects/displacement-effect.h>
 namespace Dali
@@ -79,7 +80,7 @@ DisplacementEffect DisplacementEffect::New(Type type)
 
     "void main()\n"
     "{\n"
-    "   vec4 col = texture2D(sTexture, vTexCoord);\n"
+    "  vec4 col = texture2D(sTexture, vTexCoord);\n"
     // calc lighting
     "  float intensity = dot(uLightDirection, uFixedNormal);"
     "  vec3 lighting = (intensity * uDiffuseLightColor) + uAmbientLightColor;\n"
@@ -237,4 +238,3 @@ void DisplacementEffect::SetFixedNormalProperty(const Vector3 fixedNormal)
 }
 
 }
-