Revert "[Tizen] Change for fribidi update" 65/176965/1
authorDaekwang Ryu <dkdk.ryu@samsung.com>
Tue, 24 Apr 2018 06:37:22 +0000 (15:37 +0900)
committerDaekwang Ryu <dkdk.ryu@samsung.com>
Tue, 24 Apr 2018 06:39:16 +0000 (15:39 +0900)
This reverts commit 04ab122135052f27a7daa0a65002f696c896b6d2.

Change-Id: I696368dcc5e0b59e1c03b9331419fff7e284f35d

dali/internal/text/text-abstraction/bidirectional-support-impl.cpp

index 10ce56d..4d38955 100644 (file)
@@ -24,7 +24,6 @@
 // EXTERNAL INCLUDES
 #include <memory.h>
 #include <fribidi/fribidi.h>
-#include <dali/integration-api/debug.h>
 
 namespace Dali
 {
@@ -153,12 +152,7 @@ struct BidirectionalSupport::Plugin
     bidirectionalInfo->paragraphDirection = fribidi_get_par_direction( bidirectionalInfo->characterTypes, numberOfCharacters );
 
     // Retrieve the embedding levels.
-    if (fribidi_get_par_embedding_levels( bidirectionalInfo->characterTypes, numberOfCharacters, &bidirectionalInfo->paragraphDirection, bidirectionalInfo->embeddedLevels ) == 0)
-    {
-      free( bidirectionalInfo->characterTypes );
-      delete bidirectionalInfo;
-      return 0;
-    }
+    fribidi_get_par_embedding_levels( bidirectionalInfo->characterTypes, numberOfCharacters, &bidirectionalInfo->paragraphDirection, bidirectionalInfo->embeddedLevels );
 
     // Store the bidirectional info and return the index.
     BidiInfoIndex index = 0u;
@@ -231,17 +225,14 @@ struct BidirectionalSupport::Plugin
       memcpy( embeddedLevels, bidirectionalInfo->embeddedLevels + firstCharacterIndex,  embeddedLevelsSize );
 
       // Reorder the line.
-      if (fribidi_reorder_line( flags,
-                                bidirectionalInfo->characterTypes + firstCharacterIndex,
-                                numberOfCharacters,
-                                0u,
-                                bidirectionalInfo->paragraphDirection,
-                                embeddedLevels,
-                                NULL,
-                                reinterpret_cast<FriBidiStrIndex*>( visualToLogicalMap ) ) == 0)
-      {
-        DALI_LOG_ERROR("fribidi_reorder_line is failed\n");
-      }
+      fribidi_reorder_line( flags,
+                            bidirectionalInfo->characterTypes + firstCharacterIndex,
+                            numberOfCharacters,
+                            0u,
+                            bidirectionalInfo->paragraphDirection,
+                            embeddedLevels,
+                            NULL,
+                            reinterpret_cast<FriBidiStrIndex*>( visualToLogicalMap ) );
 
       // Free resources.
       free( embeddedLevels );