Merge remote-tracking branch 'origin/tizen' into new_text

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / text / shaper.cpp

diff --git a/dali-toolkit/public-api/text/shaper.cpp b/dali-toolkit/public-api/text/shaper.cpp
index 54444ac..7ef076f 100644 (file)
--- a/dali-toolkit/public-api/text/shaper.cpp
+++ b/dali-toolkit/public-api/text/shaper.cpp
@@ -56,14 +56,15 @@ void ShapeText( const Vector<Character>& text,
     return;
   }
 
+#ifdef DEBUG_ENABLED
   const Length numberOfFontRuns = fonts.Count();
+  const Length numberOfScriptRuns = scripts.Count();
+#endif
 
   DALI_ASSERT_DEBUG( ( 0u != numberOfFontRuns ) &&
                      ( numberOfCharacters == fonts[numberOfFontRuns - 1u].characterRun.characterIndex + fonts[numberOfFontRuns - 1u].characterRun.numberOfCharacters ) &&
                      "Toolkit::Text::ShapeText. All characters must have a font set." );
 
-  const Length numberOfScriptRuns = scripts.Count();
-
   DALI_ASSERT_DEBUG( ( 0u != numberOfScriptRuns ) &&
                      ( numberOfCharacters == scripts[numberOfScriptRuns - 1u].characterRun.characterIndex + scripts[numberOfScriptRuns - 1u].characterRun.numberOfCharacters ) &&
                      "Toolkit::Text::ShapeText. All characters must have a script set." );