pdf-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[pdf-devel] Text module test data encodings


From: gerel
Subject: [pdf-devel] Text module test data encodings
Date: Sun, 21 Dec 2008 09:13:40 -0800 (PST)

Hi all,

I have finished task #79, the tests compile without errors.
But, I have 40 failing test cases due to calling the text API with the wrong
UTF encoding type for each test data.

Aleks could you help me with this ? I attach here the patch from my branch so
you can see what test cases are failing.

##
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: ../trunk/
# testament_sha1: 558e0a2ddafb1264f74c84e502aac81e98456c9e
# timestamp: 2008-12-21 14:00:15 -0300
# base_revision_id: address@hidden
# 
# Begin patch
=== modified file 'torture/unit/base/text/pdf-text-cmp.c'
--- torture/unit/base/text/pdf-text-cmp.c       2008-11-29 16:21:37 +0000
+++ torture/unit/base/text/pdf-text-cmp.c       2008-12-21 16:57:10 +0000
@@ -85,9 +85,9 @@
  */
 START_TEST(pdf_text_cmp_002)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   const pdf_char_t *input_data = (pdf_char_t *) "GNU's Not Unix. ";
   pdf_size_t input_size = strlen((char *)input_data);
   pdf_text_t text1;
@@ -110,7 +110,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text1->data, text1->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text1,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_cmp_002:1:Text1> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -119,7 +124,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text2->data, text2->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text2,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_cmp_002:1:Text2> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -134,7 +144,7 @@
   
   pdf_text_destroy(text1);
   pdf_text_destroy(text2);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 

=== modified file 'torture/unit/base/text/pdf-text-filter.c'
--- torture/unit/base/text/pdf-text-filter.c    2008-11-29 16:21:37 +0000
+++ torture/unit/base/text/pdf-text-filter.c    2008-12-21 16:57:10 +0000
@@ -44,9 +44,9 @@
  */
 START_TEST(pdf_text_filter_001)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   pdf_text_t text;
   const pdf_char_t *input_data = (pdf_char_t *) "GNU's Not Unix" "\r""\n" \
                                                 "GNU's Not Unix" "\r" \
@@ -82,7 +82,11 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_001:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)(long)strlen((char *)internal_hex));
@@ -95,7 +99,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_001:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)(long)strlen((char *)internal_hex));
@@ -115,7 +124,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -130,9 +139,9 @@
  */
 START_TEST(pdf_text_filter_002)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   pdf_text_t text;
   const pdf_char_t *input_data = (pdf_char_t *) "";
   const pdf_char_t *expected_data = input_data;
@@ -151,7 +160,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_002:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)(long)strlen((char *)internal_hex));
@@ -164,7 +178,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_002:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)(long)strlen((char *)internal_hex));
@@ -184,7 +203,7 @@
   
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -200,9 +219,9 @@
  */
 START_TEST(pdf_text_filter_003)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   pdf_text_t text;
   const pdf_char_t *input_data = (pdf_char_t *) "GNU's Not Unix. " "\r""\n" \
                                                 "GNU's Not Unix. " "\r" \
@@ -231,7 +250,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_003:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)(long)strlen((char *)internal_hex));
@@ -245,7 +269,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_003:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)(long)strlen((char *)internal_hex));
@@ -265,7 +294,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -280,9 +309,9 @@
  */
 START_TEST(pdf_text_filter_004)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   pdf_text_t text;
   const pdf_char_t *input_data = (pdf_char_t *) "";
   const pdf_char_t *expected_data = input_data;
@@ -301,7 +330,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_004:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)(long)strlen((char *)internal_hex));
@@ -315,7 +349,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_004:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)(long)strlen((char *)internal_hex));
@@ -335,7 +374,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -351,9 +390,9 @@
  */
 START_TEST(pdf_text_filter_005)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   pdf_text_t text;
   const pdf_char_t *input_data = (pdf_char_t *) "GNU & GNU && GNU";
   const pdf_char_t *expected_data = (pdf_char_t *) "GNU GNU & GNU";
@@ -375,7 +414,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_005:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)(long)strlen((char *)internal_hex));
@@ -388,7 +432,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_005:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)(long)strlen((char *)internal_hex));
@@ -408,7 +457,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -423,9 +472,9 @@
  */
 START_TEST(pdf_text_filter_006)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   pdf_text_t text;
   const pdf_char_t *input_data = (pdf_char_t *) "";
   const pdf_char_t *expected_data = input_data;
@@ -444,7 +493,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_006:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)(long)strlen((char *)internal_hex));
@@ -457,7 +511,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_006:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)(long)strlen((char *)internal_hex));
@@ -477,7 +536,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -494,9 +553,9 @@
  */
 START_TEST(pdf_text_filter_007)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   pdf_text_t text;
   const pdf_char_t *input_data = (pdf_char_t *) "\x00\x00\x00"" " \
                                                 "\x00\x00\x00""G" \
@@ -523,7 +582,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_007:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -537,7 +601,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_007:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -557,7 +626,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -573,9 +642,9 @@
  */
 START_TEST(pdf_text_filter_008)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   pdf_text_t text;
   const pdf_char_t *input_data = (pdf_char_t *) "\x00\x00\x6C\x34" \
                                                 "\x00\x00\x00"" " \
@@ -596,7 +665,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_007:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -610,7 +684,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_007:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -630,7 +709,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -645,9 +724,9 @@
  */
 START_TEST(pdf_text_filter_009)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   pdf_text_t text;
   const pdf_char_t *input_data = (pdf_char_t *) "";
   const pdf_char_t *expected_data = input_data;
@@ -666,7 +745,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_006:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -680,7 +764,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_006:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -700,7 +789,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -718,9 +807,9 @@
  */
 START_TEST(pdf_text_filter_010)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   pdf_text_t text;
   const pdf_char_t *input_data = (pdf_char_t *) "\x00\x00\x00"" " \
                                                 "\x00\x00\x00""g" \
@@ -747,7 +836,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_010:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -760,7 +854,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_010:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -783,7 +882,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -799,9 +898,9 @@
  */
 START_TEST(pdf_text_filter_011)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   pdf_text_t text;
   const pdf_char_t *input_data = (pdf_char_t *) "\x00\x00\x00\x20" \
                                                 "\x00\x00\x1E\x98" \
@@ -828,7 +927,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_011:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -841,7 +945,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_011:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -861,7 +970,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -877,9 +986,9 @@
  */
 START_TEST(pdf_text_filter_012)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* Final_Sigma condition in Special Case algorithms
    *  When the given character is preceded by a sequence consisting of a
    *  cased unicode point (with case information) and a case-ignorable
@@ -927,7 +1036,12 @@
     if(INTERACTIVE_DEBUG)
       {
         pdf_char_t *internal_hex = NULL;
-        internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
         fail_if(internal_hex == NULL);
         printf("pdf_text_filter:12:1:Internal> '%s'\n", internal_hex);
         pdf_dealloc(internal_hex);
@@ -975,7 +1089,12 @@
       if(INTERACTIVE_DEBUG)
         {
           pdf_char_t *internal_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           fail_if(internal_hex == NULL);
           printf("pdf_text_filter:12:2:Internal> '%s'\n", internal_hex);
           pdf_dealloc(internal_hex);
@@ -995,7 +1114,7 @@
       pdf_dealloc(output_data);
       pdf_text_destroy(text);
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1011,9 +1130,9 @@
  */
 START_TEST(pdf_text_filter_013)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* 0307; 0307; ; ; lt After_Soft_Dotted; # COMBINING DOT ABOVE */
   pdf_text_t text;
   const pdf_char_t *input_data = (pdf_char_t *) "\x00\x00\x00\x20" \
@@ -1041,7 +1160,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_013:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -1054,7 +1178,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_013:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -1074,7 +1203,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1089,9 +1218,9 @@
  */
 START_TEST(pdf_text_filter_014)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* Code:0049; Lower:0069 0307; Title:0049; Upper:0049;
    * lt More_Above; # LATIN CAPITAL LETTER I */
 
@@ -1122,7 +1251,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_014:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -1135,7 +1269,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_014:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -1156,7 +1295,7 @@
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
 
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1193,9 +1332,9 @@
  */
 START_TEST(pdf_text_filter_016)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* Code: 0307;Lower: ; Title: 0307; Upper: 0307;
    * tr After_I; # COMBINING DOT ABOVE */
   
@@ -1226,7 +1365,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_016:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -1239,7 +1383,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_016:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -1259,7 +1408,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1276,9 +1425,9 @@
  */
 START_TEST(pdf_text_filter_017)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* # When uppercasing, i turns into a dotted capital I
    * 0069; 0069; 0130; 0130; tr; # LATIN SMALL LETTER I */
   
@@ -1307,7 +1456,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_017:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -1320,7 +1474,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_017:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -1340,7 +1499,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1359,9 +1518,9 @@
  */
 START_TEST(pdf_text_filter_018)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* Code: 0307;Lower: ; Title: 0307; Upper: 0307;
    * tr After_I; # COMBINING DOT ABOVE */
   
@@ -1392,7 +1551,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_016:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -1405,7 +1569,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_016:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -1425,7 +1594,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1444,9 +1613,9 @@
  */
 START_TEST(pdf_text_filter_019)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* # When lowercasing, unless an I is before a dot_above, it turns into a
    *   dotless i.
    * 0049; 0131; 0049; 0049; tr Not_Before_Dot; # LATIN CAPITAL LETTER I */
@@ -1478,7 +1647,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_016:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -1491,7 +1665,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_016:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -1511,7 +1690,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1527,9 +1706,9 @@
  */
 START_TEST(pdf_text_filter_020)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* Final_Sigma condition in Special Case algorithms
    *  When the given character is preceded by a sequence consisting of a
    *  cased unicode point (with case information) and a case-ignorable
@@ -1582,7 +1761,12 @@
       if(INTERACTIVE_DEBUG)
         {
           pdf_char_t *internal_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           fail_if(internal_hex == NULL);
           printf("pdf_text_filter:20:1:Internal> '%s'\n", internal_hex);
           pdf_dealloc(internal_hex);
@@ -1631,7 +1815,12 @@
       if(INTERACTIVE_DEBUG)
         {
           pdf_char_t *internal_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           fail_if(internal_hex == NULL);
           printf("pdf_text_filter:20:2:Internal> '%s'\n", internal_hex);
           pdf_dealloc(internal_hex);
@@ -1651,7 +1840,7 @@
       pdf_dealloc(output_data);
       pdf_text_destroy(text);
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1668,9 +1857,9 @@
  */
 START_TEST(pdf_text_filter_021)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* 0x030C has combining class 230, so condition should not be fulfilled */
   pdf_text_t text;
   const pdf_char_t *input_data = (pdf_char_t *) "\x00\x00\x00\x20" \
@@ -1701,7 +1890,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_021:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -1714,7 +1908,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_021:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -1734,7 +1933,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1750,9 +1949,9 @@
  */
 START_TEST(pdf_text_filter_022)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* Code:0049; Lower:0069 0307; Title:0049; Upper:0049;
    * lt More_Above; # LATIN CAPITAL LETTER I
    * As 0xC0 has combining class 0, the condition must not be fullfilled*/
@@ -1786,7 +1985,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_022:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -1799,7 +2003,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_022:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -1819,7 +2028,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1858,9 +2067,9 @@
  */
 START_TEST(pdf_text_filter_024)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* Code: 0307;Lower: ; Title: 0307; Upper: 0307;
    * tr After_I; # COMBINING DOT ABOVE */
   /* 0x030C has combining class 230, so condition should not be fulfilled */
@@ -1894,7 +2103,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_024:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -1907,7 +2121,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_024:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -1927,7 +2146,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1944,9 +2163,9 @@
  */
 START_TEST(pdf_text_filter_025)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* # When uppercasing, i turns into a dotted capital I
    * 0069; 0069; 0130; 0130; tr; # LATIN SMALL LETTER I */
   
@@ -1975,7 +2194,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_025:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -1988,7 +2212,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_025:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -2008,7 +2237,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2028,9 +2257,9 @@
  */
 START_TEST(pdf_text_filter_026)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* Code: 0307;Lower: ; Title: 0307; Upper: 0307;
    * tr After_I; # COMBINING DOT ABOVE */
   /* 0x030C has combining class 230, so condition should not be fulfilled */
@@ -2064,7 +2293,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_026:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -2077,7 +2311,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_026:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -2097,7 +2336,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2117,9 +2356,9 @@
  */
 START_TEST(pdf_text_filter_027)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* # When lowercasing, unless an I is before a dot_above, it turns into a
    *   dotless i.
    * 0049; 0131; 0049; 0049; tr Not_Before_Dot; # LATIN CAPITAL LETTER I
@@ -2154,7 +2393,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_027:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -2167,7 +2411,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_027:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -2187,7 +2436,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2206,9 +2455,9 @@
  */
 START_TEST(pdf_text_filter_028)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   pdf_text_t text;
   const pdf_char_t *input_data = (pdf_char_t *) "\x00\x00\x00"" " \
                                                 "\x00\x00\x00""G" \
@@ -2235,7 +2484,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_028:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -2248,7 +2502,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_028:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -2271,7 +2530,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2287,9 +2546,9 @@
  */
 START_TEST(pdf_text_filter_029)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   pdf_text_t text;
   const pdf_char_t *input_data = (pdf_char_t *) "\x00\x00\x00\x20" \
                                                 "\x00\x00\x01\x30";
@@ -2310,7 +2569,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_029:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -2323,7 +2587,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_029:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -2343,7 +2612,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2360,9 +2629,9 @@
  */
 START_TEST(pdf_text_filter_030)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* Final_Sigma condition in Special Case algorithms
    *  When the given character is preceded by a sequence consisting of a
    *  cased unicode point (with case information) and a case-ignorable
@@ -2413,7 +2682,12 @@
       if(INTERACTIVE_DEBUG)
         {
           pdf_char_t *internal_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           fail_if(internal_hex == NULL);
           printf("pdf_text_filter:30:1:Before> '%s'\n", internal_hex);
           pdf_dealloc(internal_hex);
@@ -2425,7 +2699,12 @@
       if(INTERACTIVE_DEBUG)
         {
           pdf_char_t *internal_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           fail_if(internal_hex == NULL);
           printf("pdf_text_filter:30:1:After> '%s'\n", internal_hex);
           pdf_dealloc(internal_hex);
@@ -2475,7 +2754,12 @@
       if(INTERACTIVE_DEBUG)
         {
           pdf_char_t *internal_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           fail_if(internal_hex == NULL);
           printf("pdf_text_filter:30:2:Before> '%s'\n", internal_hex);
           pdf_dealloc(internal_hex);
@@ -2487,7 +2771,12 @@
       if(INTERACTIVE_DEBUG)
         {
           pdf_char_t *internal_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           fail_if(internal_hex == NULL);
           printf("pdf_text_filter:30:2:After> '%s'\n", internal_hex);
           pdf_dealloc(internal_hex);
@@ -2507,7 +2796,7 @@
       pdf_dealloc(output_data);
       pdf_text_destroy(text);
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2524,9 +2813,9 @@
  */
 START_TEST(pdf_text_filter_031)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   pdf_text_t text;
   const pdf_char_t *input_data = (pdf_char_t *) "\x00\x00\x00\x20" \
                                                 "\x00\x00\x00" "i" \
@@ -2554,7 +2843,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_031:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -2567,7 +2861,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_031:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -2587,7 +2886,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2602,9 +2901,9 @@
  */
 START_TEST(pdf_text_filter_032)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* Code:0049; Lower:0069 0307; Title:0049; Upper:0049;
    * lt More_Above; # LATIN CAPITAL LETTER I */
   
@@ -2635,7 +2934,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_032:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -2648,7 +2952,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_032:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -2668,7 +2977,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2705,9 +3014,9 @@
  */
 START_TEST(pdf_text_filter_034)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* Code: 0307;Lower: ; Title: 0307; Upper: 0307;
    * tr After_I; # COMBINING DOT ABOVE */
   
@@ -2737,7 +3046,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_034:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -2750,7 +3064,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_034:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -2770,7 +3089,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2787,9 +3106,9 @@
  */
 START_TEST(pdf_text_filter_035)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* 00CC; 0069 0307 0300; 00CC; 00CC; lt; # LATIN CAPITAL LETTER I WITH 
GRAVE*/
   
   pdf_text_t text;
@@ -2817,7 +3136,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_035:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -2830,7 +3154,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_035:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -2850,7 +3179,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2869,9 +3198,9 @@
  */
 START_TEST(pdf_text_filter_036)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* Code: 0307;Lower: ; Title: 0307; Upper: 0307;
    * tr After_I; # COMBINING DOT ABOVE */
   
@@ -2901,7 +3230,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_016:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -2914,7 +3248,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_016:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -2934,7 +3273,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2953,9 +3292,9 @@
  */
 START_TEST(pdf_text_filter_037)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* # When lowercasing, unless an I is before a dot_above, it turns into a
    *   dotless i.
    * 0049; 0131; 0049; 0049; tr Not_Before_Dot; # LATIN CAPITAL LETTER I */
@@ -2987,7 +3326,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_037:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -3000,7 +3344,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_037:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -3020,7 +3369,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -3037,9 +3386,9 @@
  */
 START_TEST(pdf_text_filter_038)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* Final_Sigma condition in Special Case algorithms
    *  When the given character is preceded by a sequence consisting of a
    *  cased unicode point (with case information) and a case-ignorable
@@ -3098,7 +3447,12 @@
       if(INTERACTIVE_DEBUG)
         {
           pdf_char_t *internal_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           fail_if(internal_hex == NULL);
           printf("pdf_text_filter:38:1:Internal> '%s'\n", internal_hex);
           pdf_dealloc(internal_hex);
@@ -3154,7 +3508,12 @@
       if(INTERACTIVE_DEBUG)
         {
           pdf_char_t *internal_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           fail_if(internal_hex == NULL);
           printf("pdf_text_filter:38:2:Internal> '%s'\n", internal_hex);
           pdf_dealloc(internal_hex);
@@ -3174,7 +3533,7 @@
       pdf_dealloc(output_data);
       pdf_text_destroy(text);
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -3192,9 +3551,9 @@
  */
 START_TEST(pdf_text_filter_039)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* 0x030C has combining class 230, so condition should not be fulfilled */
   pdf_text_t text;
   const pdf_char_t *input_data = (pdf_char_t *) "\x00\x00\x00\x20" \
@@ -3225,7 +3584,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_039:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -3238,7 +3602,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_039:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -3258,7 +3627,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -3275,9 +3644,9 @@
  */
 START_TEST(pdf_text_filter_040)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* Code:0049; Lower:0069 0307; Title:0049; Upper:0049;
    * lt More_Above; # LATIN CAPITAL LETTER I
    * As 0xC0 has combining class 0, the condition must not be fullfilled */
@@ -3311,7 +3680,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_040:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -3324,7 +3698,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_040:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -3344,7 +3723,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -3383,9 +3762,9 @@
  */
 START_TEST(pdf_text_filter_042)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* Code: 0307;Lower: ; Title: 0307; Upper: 0307;
    * tr After_I; # COMBINING DOT ABOVE */
   /* 0x030C has combining class 230, so condition should not be fulfilled */
@@ -3419,7 +3798,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_042:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -3432,7 +3816,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_042:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -3452,7 +3841,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -3469,9 +3858,9 @@
  */
 START_TEST(pdf_text_filter_043)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* 00CC; 0069 0307 0300; 00CC; 00CC; lt; # LATIN CAPITAL LETTER I WITH GRAVE 
    * If condition not fulfilled, simple lowercase gives: 00EC */
   
@@ -3500,7 +3889,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_043:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -3513,7 +3907,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_043:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -3533,7 +3932,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -3553,9 +3952,9 @@
  */
 START_TEST(pdf_text_filter_044)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* Code: 0307;Lower: ; Title: 0307; Upper: 0307;
    * tr After_I; # COMBINING DOT ABOVE */
   /* 0x030C has combining class 230, so condition should not be fulfilled */
@@ -3589,7 +3988,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_044:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -3602,7 +4006,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_044:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -3622,7 +4031,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -3642,9 +4051,9 @@
  */
 START_TEST(pdf_text_filter_045)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* # When lowercasing, unless an I is before a dot_above, it turns into a
    *   dotless i.
    * 0049; 0131; 0049; 0049; tr Not_Before_Dot; # LATIN CAPITAL LETTER I
@@ -3678,7 +4087,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_045:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -3691,7 +4105,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_045:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -3711,7 +4130,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -3730,9 +4149,9 @@
  */
 START_TEST(pdf_text_filter_046)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   pdf_text_t text;
   const pdf_char_t *input_data = (pdf_char_t *) "\x00\x00\x00"" " \
                                                 "\x00\x00\x00""G" \
@@ -3759,7 +4178,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_046:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -3772,7 +4196,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_046:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -3795,7 +4224,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -3811,9 +4240,9 @@
  */
 START_TEST(pdf_text_filter_047)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   pdf_text_t text;
   const pdf_char_t *input_data = (pdf_char_t *) "\x00\x00\x00\x20" \
                                                 "\x00\x00\x00""A" \
@@ -3836,7 +4265,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_047:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -3849,7 +4283,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_047:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -3869,7 +4308,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -3886,9 +4325,9 @@
  */
 START_TEST(pdf_text_filter_048)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* Final_Sigma condition in Special Case algorithms
    *  When the given character is preceded by a sequence consisting of a
    *  cased unicode point (with case information) and a case-ignorable
@@ -3946,7 +4385,12 @@
       if(INTERACTIVE_DEBUG)
         {
           pdf_char_t *internal_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           fail_if(internal_hex == NULL);
           printf("pdf_text_filter:48:1:Internal> '%s'\n", internal_hex);
           pdf_dealloc(internal_hex);
@@ -4001,7 +4445,12 @@
       if(INTERACTIVE_DEBUG)
         {
           pdf_char_t *internal_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           fail_if(internal_hex == NULL);
           printf("pdf_text_filter:48:2:Internal> '%s'\n", internal_hex);
           pdf_dealloc(internal_hex);
@@ -4021,7 +4470,7 @@
       pdf_dealloc(output_data);
       pdf_text_destroy(text);
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -4038,9 +4487,9 @@
  */
 START_TEST(pdf_text_filter_049)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   pdf_text_t text;
   const pdf_char_t *input_data = (pdf_char_t *) "\x00\x00\x00\x20" \
                                                 "\x00\x00\x00" "i" \
@@ -4068,7 +4517,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_049:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -4081,7 +4535,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_049:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -4101,7 +4560,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -4116,9 +4575,9 @@
  */
 START_TEST(pdf_text_filter_050)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* Code:0049; Lower:0069 0307; Title:0049; Upper:0049;
    * lt More_Above; # LATIN CAPITAL LETTER I */
   
@@ -4151,7 +4610,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_050:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -4164,7 +4628,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_050:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -4184,7 +4653,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -4221,9 +4690,9 @@
  */
 START_TEST(pdf_text_filter_052)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* Code: 0307;Lower: ; Title: 0307; Upper: 0307;
    * tr After_I; # COMBINING DOT ABOVE */
   
@@ -4255,7 +4724,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_052:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -4268,7 +4742,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_052:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -4288,7 +4767,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -4305,9 +4784,9 @@
  */
 START_TEST(pdf_text_filter_053)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* 00CC; 0069 0307 0300; 00CC; 00CC; lt; # LATIN CAPITAL LETTER I WITH 
GRAVE*/
   
   pdf_text_t text;
@@ -4337,7 +4816,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_053:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -4350,7 +4834,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_053:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -4370,7 +4859,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -4389,9 +4878,9 @@
  */
 START_TEST(pdf_text_filter_054)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* Code: 0307;Lower: ; Title: 0307; Upper: 0307;
    * tr After_I; # COMBINING DOT ABOVE */
   
@@ -4423,7 +4912,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_054:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -4436,7 +4930,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_054:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -4456,7 +4955,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -4475,9 +4974,9 @@
  */
 START_TEST(pdf_text_filter_055)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* # When lowercasing, unless an I is before a dot_above, it turns into a
    *   dotless i.
    * 0049; 0131; 0049; 0049; tr Not_Before_Dot; # LATIN CAPITAL LETTER I */
@@ -4511,7 +5010,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_055:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -4524,7 +5028,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_055:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -4544,7 +5053,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -4561,9 +5070,9 @@
  */
 START_TEST(pdf_text_filter_056)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* Final_Sigma condition in Special Case algorithms
    *  When the given character is preceded by a sequence consisting of a
    *  cased unicode point (with case information) and a case-ignorable
@@ -4627,7 +5136,12 @@
       if(INTERACTIVE_DEBUG)
         {
           pdf_char_t *internal_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           fail_if(internal_hex == NULL);
           printf("pdf_text_filter:56:1:Internal> '%s'\n", internal_hex);
           pdf_dealloc(internal_hex);
@@ -4685,7 +5199,12 @@
       if(INTERACTIVE_DEBUG)
         {
           pdf_char_t *internal_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           fail_if(internal_hex == NULL);
           printf("pdf_text_filter:56:2:Internal> '%s'\n", internal_hex);
           pdf_dealloc(internal_hex);
@@ -4705,7 +5224,7 @@
       pdf_dealloc(output_data);
       pdf_text_destroy(text);
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -4722,9 +5241,9 @@
  */
 START_TEST(pdf_text_filter_057)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* 0x030C has combining class 230, so condition should not be fulfilled */
   pdf_text_t text;
   const pdf_char_t *input_data = (pdf_char_t *) "\x00\x00\x00\x20" \
@@ -4757,7 +5276,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_057:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -4770,7 +5294,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_057:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -4790,7 +5319,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -4807,9 +5336,9 @@
  */
 START_TEST(pdf_text_filter_058)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* Code:0049; Lower:0069 0307; Title:0049; Upper:0049;
    * lt More_Above; # LATIN CAPITAL LETTER I
    * As 0xC0 has combining class 0, the condition must not be fullfilled */
@@ -4845,7 +5374,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_058:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -4858,7 +5392,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_058:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -4878,7 +5417,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -4917,9 +5456,9 @@
  */
 START_TEST(pdf_text_filter_060)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* Code: 0307;Lower: ; Title: 0307; Upper: 0307;
    * tr After_I; # COMBINING DOT ABOVE */
   /* 0x030C has combining class 230, so condition should not be fulfilled */
@@ -4955,7 +5494,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_060:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -4968,7 +5512,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_060:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -4989,7 +5538,7 @@
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
 
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -5006,9 +5555,9 @@
  */
 START_TEST(pdf_text_filter_061)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* 00CC; 0069 0307 0300; 00CC; 00CC; lt; # LATIN CAPITAL LETTER I WITH GRAVE 
    * If condition not fulfilled, simple lowercase gives: 00EC */
   
@@ -5039,7 +5588,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_061:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -5052,7 +5606,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_061:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -5072,7 +5631,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -5092,9 +5651,9 @@
  */
 START_TEST(pdf_text_filter_062)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* Code: 0307;Lower: ; Title: 0307; Upper: 0307;
    * tr After_I; # COMBINING DOT ABOVE */
   /* 0x030C has combining class 230, so condition should not be fulfilled */
@@ -5130,7 +5689,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_062:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -5143,7 +5707,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_062:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -5163,7 +5732,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -5183,9 +5752,9 @@
  */
 START_TEST(pdf_text_filter_063)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   /* # When lowercasing, unless an I is before a dot_above, it turns into a
    *   dotless i.
    * 0049; 0131; 0049; 0049; tr Not_Before_Dot; # LATIN CAPITAL LETTER I
@@ -5219,7 +5788,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_063:1:BeforeInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -5232,7 +5806,12 @@
   if(INTERACTIVE_DEBUG)
     {
       pdf_char_t *internal_hex = NULL;
-      internal_hex = pdf_text_test_get_hex(text->data, text->size, ':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
       fail_if(internal_hex == NULL);
       printf("pdf_text_filter_063:1:AfterInternal> '%s' (%ld)\n",
              internal_hex, (long)strlen((char *)internal_hex));
@@ -5252,7 +5831,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 

=== modified file 'torture/unit/base/text/pdf-text-get-country.c'
--- torture/unit/base/text/pdf-text-get-country.c       2008-11-29 16:21:37 
+0000
+++ torture/unit/base/text/pdf-text-get-country.c       2008-12-21 16:57:10 
+0000
@@ -39,9 +39,9 @@
  */
 START_TEST(pdf_text_get_country_001)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   pdf_text_t text;
   const pdf_char_t *country = NULL;
 
@@ -50,9 +50,8 @@
   
   fail_if(pdf_text_new (&text) != PDF_OK);
   
-  /* Store country ID without using the API */
-  strncpy((char *)(&(text->country[0])), "FR", 2);
-  text->country[2] = '\0';
+
+  pdf_text_set_country(text, "FR");
   
   /* Get country ID */
   country = pdf_text_get_country(text);
@@ -64,7 +63,7 @@
   fail_unless(strlen((char *)country) == 2);
 
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 

=== modified file 'torture/unit/base/text/pdf-text-get-language.c'
--- torture/unit/base/text/pdf-text-get-language.c      2008-11-29 16:21:37 
+0000
+++ torture/unit/base/text/pdf-text-get-language.c      2008-12-21 16:57:10 
+0000
@@ -39,9 +39,9 @@
  */
 START_TEST(pdf_text_get_language_001)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   pdf_text_t text;
   const pdf_char_t *language = NULL;
   
@@ -50,9 +50,7 @@
   
   fail_if(pdf_text_new (&text) != PDF_OK);
   
-  /* Store language ID without using the API */
-  strncpy((char *)(&(text->lang[0])), "en", 2);
-  text->lang[2] = '\0';
+  pdf_text_set_language(text, "en");
   
   /* Get country ID */
   language = pdf_text_get_language(text);
@@ -64,7 +62,7 @@
   fail_unless(strlen((char *)language) == 2);
   
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 

=== modified file 'torture/unit/base/text/pdf-text-get-pdfdocenc.c'
--- torture/unit/base/text/pdf-text-get-pdfdocenc.c     2008-11-29 16:21:37 
+0000
+++ torture/unit/base/text/pdf-text-get-pdfdocenc.c     2008-12-21 16:57:10 
+0000
@@ -42,9 +42,9 @@
  */
 START_TEST(pdf_text_get_pdfdocenc_001)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t pdf_doc_encoding_strings[];
   int i;
   
@@ -86,7 +86,7 @@
       
       ++i;
     }
-#endif /* DEACTIVATED */  
+
 }
 END_TEST
 

=== modified file 'torture/unit/base/text/pdf-text-get-unicode.c'
--- torture/unit/base/text/pdf-text-get-unicode.c       2008-11-29 16:21:37 
+0000
+++ torture/unit/base/text/pdf-text-get-unicode.c       2008-12-21 16:57:10 
+0000
@@ -47,9 +47,9 @@
  */
 START_TEST(pdf_text_get_unicode_001)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf8_strings[];
   int i;
   
@@ -89,7 +89,12 @@
         {
           pdf_char_t *internal_hex = NULL;
           pdf_char_t *expected_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+          pdf_size_t actual_size;
+          pdf_char_t *actual_data;
+          fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                           PDF_TEXT_UTF8,0) == PDF_OK);
+          internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           expected_hex = 
pdf_text_test_get_hex(expected_data,expected_size,':');
           fail_if(expected_hex == NULL);
           fail_if(internal_hex == NULL);
@@ -113,7 +118,7 @@
       
       ++i;
     }
-#endif /* DEACTIVATED */  
+
 }
 END_TEST
 
@@ -132,9 +137,9 @@
  */
 START_TEST(pdf_text_get_unicode_002)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf8_strings[];
   int i;
   
@@ -175,7 +180,12 @@
           pdf_char_t *internal_hex = NULL;
           pdf_char_t *expected_hex = NULL;
           pdf_char_t *output_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+          pdf_size_t actual_size;
+          pdf_char_t *actual_data;
+          fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                           PDF_TEXT_UTF8,0) == PDF_OK);
+          internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           expected_hex = 
pdf_text_test_get_hex(expected_data,expected_size,':');
           output_hex = pdf_text_test_get_hex(data,size,':');
           fail_if(expected_hex == NULL);
@@ -205,7 +215,7 @@
       
       ++i;
     }
-#endif /* DEACTIVATED */  
+
 }
 END_TEST
 
@@ -383,9 +393,9 @@
  */
 START_TEST(pdf_text_get_unicode_007)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -425,7 +435,12 @@
         {
           pdf_char_t *internal_hex = NULL;
           pdf_char_t *expected_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+          pdf_size_t actual_size;
+          pdf_char_t *actual_data;
+          fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                           PDF_TEXT_UTF8,0) == PDF_OK);
+          internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           expected_hex = 
pdf_text_test_get_hex(expected_data,expected_size,':');
           fail_if(expected_hex == NULL);
           fail_if(internal_hex == NULL);
@@ -449,7 +464,7 @@
       
       ++i;
     }
-#endif /* DEACTIVATED */  
+
 }
 END_TEST
 
@@ -467,9 +482,9 @@
  */
 START_TEST(pdf_text_get_unicode_008)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -509,7 +524,12 @@
         {
           pdf_char_t *internal_hex = NULL;
           pdf_char_t *expected_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+          pdf_size_t actual_size;
+          pdf_char_t *actual_data;
+          fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                           PDF_TEXT_UTF8,0) == PDF_OK);
+          internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           expected_hex = 
pdf_text_test_get_hex(expected_data,expected_size,':');
           fail_if(expected_hex == NULL);
           fail_if(internal_hex == NULL);
@@ -533,7 +553,7 @@
       
       ++i;
     }
-#endif /* DEACTIVATED */  
+
 }
 END_TEST
 
@@ -634,9 +654,9 @@
  */
 START_TEST(pdf_text_get_unicode_011)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
 
@@ -678,7 +698,12 @@
           pdf_char_t *internal_hex = NULL;
           pdf_char_t *expected_hex = NULL;
           pdf_char_t *output_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+          pdf_size_t actual_size;
+          pdf_char_t *actual_data;
+          fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                           PDF_TEXT_UTF8,0) == PDF_OK);
+          internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           expected_hex = 
pdf_text_test_get_hex(expected_data,expected_size,':');
           output_hex = pdf_text_test_get_hex(data,size,':');          
           fail_if(expected_hex == NULL);
@@ -712,7 +737,7 @@
       pdf_dealloc(data);
       ++i;
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -732,9 +757,9 @@
  */
 START_TEST(pdf_text_get_unicode_012)
 {  
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -775,7 +800,12 @@
           pdf_char_t *internal_hex = NULL;
           pdf_char_t *expected_hex = NULL;
           pdf_char_t *output_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+          pdf_size_t actual_size;
+          pdf_char_t *actual_data;
+          fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                           PDF_TEXT_UTF8,0) == PDF_OK);
+          internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           expected_hex = 
pdf_text_test_get_hex(expected_data,expected_size,':');
           output_hex = pdf_text_test_get_hex(data,size,':');          
           fail_if(expected_hex == NULL);
@@ -810,7 +840,7 @@
       ++i;
     }
 
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1306,9 +1336,9 @@
  */
 START_TEST(pdf_text_get_unicode_020)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -1352,7 +1382,12 @@
         {
           pdf_char_t *internal_hex = NULL;
           pdf_char_t *expected_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           expected_hex = 
pdf_text_test_get_hex(expected_data,expected_size,':');
           fail_if(expected_hex == NULL);
           fail_if(internal_hex == NULL);
@@ -1378,7 +1413,7 @@
       
       ++i;
     }
-#endif /* DEACTIVATED */  
+
 }
 END_TEST
 
@@ -1778,9 +1813,9 @@
  */
 START_TEST(pdf_text_get_unicode_031)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -1810,7 +1845,12 @@
       if(INTERACTIVE_DEBUG)
         {
           pdf_char_t *internal_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           fail_if(internal_hex == NULL);
           printf("pdf_text_get_unicode_031:%d:Internal> '%s'\n",
                  i, internal_hex);
@@ -1853,7 +1893,7 @@
       pdf_dealloc(data);      
       ++i;
     }
-#endif /* DEACTIVATED */  
+
 }
 END_TEST
 
@@ -1870,9 +1910,9 @@
  */
 START_TEST(pdf_text_get_unicode_032)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -1912,7 +1952,12 @@
         {
           pdf_char_t *internal_hex = NULL;
           pdf_char_t *expected_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           expected_hex = 
pdf_text_test_get_hex(expected_data,expected_size,':');
           fail_if(expected_hex == NULL);
           fail_if(internal_hex == NULL);
@@ -1937,7 +1982,7 @@
       
       ++i;
     }
-#endif /* DEACTIVATED */  
+
 }
 END_TEST
 
@@ -2414,9 +2459,9 @@
  */
 START_TEST(pdf_text_get_unicode_044)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -2460,7 +2505,12 @@
         {
           pdf_char_t *internal_hex = NULL;
           pdf_char_t *expected_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           expected_hex = 
pdf_text_test_get_hex(expected_data,expected_size,':');
           fail_if(expected_hex == NULL);
           fail_if(internal_hex == NULL);
@@ -2486,7 +2536,7 @@
       
       ++i;
     }
-#endif /* DEACTIVATED */  
+
 }
 END_TEST
 
@@ -2884,9 +2934,9 @@
  */
 START_TEST(pdf_text_get_unicode_055)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf8_strings[];
   int i;
   
@@ -2929,7 +2979,12 @@
         {
           pdf_char_t *internal_hex = NULL;
           pdf_char_t *expected_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           expected_hex = 
pdf_text_test_get_hex(expected_data,expected_size,':');
           fail_if(expected_hex == NULL);
           fail_if(internal_hex == NULL);
@@ -2955,7 +3010,7 @@
       
       ++i;
     }
-#endif /* DEACTIVATED */  
+
 }
 END_TEST
 
@@ -2979,9 +3034,9 @@
  */
 START_TEST(pdf_text_get_unicode_056)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf8_strings[];
   int i;
   
@@ -3027,7 +3082,12 @@
           pdf_char_t *internal_hex = NULL;
           pdf_char_t *expected_hex = NULL;
           pdf_char_t *output_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           expected_hex = 
pdf_text_test_get_hex(expected_data,expected_size,':');
           output_hex = pdf_text_test_get_hex(data,size,':');
           fail_if(expected_hex == NULL);
@@ -3058,7 +3118,7 @@
       
       ++i;
     }
-#endif /* DEACTIVATED */  
+
 }
 END_TEST
 
@@ -3245,9 +3305,9 @@
  */
 START_TEST(pdf_text_get_unicode_061)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -3291,7 +3351,12 @@
         {
           pdf_char_t *internal_hex = NULL;
           pdf_char_t *expected_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           expected_hex = 
pdf_text_test_get_hex(expected_data,expected_size,':');
           fail_if(expected_hex == NULL);
           fail_if(internal_hex == NULL);
@@ -3316,7 +3381,7 @@
       
       ++i;
     }
-#endif /* DEACTIVATED */  
+
 }
 END_TEST
 

=== modified file 'torture/unit/base/text/pdf-text-new-from-host.c'
--- torture/unit/base/text/pdf-text-new-from-host.c     2008-11-29 16:21:37 
+0000
+++ torture/unit/base/text/pdf-text-new-from-host.c     2008-12-21 16:57:10 
+0000
@@ -43,9 +43,9 @@
  */
 START_TEST(pdf_text_new_from_host_001)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t ascii_strings[];
   int i;
   
@@ -71,15 +71,6 @@
       /* Set expected data */
       expected_data = (pdf_char_t *)ascii_strings[i].utf32be_data;
       expected_size = ascii_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
   
 
       /* Create, without using the API, a valid pdf_text_host_encoding_t */
@@ -96,19 +87,18 @@
                                          &text) == PDF_OK);
 
       /* 2. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size)==0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF32_BE,0) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
   
-      pdf_text_destroy(text);
-      
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
+      pdf_text_destroy(text);    
 
       ++i;
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 

=== modified file 'torture/unit/base/text/pdf-text-new-from-pdf-string.c'
--- torture/unit/base/text/pdf-text-new-from-pdf-string.c       2008-11-29 
16:21:37 +0000
+++ torture/unit/base/text/pdf-text-new-from-pdf-string.c       2008-12-21 
16:57:10 +0000
@@ -48,9 +48,9 @@
  */
 START_TEST(pdf_text_new_from_pdf_string_001)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t pdf_doc_encoding_strings[];
   int i;
   
@@ -76,15 +76,7 @@
       /* Set expected data */
       expected_data = (pdf_char_t *)pdf_doc_encoding_strings[i].utf32be_data;
       expected_size = (pdf_size_t)pdf_doc_encoding_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
+
       
       /* 1. The call to pdf_text_new_from_pdf_string should return PDF_OK. */
       fail_if(pdf_text_new_from_pdf_string(input_data,
@@ -97,8 +89,12 @@
       fail_if(text == NULL);
       
       /* 3. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
 
       /* 4. The language code of the output object should be empty */
       fail_unless(strlen((char *)pdf_text_get_language(text)) == 0);
@@ -113,13 +109,9 @@
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
       ++i;
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -173,9 +165,9 @@
  */
 START_TEST(pdf_text_new_from_pdf_string_003)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -201,15 +193,6 @@
       /* Set expected data */
       expected_data = (pdf_char_t *)utf16be_strings[i].utf32be_data;
       expected_size = utf16be_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
       
       /* 1. The call to pdf_text_new_from_pdf_string should return PDF_OK. */
       fail_if(pdf_text_new_from_pdf_string(input_data,
@@ -226,7 +209,12 @@
           pdf_char_t *internal_hex = NULL;
           pdf_char_t *expected_hex = NULL;
           
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           expected_hex = 
pdf_text_test_get_hex(expected_data,expected_size,':');
           fail_if((internal_hex == NULL) || \
                   (expected_hex == NULL));
@@ -239,8 +227,12 @@
         }
       
       /* 3. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       /* 4. The language code of the output object should be empty */
       fail_unless(strlen((char *)pdf_text_get_language(text)) == 0);
@@ -255,13 +247,9 @@
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
       ++i;
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -389,9 +377,9 @@
  */
 START_TEST(pdf_text_new_from_pdf_string_006)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   const pdf_char_t *language_code = (pdf_char_t *)"en";
@@ -430,15 +418,7 @@
       /* Set expected data */
       expected_data = (pdf_char_t *)utf16be_strings[i].utf32be_data;
       expected_size = utf16be_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
+
       
       /* 1. The call to pdf_text_new_from_pdf_string should return PDF_OK. */
       fail_if(pdf_text_new_from_pdf_string(input_data,
@@ -455,7 +435,12 @@
           pdf_char_t *internal_hex = NULL;
           pdf_char_t *expected_hex = NULL;
           
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           expected_hex = 
pdf_text_test_get_hex(expected_data,expected_size,':');
           fail_if((internal_hex == NULL) || \
                   (expected_hex == NULL));
@@ -472,8 +457,12 @@
         }
       
       /* 3. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       /* 4. The languange code within the text object must be the expected
        *    one */
@@ -491,14 +480,10 @@
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
       pdf_dealloc(input_data);
       ++i;
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -520,9 +505,9 @@
  */
 START_TEST(pdf_text_new_from_pdf_string_007)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   const pdf_char_t *language_code = (pdf_char_t *)"en";
@@ -563,15 +548,7 @@
       /* Set expected data */
       expected_data = (pdf_char_t *)utf16be_strings[i].utf32be_data;
       expected_size = utf16be_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
+
       
       /* 1. The call to pdf_text_new_from_pdf_string should return PDF_OK. */
       fail_if(pdf_text_new_from_pdf_string(input_data,
@@ -589,7 +566,12 @@
           pdf_char_t *internal_hex = NULL;
           pdf_char_t *expected_hex = NULL;
           
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           expected_hex = 
pdf_text_test_get_hex(expected_data,expected_size,':');
           fail_if((internal_hex == NULL) || \
                   (expected_hex == NULL));
@@ -606,8 +588,12 @@
         }
       
       /* 3. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       /* 4. The languange code within the text object must be the expected
        *    one */
@@ -627,14 +613,10 @@
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
       pdf_dealloc(input_data);
       ++i;
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -674,9 +656,9 @@
  */
 START_TEST(pdf_text_new_from_pdf_string_008)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   const pdf_char_t *language_code1 = (pdf_char_t *)"en";
@@ -769,21 +751,7 @@
       expected_size2 = utf16be_strings[i+1].utf32be_size;
       expected_data3 = (pdf_char_t *)utf16be_strings[i+2].utf32be_data;
       expected_size3 = utf16be_strings[i+2].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data1 =pdf_text_test_change_utf32_endianness(expected_data1,
-                                                                
expected_size1);
-          expected_data2 =pdf_text_test_change_utf32_endianness(expected_data2,
-                                                                
expected_size2);
-          expected_data3 =pdf_text_test_change_utf32_endianness(expected_data3,
-                                                                
expected_size3);
-          /* Just in case... */
-          fail_if(expected_data1 == NULL);
-          fail_if(expected_data2 == NULL);
-          fail_if(expected_data3 == NULL);
-        }
+
       
       /* 1. The call to pdf_text_new_from_pdf_string should return PDF_OK.
        */
@@ -801,7 +769,12 @@
           pdf_char_t *internal_hex = NULL;
           pdf_char_t *expected_hex = NULL;
           
-          internal_hex = pdf_text_test_get_hex(text1->data,text1->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text1,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           expected_hex = pdf_text_test_get_hex(expected_data1,
                                                expected_size1,':');
           fail_if((internal_hex == NULL) || \
@@ -823,8 +796,12 @@
         }
       
       /* 3. The contents of the first text object must be the expected ones. */
-      fail_unless(text1->size == expected_size1);
-      fail_unless(memcmp(text1->data, expected_data1, expected_size1) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text1,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size1);
+      fail_unless(memcmp(actual_data, expected_data1, expected_size1)==0);
       
       /* 4. The languange code within the first text object must be the 
expected
        *    one */
@@ -857,7 +834,12 @@
           pdf_char_t *internal_hex = NULL;
           pdf_char_t *expected_hex = NULL;
           
-          internal_hex = pdf_text_test_get_hex(text2->data,text2->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text2,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           expected_hex = pdf_text_test_get_hex(expected_data2,
                                                expected_size2,':');
           fail_if((internal_hex == NULL) || \
@@ -879,8 +861,10 @@
         }
       
       /* 9. The contents of the second text object must be the expected ones. 
*/
-      fail_unless(text2->size == expected_size2);
-      fail_unless(memcmp(text2->data, expected_data2, expected_size2) == 0);
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text2,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size2);
+      fail_unless(memcmp(actual_data, expected_data2, expected_size2)==0);
       
       /* 10. The languange code within the second text object must be the 
        *    expected one */
@@ -913,7 +897,12 @@
           pdf_char_t *internal_hex = NULL;
           pdf_char_t *expected_hex = NULL;
           
-          internal_hex = pdf_text_test_get_hex(text3->data,text3->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text3,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           expected_hex = pdf_text_test_get_hex(expected_data3,
                                                expected_size3,':');
           fail_if((internal_hex == NULL) || \
@@ -935,8 +924,10 @@
         }
       
       /* 15. The contents of the third text object must be the expected ones. 
*/
-      fail_unless(text3->size == expected_size3);
-      fail_unless(memcmp(text3->data, expected_data3, expected_size3) == 0);
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text3,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size3);
+      fail_unless(memcmp(actual_data, expected_data3, expected_size3)==0);
       
       /* 16. The languange code within the third text object must be the 
        *    expected one */
@@ -957,17 +948,11 @@
       fail_if(pdf_text_destroy(text2) != PDF_OK);
       fail_if(pdf_text_destroy(text3) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data1);
-          pdf_dealloc(expected_data2);
-          pdf_dealloc(expected_data3);
-        }
       pdf_dealloc(input_data);
       ++i;
     }
 
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1009,9 +994,9 @@
  */
 START_TEST(pdf_text_new_from_pdf_string_009)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   const pdf_char_t *language_code1 = (pdf_char_t *)"en";
@@ -1110,21 +1095,7 @@
       expected_size2 = utf16be_strings[i+1].utf32be_size;
       expected_data3 = (pdf_char_t *)utf16be_strings[i+2].utf32be_data;
       expected_size3 = utf16be_strings[i+2].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data1 =pdf_text_test_change_utf32_endianness(expected_data1,
-                                                                
expected_size1);
-          expected_data2 =pdf_text_test_change_utf32_endianness(expected_data2,
-                                                                
expected_size2);
-          expected_data3 =pdf_text_test_change_utf32_endianness(expected_data3,
-                                                                
expected_size3);
-          /* Just in case... */
-          fail_if(expected_data1 == NULL);
-          fail_if(expected_data2 == NULL);
-          fail_if(expected_data3 == NULL);
-        }
+
       
       /* 1. The call to pdf_text_new_from_pdf_string should return PDF_OK.
        */
@@ -1142,7 +1113,12 @@
           pdf_char_t *internal_hex = NULL;
           pdf_char_t *expected_hex = NULL;
           
-          internal_hex = pdf_text_test_get_hex(text1->data,text1->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text1,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           expected_hex = pdf_text_test_get_hex(expected_data1,
                                                expected_size1,':');
           fail_if((internal_hex == NULL) || \
@@ -1164,8 +1140,12 @@
         }
       
       /* 3. The contents of the first text object must be the expected ones. */
-      fail_unless(text1->size == expected_size1);
-      fail_unless(memcmp(text1->data, expected_data1, expected_size1) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text1,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size1);
+      fail_unless(memcmp(actual_data, expected_data1, expected_size1)==0);
       
       /* 4. The languange code within the first text object must be the 
expected
        *    one */
@@ -1200,7 +1180,12 @@
           pdf_char_t *internal_hex = NULL;
           pdf_char_t *expected_hex = NULL;
           
-          internal_hex = pdf_text_test_get_hex(text2->data,text2->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text2,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           expected_hex = pdf_text_test_get_hex(expected_data2,
                                                expected_size2,':');
           fail_if((internal_hex == NULL) || \
@@ -1222,8 +1207,11 @@
         }
       
       /* 9. The contents of the second text object must be the expected ones. 
*/
-      fail_unless(text2->size == expected_size2);
-      fail_unless(memcmp(text2->data, expected_data2, expected_size2) == 0);
+
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text2,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size2);
+      fail_unless(memcmp(actual_data, expected_data2, expected_size2)==0);
       
       /* 10. The languange code within the second text object must be the 
        *    expected one */
@@ -1258,7 +1246,12 @@
           pdf_char_t *internal_hex = NULL;
           pdf_char_t *expected_hex = NULL;
           
-          internal_hex = pdf_text_test_get_hex(text3->data,text3->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text3,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           expected_hex = pdf_text_test_get_hex(expected_data3,
                                                expected_size3,':');
           fail_if((internal_hex == NULL) || \
@@ -1280,8 +1273,10 @@
         }
       
       /* 15. The contents of the third text object must be the expected ones. 
*/
-      fail_unless(text3->size == expected_size3);
-      fail_unless(memcmp(text3->data, expected_data3, expected_size3) == 0);
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text3,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size3);
+      fail_unless(memcmp(actual_data, expected_data3, expected_size3)==0);
       
       /* 16. The languange code within the third text object must be the 
        *    expected one */
@@ -1304,16 +1299,10 @@
       fail_if(pdf_text_destroy(text2) != PDF_OK);
       fail_if(pdf_text_destroy(text3) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data1);
-          pdf_dealloc(expected_data2);
-          pdf_dealloc(expected_data3);
-        }
       pdf_dealloc(input_data);
       ++i;
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 

=== modified file 'torture/unit/base/text/pdf-text-new-from-u32.c'
--- torture/unit/base/text/pdf-text-new-from-u32.c      2008-11-29 16:21:37 
+0000
+++ torture/unit/base/text/pdf-text-new-from-u32.c      2008-12-21 16:57:10 
+0000
@@ -38,9 +38,9 @@
  */
 START_TEST(pdf_text_new_from_u32_001)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   pdf_text_t text;
   pdf_u32_t number = 0;
   const pdf_char_t *expected_data_be = (pdf_char_t *)"\x00\x00\x00" "0";
@@ -64,11 +64,16 @@
   fail_unless(pdf_text_new_from_u32(number, &text) == PDF_OK);
 
   /* 2. The contents of the text object must be the expected ones. */
-  fail_if(memcmp(text->data, expected_data, expected_size) != 0);
+  pdf_size_t actual_size;
+  pdf_char_t *actual_data;
+  fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                   PDF_TEXT_UTF8,0) == PDF_OK);
+  fail_unless(actual_size == expected_size);
+  fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
   
   pdf_text_destroy(text);
 
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -83,9 +88,9 @@
  */
 START_TEST(pdf_text_new_from_u32_002)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   pdf_text_t text;
   pdf_u32_t number = 123450;
   const pdf_char_t *expected_data_be = (pdf_char_t *)"\x00\x00\x00" "1" \
@@ -119,11 +124,16 @@
   fail_unless(pdf_text_new_from_u32(number, &text) == PDF_OK);
   
   /* 2. The contents of the text object must be the expected ones. */
-  fail_if(memcmp(text->data, expected_data, expected_size) != 0);
+  pdf_size_t actual_size;
+  pdf_char_t *actual_data;
+  fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                   PDF_TEXT_UTF8,0) == PDF_OK);
+  fail_unless(actual_size == expected_size);
+  fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
   
   pdf_text_destroy(text);
 
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 

=== modified file 'torture/unit/base/text/pdf-text-new-from-unicode.c'
--- torture/unit/base/text/pdf-text-new-from-unicode.c  2008-11-29 16:21:37 
+0000
+++ torture/unit/base/text/pdf-text-new-from-unicode.c  2008-12-21 16:57:10 
+0000
@@ -46,9 +46,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_001)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf8_strings[];
   int i;
   
@@ -72,15 +72,7 @@
       /* Set expected data */
       expected_data = (pdf_char_t *)utf8_strings[i].utf32be_data;
       expected_size = (pdf_size_t)utf8_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
+
       
       /* 1. The call to pdf_text_new_from_unicode should return PDF_OK. */
       fail_if(pdf_text_new_from_unicode(input_data,
@@ -92,8 +84,12 @@
       fail_if(text == NULL);
       
       /* 3. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       /* 4. The language code of the output object should be empty */
       fail_unless(strlen((char *)pdf_text_get_language(text)) == 0);
@@ -104,13 +100,9 @@
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -129,9 +121,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_002)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -155,15 +147,7 @@
       /* Set expected data */
       expected_data = (pdf_char_t *)utf16be_strings[i].utf32be_data;
       expected_size = (pdf_size_t)utf16be_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
+
       
       /* 1. The call to pdf_text_new_from_unicode should return PDF_OK. */
       fail_if(pdf_text_new_from_unicode(input_data,
@@ -175,8 +159,12 @@
       fail_if(text == NULL);
       
       /* 3. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       /* 4. The language code of the output object should be empty */
       fail_unless(strlen((char *)pdf_text_get_language(text)) == 0);
@@ -186,13 +174,9 @@
 
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -211,9 +195,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_003)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -239,15 +223,7 @@
       /* Set expected data */
       expected_data = (pdf_char_t *)utf16be_strings[i].utf32be_data;
       expected_size = (pdf_size_t)utf16be_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
+
       
       /* 1. The call to pdf_text_new_from_unicode should return PDF_OK. */
       fail_if(pdf_text_new_from_unicode(input_data,
@@ -259,8 +235,12 @@
       fail_if(text == NULL);
       
       /* 3. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       /* 4. The language code of the output object should be empty */
       fail_unless(strlen((char *)pdf_text_get_language(text)) == 0);
@@ -270,15 +250,11 @@
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
       pdf_dealloc(input_data);
       ++i;
     }  
 
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -296,9 +272,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_004)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -319,32 +295,10 @@
       /* Set input data (change endiannes to input UTF-16BE string if required)
        */
       input_size = (pdf_size_t)utf16be_strings[i].size -2;
-      if(!pdf_text_test_big_endian_system())
-        {
-          input_free = PDF_TRUE;
-          input_data = pdf_text_test_change_utf16_endianness((pdf_char_t *) \
-                                                  &utf16be_strings[i].data[2],
-                                                             input_size);
-          /* Just in case... */
-          fail_if(input_data == NULL);
-        }
-      else
-        {
-          input_data = (pdf_char_t *)&utf16be_strings[i].data[2];
-        }
       
       /* Set expected data */
       expected_data = (pdf_char_t *)utf16be_strings[i].utf32be_data;
       expected_size = (pdf_size_t)utf16be_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
       
       /* 1. The call to pdf_text_new_from_unicode should return PDF_OK. */
       fail_if(pdf_text_new_from_unicode(input_data,
@@ -356,8 +310,12 @@
       fail_if(text == NULL);
       
       /* 3. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       /* 4. The language code of the output object should be empty */
       fail_unless(strlen((char *)pdf_text_get_language(text)) == 0);
@@ -367,17 +325,9 @@
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
-      if(input_free)
-        {
-          pdf_dealloc(input_data);
-        }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -396,9 +346,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_005)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -422,15 +372,7 @@
       /* Set expected data */
       expected_data = (pdf_char_t *)utf32be_strings[i].utf32be_data;
       expected_size = (pdf_size_t)utf32be_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
+
       
       /* 1. The call to pdf_text_new_from_unicode should return PDF_OK. */
       fail_if(pdf_text_new_from_unicode(input_data,
@@ -442,8 +384,12 @@
       fail_if(text == NULL);
       
       /* 3. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       /* 4. The language code of the output object should be empty */
       fail_unless(strlen((char *)pdf_text_get_language(text)) == 0);
@@ -453,14 +399,10 @@
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
       ++i;
     }  
 
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -479,9 +421,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_006)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -507,15 +449,7 @@
       /* Set expected data */
       expected_data = (pdf_char_t *)utf32be_strings[i].utf32be_data;
       expected_size = (pdf_size_t)utf32be_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
+
       
       /* 1. The call to pdf_text_new_from_unicode should return PDF_OK. */
       fail_if(pdf_text_new_from_unicode(input_data,
@@ -527,8 +461,12 @@
       fail_if(text == NULL);
       
       /* 3. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       /* 4. The language code of the output object should be empty */
       fail_unless(strlen((char *)pdf_text_get_language(text)) == 0);
@@ -538,15 +476,11 @@
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
       pdf_dealloc(input_data);
       ++i;
     }  
 
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -565,9 +499,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_007)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -587,19 +521,6 @@
       
       /* Set input data (UTF-32HE) */
       input_size = (pdf_size_t)utf32be_strings[i].size -4;
-      if(!pdf_text_test_big_endian_system())
-        {
-          input_free = PDF_TRUE;
-          input_data = pdf_text_test_change_utf32_endianness((pdf_char_t *) \
-                                                         
&utf32be_strings[i].data[4],
-                                                         input_size);
-          /* Just in case... */
-          fail_if(input_data == NULL);
-        }
-      else
-        {
-          input_data = (pdf_char_t *)&utf32be_strings[i].data[4];
-        }
       
       /* Set expected data */
       expected_data = (pdf_char_t *)utf32be_strings[i].utf32be_data;
@@ -624,8 +545,12 @@
       fail_if(text == NULL);
       
       /* 3. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       /* 4. The language code of the output object should be empty */
       fail_unless(strlen((char *)pdf_text_get_language(text)) == 0);
@@ -635,17 +560,9 @@
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
-      if(input_free)
-        {
-          pdf_dealloc(input_data);
-        }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -663,9 +580,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_008)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf8_strings[];
   int i;
   
@@ -689,15 +606,7 @@
       /* Set expected data */
       expected_data = (pdf_char_t *)utf8_strings[i].utf32be_data;
       expected_size = (pdf_size_t)utf8_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
+
       
       /* 1. The call to pdf_text_new_from_unicode should return PDF_OK. */
       fail_if(pdf_text_new_from_unicode(input_data,
@@ -709,8 +618,12 @@
       fail_if(text == NULL);
       
       /* 3. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       /* 4. The language code of the output object should be empty */
       fail_unless(strlen((char *)pdf_text_get_language(text)) == 0);
@@ -721,14 +634,10 @@
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
       ++i;
     }  
 
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -747,9 +656,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_009)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -773,15 +682,7 @@
       /* Set expected data */
       expected_data = (pdf_char_t *)utf16be_strings[i].utf32be_data;
       expected_size = (pdf_size_t)utf16be_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
+
       
       /* 1. The call to pdf_text_new_from_unicode should return PDF_OK. */
       fail_if(pdf_text_new_from_unicode(input_data,
@@ -793,8 +694,12 @@
       fail_if(text == NULL);
       
       /* 3. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       /* 4. The language code of the output object should be empty */
       fail_unless(strlen((char *)pdf_text_get_language(text)) == 0);
@@ -804,13 +709,9 @@
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -829,9 +730,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_010)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -857,15 +758,7 @@
       /* Set expected data */
       expected_data = (pdf_char_t *)utf16be_strings[i].utf32be_data;
       expected_size = (pdf_size_t)utf16be_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
+
       
       /* 1. The call to pdf_text_new_from_unicode should return PDF_OK. */
       fail_if(pdf_text_new_from_unicode(input_data,
@@ -877,8 +770,12 @@
       fail_if(text == NULL);
       
       /* 3. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       /* 4. The language code of the output object should be empty */
       fail_unless(strlen((char *)pdf_text_get_language(text)) == 0);
@@ -888,14 +785,10 @@
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
       pdf_dealloc(input_data);
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -913,9 +806,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_011)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -936,19 +829,6 @@
       /* Set input data (change endiannes to input UTF-16BE string if required)
        */
       input_size = (pdf_size_t)utf16be_strings[i].size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          input_free = PDF_TRUE;
-          input_data = pdf_text_test_change_utf16_endianness((pdf_char_t *) \
-                                                             
&utf16be_strings[i].data[0],
-                                                             input_size);
-          /* Just in case... */
-          fail_if(input_data == NULL);
-        }
-      else
-        {
-          input_data = (pdf_char_t *)&utf16be_strings[i].data[0];
-        }
       
       /* Set expected data */
       expected_data = (pdf_char_t *)utf16be_strings[i].utf32be_data;
@@ -973,8 +853,12 @@
       fail_if(text == NULL);
       
       /* 3. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       /* 4. The language code of the output object should be empty */
       fail_unless(strlen((char *)pdf_text_get_language(text)) == 0);
@@ -984,18 +868,10 @@
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
-      if(input_free)
-        {
-          pdf_dealloc(input_data);
-        }
       ++i;
     }  
 
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1014,9 +890,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_012)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -1040,15 +916,7 @@
       /* Set expected data */
       expected_data = (pdf_char_t *)utf32be_strings[i].utf32be_data;
       expected_size = (pdf_size_t)utf32be_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
+
       
       /* 1. The call to pdf_text_new_from_unicode should return PDF_OK. */
       fail_if(pdf_text_new_from_unicode(input_data,
@@ -1061,7 +929,12 @@
           pdf_char_t *input_hex = NULL;
           pdf_char_t *internal_hex = NULL;
           pdf_char_t *expected_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           input_hex = pdf_text_test_get_hex(input_data,input_size,':');
           expected_hex = 
pdf_text_test_get_hex(expected_data,expected_size,':');
           fail_if(input_hex == NULL);
@@ -1082,8 +955,12 @@
       fail_if(text == NULL);
       
       /* 3. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       /* 4. The language code of the output object should be empty */
       fail_unless(strlen((char *)pdf_text_get_language(text)) == 0);
@@ -1093,14 +970,10 @@
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
       ++i;
     }  
 
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1119,9 +992,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_013)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -1147,15 +1020,7 @@
       /* Set expected data */
       expected_data = (pdf_char_t *)utf32be_strings[i].utf32be_data;
       expected_size = (pdf_size_t)utf32be_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
+
       
       /* 1. The call to pdf_text_new_from_unicode should return PDF_OK. */
       fail_if(pdf_text_new_from_unicode(input_data,
@@ -1167,8 +1032,12 @@
       fail_if(text == NULL);
       
       /* 3. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       /* 4. The language code of the output object should be empty */
       fail_unless(strlen((char *)pdf_text_get_language(text)) == 0);
@@ -1178,15 +1047,11 @@
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
       pdf_dealloc(input_data);
       ++i;
     }  
 
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1205,9 +1070,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_014)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -1227,19 +1092,6 @@
       
       /* Set input data (UTF-32HE) */
       input_size = (pdf_size_t)utf32be_strings[i].size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          input_free = PDF_TRUE;
-          input_data = pdf_text_test_change_utf32_endianness((pdf_char_t *) \
-                                                    
&utf32be_strings[i].data[0],
-                                                             input_size);
-          /* Just in case... */
-          fail_if(input_data == NULL);
-        }
-      else
-        {
-          input_data = (pdf_char_t *)&utf32be_strings[i].data[0];
-        }
       
       /* Set expected data */
       expected_data = (pdf_char_t *)utf32be_strings[i].utf32be_data;
@@ -1264,8 +1116,12 @@
       fail_if(text == NULL);
       
       /* 3. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       /* 4. The language code of the output object should be empty */
       fail_unless(strlen((char *)pdf_text_get_language(text)) == 0);
@@ -1275,18 +1131,10 @@
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
-      if(input_free)
-        {
-          pdf_dealloc(input_data);
-        }
       ++i;
     }  
 
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 

=== modified file 'torture/unit/base/text/pdf-text-set-country.c'
--- torture/unit/base/text/pdf-text-set-country.c       2008-11-29 16:21:37 
+0000
+++ torture/unit/base/text/pdf-text-set-country.c       2008-12-21 16:57:10 
+0000
@@ -40,9 +40,9 @@
  */
 START_TEST(pdf_text_set_country_001)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   pdf_text_t text;
   const pdf_char_t *country = (pdf_char_t *)"GB";
   
@@ -56,10 +56,10 @@
   
   /* 2. The contents of the internal country ID representation should be the
    *      expected ones. */
-  fail_unless(strcmp((char *)text->country, (char *)country)==0);
+  fail_unless(strcmp(pdf_text_get_country(text), (char *)country)==0);
   
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 

=== modified file 'torture/unit/base/text/pdf-text-set-host.c'
--- torture/unit/base/text/pdf-text-set-host.c  2008-11-29 16:21:37 +0000
+++ torture/unit/base/text/pdf-text-set-host.c  2008-12-21 16:57:10 +0000
@@ -40,9 +40,9 @@
  */
 START_TEST(pdf_text_set_host_001)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t ascii_strings[];
   int i;
   
@@ -95,8 +95,12 @@
                                     host_enc) == PDF_OK);
       
       /* 2. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size)==0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
@@ -107,7 +111,7 @@
       
       ++i;
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 

=== modified file 'torture/unit/base/text/pdf-text-set-language.c'
--- torture/unit/base/text/pdf-text-set-language.c      2008-11-29 16:21:37 
+0000
+++ torture/unit/base/text/pdf-text-set-language.c      2008-12-21 16:57:10 
+0000
@@ -40,9 +40,9 @@
  */
 START_TEST(pdf_text_set_language_001)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   pdf_text_t text;
   const pdf_char_t *language = (pdf_char_t *)"es";
   
@@ -56,10 +56,10 @@
   
   /* 2. The contents of the internal language ID representation should be the
    *      expected ones. */
-  fail_unless(strcmp((char *)text->lang, (char *)language)==0);
+  fail_unless(strcmp(pdf_text_get_language(text), (char *)language)==0);
   
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 

=== modified file 'torture/unit/base/text/pdf-text-set-pdfdocenc.c'
--- torture/unit/base/text/pdf-text-set-pdfdocenc.c     2008-11-29 16:21:37 
+0000
+++ torture/unit/base/text/pdf-text-set-pdfdocenc.c     2008-12-21 16:57:10 
+0000
@@ -41,9 +41,9 @@
  */
 START_TEST(pdf_text_set_pdfdocenc_001)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t pdf_doc_encoding_strings[];
   int i;
   
@@ -88,8 +88,12 @@
                                      input_data) != PDF_OK);
             
       /* 2. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
@@ -100,7 +104,7 @@
       pdf_dealloc(input_data);
       ++i;
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 

=== modified file 'torture/unit/base/text/pdf-text-set-unicode.c'
--- torture/unit/base/text/pdf-text-set-unicode.c       2008-11-29 16:21:37 
+0000
+++ torture/unit/base/text/pdf-text-set-unicode.c       2008-12-21 16:57:10 
+0000
@@ -43,9 +43,9 @@
  */
 START_TEST(pdf_text_set_unicode_001)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf8_strings[];
   int i;
   
@@ -71,15 +71,7 @@
       /* Set expected data */
       expected_data = (pdf_char_t *)utf8_strings[i].utf32be_data;
       expected_size = (pdf_size_t)utf8_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
+
       
       /* 1. The call to pdf_text_set_unicode should return PDF_OK. */
       fail_if(pdf_text_set_unicode(text,
@@ -89,18 +81,18 @@
       
       /* 2. The contents of the text object must be the expected ones
        *    (without BOM). */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -116,9 +108,9 @@
  */
 START_TEST(pdf_text_set_unicode_002)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -144,15 +136,7 @@
       /* Set expected data */
       expected_data = (pdf_char_t *)utf16be_strings[i].utf32be_data;
       expected_size = (pdf_size_t)utf16be_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
+
       
       /* 1. The call to pdf_text_new_from_unicode should return PDF_OK. */
       fail_if(pdf_text_set_unicode(text,
@@ -161,18 +145,19 @@
                                    PDF_TEXT_UTF16_BE) != PDF_OK);
       
       /* 2. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF16_BE,
+                                       PDF_TEXT_UNICODE_WITH_BOM) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -188,9 +173,9 @@
  */
 START_TEST(pdf_text_set_unicode_003)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -218,15 +203,7 @@
       /* Set expected data */
       expected_data = (pdf_char_t *)utf16be_strings[i].utf32be_data;
       expected_size = (pdf_size_t)utf16be_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
+
       
       /* 1. The call to pdf_text_set_unicode should return PDF_OK. */
       fail_if(pdf_text_set_unicode(text,
@@ -235,19 +212,20 @@
                                    PDF_TEXT_UTF16_LE) != PDF_OK);
             
       /* 2. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF16_LE,
+                                       PDF_TEXT_UNICODE_WITH_BOM) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
       pdf_dealloc(input_data);
       ++i;
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -262,9 +240,9 @@
  */
 START_TEST(pdf_text_set_unicode_004)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -287,32 +265,10 @@
       /* Set input data (change endiannes to input UTF-16BE string if required)
        */
       input_size = (pdf_size_t)utf16be_strings[i].size -2;
-      if(!pdf_text_test_big_endian_system())
-        {
-          input_free = PDF_TRUE;
-          input_data = pdf_text_test_change_utf16_endianness((pdf_char_t *) \
-                                                             
&utf16be_strings[i].data[2],
-                                                             input_size);
-          /* Just in case... */
-          fail_if(input_data == NULL);
-        }
-      else
-        {
-          input_data = (pdf_char_t *)&utf16be_strings[i].data[2];
-        }
       
       /* Set expected data */
       expected_data = (pdf_char_t *)utf16be_strings[i].utf32be_data;
       expected_size = (pdf_size_t)utf16be_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
       
       /* 1. The call to pdf_text_set_unicode should return PDF_OK. */
       fail_if(pdf_text_set_unicode(text,
@@ -321,22 +277,19 @@
                                    PDF_TEXT_UTF16_HE) != PDF_OK);
       
       /* 2. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF16_HE,
+                                       PDF_TEXT_UNICODE_WITH_BOM) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
-      if(input_free)
-        {
-          pdf_dealloc(input_data);
-        }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -352,9 +305,9 @@
  */
 START_TEST(pdf_text_set_unicode_005)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -380,15 +333,7 @@
       /* Set expected data */
       expected_data = (pdf_char_t *)utf32be_strings[i].utf32be_data;
       expected_size = (pdf_size_t)utf32be_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
+
       
       /* 1. The call to pdf_text_set_unicode should return PDF_OK. */
       fail_if(pdf_text_set_unicode(text,
@@ -397,18 +342,19 @@
                                    PDF_TEXT_UTF32_BE) != PDF_OK);
       
       /* 2. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF32_BE,
+                                       PDF_TEXT_UNICODE_WITH_BOM) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -424,9 +370,9 @@
  */
 START_TEST(pdf_text_set_unicode_006)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -454,15 +400,7 @@
       /* Set expected data */
       expected_data = (pdf_char_t *)utf32be_strings[i].utf32be_data;
       expected_size = (pdf_size_t)utf32be_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
+
       
       /* 1. The call to pdf_text_set_unicode should return PDF_OK. */
       fail_if(pdf_text_set_unicode(text,
@@ -471,19 +409,20 @@
                                    PDF_TEXT_UTF32_LE) != PDF_OK);
       
       /* 2. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF32_LE,
+                                       PDF_TEXT_UNICODE_WITH_BOM) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
 
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
       pdf_dealloc(input_data);
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -499,9 +438,9 @@
  */
 START_TEST(pdf_text_set_unicode_007)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -523,19 +462,6 @@
       
       /* Set input data (UTF-32HE) */
       input_size = (pdf_size_t)utf32be_strings[i].size -4;
-      if(!pdf_text_test_big_endian_system())
-        {
-          input_free = PDF_TRUE;
-          input_data = pdf_text_test_change_utf32_endianness((pdf_char_t *) \
-                                                             
&utf32be_strings[i].data[4],
-                                                             input_size);
-          /* Just in case... */
-          fail_if(input_data == NULL);
-        }
-      else
-        {
-          input_data = (pdf_char_t *)&utf32be_strings[i].data[4];
-        }
       
       /* Set expected data */
       expected_data = (pdf_char_t *)utf32be_strings[i].utf32be_data;
@@ -557,22 +483,19 @@
                                    PDF_TEXT_UTF32_HE) != PDF_OK);
       
       /* 2. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF32_HE,
+                                       PDF_TEXT_UNICODE_WITH_BOM) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
 
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
-      if(input_free)
-        {
-          pdf_dealloc(input_data);
-        }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -587,9 +510,9 @@
  */
 START_TEST(pdf_text_set_unicode_008)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf8_strings[];
   int i;
   
@@ -615,15 +538,7 @@
       /* Set expected data */
       expected_data = (pdf_char_t *)utf8_strings[i].utf32be_data;
       expected_size = (pdf_size_t)utf8_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
+
       
       /* 1. The call to pdf_text_set_unicode should return PDF_OK. */
       fail_if(pdf_text_set_unicode(text,
@@ -632,18 +547,19 @@
                                    PDF_TEXT_UTF8) != PDF_OK);
       
       /* 2. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,
+                                       PDF_TEXT_UNICODE_WITH_BOM) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -659,9 +575,9 @@
  */
 START_TEST(pdf_text_set_unicode_009)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -687,15 +603,7 @@
       /* Set expected data */
       expected_data = (pdf_char_t *)utf16be_strings[i].utf32be_data;
       expected_size = (pdf_size_t)utf16be_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
+
       
       /* 1. The call to pdf_text_new_from_unicode should return PDF_OK. */
       fail_if(pdf_text_set_unicode(text,
@@ -704,18 +612,19 @@
                                    PDF_TEXT_UTF16_BE) != PDF_OK);
       
       /* 2. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF16_BE,
+                                       PDF_TEXT_UNICODE_WITH_BOM) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -731,9 +640,9 @@
  */
 START_TEST(pdf_text_set_unicode_010)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -761,15 +670,7 @@
       /* Set expected data */
       expected_data = (pdf_char_t *)utf16be_strings[i].utf32be_data;
       expected_size = (pdf_size_t)utf16be_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
+
       
       /* 1. The call to pdf_text_new_from_unicode should return PDF_OK. */
       fail_if(pdf_text_set_unicode(text,
@@ -778,19 +679,20 @@
                                    PDF_TEXT_UTF16_LE) != PDF_OK);
       
       /* 2. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF16_LE,
+                                       PDF_TEXT_UNICODE_WITH_BOM) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
       pdf_dealloc(input_data);
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -805,9 +707,9 @@
  */
 START_TEST(pdf_text_set_unicode_011)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -830,19 +732,6 @@
       /* Set input data (change endiannes to input UTF-16BE string if required)
        */
       input_size = (pdf_size_t)utf16be_strings[i].size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          input_free = PDF_TRUE;
-          input_data = pdf_text_test_change_utf16_endianness((pdf_char_t *) \
-                                                             
&utf16be_strings[i].data[0],
-                                                             input_size);
-          /* Just in case... */
-          fail_if(input_data == NULL);
-        }
-      else
-        {
-          input_data = (pdf_char_t *)&utf16be_strings[i].data[0];
-        }
       
       /* Set expected data */
       expected_data = (pdf_char_t *)utf16be_strings[i].utf32be_data;
@@ -864,22 +753,19 @@
                                    PDF_TEXT_UTF16_HE) != PDF_OK);
       
       /* 2. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF16_HE,
+                                       PDF_TEXT_UNICODE_WITH_BOM) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
-      if(input_free)
-        {
-          pdf_dealloc(input_data);
-        }
       ++i;
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -895,9 +781,9 @@
  */
 START_TEST(pdf_text_set_unicode_012)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -923,15 +809,7 @@
       /* Set expected data */
       expected_data = (pdf_char_t *)utf32be_strings[i].utf32be_data;
       expected_size = (pdf_size_t)utf32be_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
+
       
       /* 1. The call to pdf_text_set_unicode should return PDF_OK. */
       fail_if(pdf_text_set_unicode(text,
@@ -944,7 +822,13 @@
           pdf_char_t *input_hex = NULL;
           pdf_char_t *internal_hex = NULL;
           pdf_char_t *expected_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF32_BE,
+                                       PDF_TEXT_UNICODE_WITH_BOM) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           input_hex = pdf_text_test_get_hex(input_data,input_size,':');
           expected_hex = 
pdf_text_test_get_hex(expected_data,expected_size,':');
           fail_if(input_hex == NULL);
@@ -962,18 +846,19 @@
         }
       
       /* 2. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF32_BE,
+                                       PDF_TEXT_UNICODE_WITH_BOM) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
 
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -989,9 +874,9 @@
  */
 START_TEST(pdf_text_set_unicode_013)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -1019,15 +904,7 @@
       /* Set expected data */
       expected_data = (pdf_char_t *)utf32be_strings[i].utf32be_data;
       expected_size = (pdf_size_t)utf32be_strings[i].utf32be_size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          /* Must change endianness of expected_data */
-          expected_free = PDF_TRUE;
-          expected_data = pdf_text_test_change_utf32_endianness(expected_data,
-                                                                expected_size);
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
+
       
       /* 1. The call to pdf_text_set_unicode should return PDF_OK. */
       fail_if(pdf_text_set_unicode(text,
@@ -1036,19 +913,20 @@
                                    PDF_TEXT_UTF32_LE) != PDF_OK);
             
       /* 2. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF32_LE,
+                                       PDF_TEXT_UNICODE_WITH_BOM) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
       pdf_dealloc(input_data);
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1064,9 +942,9 @@
  */
 START_TEST(pdf_text_set_unicode_014)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -1088,19 +966,6 @@
       
       /* Set input data (UTF-32HE) */
       input_size = (pdf_size_t)utf32be_strings[i].size;
-      if(!pdf_text_test_big_endian_system())
-        {
-          input_free = PDF_TRUE;
-          input_data = pdf_text_test_change_utf32_endianness((pdf_char_t *) \
-                                                             
&utf32be_strings[i].data[0],
-                                                             input_size);
-          /* Just in case... */
-          fail_if(input_data == NULL);
-        }
-      else
-        {
-          input_data = (pdf_char_t *)&utf32be_strings[i].data[0];
-        }
       
       /* Set expected data */
       expected_data = (pdf_char_t *)utf32be_strings[i].utf32be_data;
@@ -1122,22 +987,19 @@
                                    PDF_TEXT_UTF32_HE) != PDF_OK);
       
       /* 2. The contents of the text object must be the expected ones. */
-      fail_unless(text->size == expected_size);
-      fail_unless(memcmp(text->data, expected_data, expected_size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF32_HE,
+                                       PDF_TEXT_UNICODE_WITH_BOM) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       fail_if(pdf_text_destroy(text) != PDF_OK);
       
-      if(expected_free)
-        {
-          pdf_dealloc(expected_data);
-        }
-      if(input_free)
-        {
-          pdf_dealloc(input_data);
-        }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2063,9 +1925,9 @@
  */
 START_TEST(pdf_text_set_unicode_029)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   const pdf_char_t *language_code = (pdf_char_t *)"en";
@@ -2119,18 +1981,7 @@
              utf16be_strings[i].utf32be_data,
              utf16be_strings[i].utf32be_size);
 
-      if(!pdf_text_test_big_endian_system())
-        {
-          pdf_char_t *temp;
-          /* Must change endianness of expected_data */
-          
-          temp = pdf_text_test_change_utf32_endianness(expected_data,
-                                                       expected_size);
-          pdf_dealloc(expected_data);
-          expected_data = temp;
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
+
       
       /* 1. The call to pdf_text_set_unicode should return PDF_OK. */
       fail_if(pdf_text_set_unicode(text,
@@ -2142,7 +1993,13 @@
         {
           pdf_char_t *internal_hex = NULL;
           pdf_char_t *expected_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF16_BE,
+                                       PDF_TEXT_UNICODE_WITH_BOM) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           expected_hex = 
pdf_text_test_get_hex(expected_data,expected_size,':');
           fail_if(internal_hex == NULL);
           fail_if(expected_hex == NULL);          
@@ -2155,8 +2012,12 @@
         }
       
       /* 2. The contents of the text object must be the expected ones */
-      fail_unless(expected_size == text->size);
-      fail_unless(memcmp(expected_data, text->data, text->size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF8,0) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       /* 3. The language code must be empty. */
       fail_if(strlen((char *)pdf_text_get_language(text)) != 0);
@@ -2170,7 +2031,7 @@
 
       ++i;
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2189,9 +2050,9 @@
  */
 START_TEST(pdf_text_set_unicode_030)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   const pdf_char_t *language_code = (pdf_char_t *)"en";
@@ -2243,18 +2104,6 @@
              utf16be_strings[i].utf32be_data,
              utf16be_strings[i].utf32be_size);
       
-      if(!pdf_text_test_big_endian_system())
-        {
-          pdf_char_t *temp;
-          /* Must change endianness of expected_data */
-          
-          temp = pdf_text_test_change_utf32_endianness(expected_data,
-                                                       expected_size);
-          pdf_dealloc(expected_data);
-          expected_data = temp;
-          /* Just in case... */
-          fail_if(expected_data == NULL);
-        }
       
       /* 1. The call to pdf_text_set_unicode should return PDF_OK. */
       fail_if(pdf_text_set_unicode(text,
@@ -2266,7 +2115,13 @@
         {
           pdf_char_t *internal_hex = NULL;
           pdf_char_t *expected_hex = NULL;
-          internal_hex = pdf_text_test_get_hex(text->data,text->size,':');
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF16_BE,
+                                       PDF_TEXT_UNICODE_WITH_BOM) == PDF_OK);
+      internal_hex = pdf_text_test_get_hex(actual_data,actual_size,':');
+
           expected_hex = 
pdf_text_test_get_hex(expected_data,expected_size,':');
           fail_if(internal_hex == NULL);
           fail_if(expected_hex == NULL);          
@@ -2279,8 +2134,13 @@
         }
       
       /* 2. The contents of the text object must be the expected ones */
-      fail_unless(expected_size == text->size);
-      fail_unless(memcmp(expected_data, text->data, text->size) == 0);
+      pdf_size_t actual_size;
+      pdf_char_t *actual_data;
+      fail_unless(pdf_text_get_unicode(&actual_data, &actual_size, text,
+                                       PDF_TEXT_UTF16_BE,
+                                       PDF_TEXT_UNICODE_WITH_BOM) == PDF_OK);
+      fail_unless(actual_size == expected_size);
+      fail_unless(memcmp(actual_data, expected_data, expected_size)==0);
       
       /* 3. The language code must be empty */
       fail_if(strlen((char *)pdf_text_get_language(text)) != 0);
@@ -2294,7 +2154,7 @@
       
       ++i;
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTo4SVAANfb/gFEQAADZ9///
X2/WwL////BgH/7wBQdQGNgAAAUM+9nroTAd45N1IUWbVNro6ickzbO5grZqrWSTsrKiqu89ADJG
Ami3bqlKUKOWQSAlBMmghBBJqDQAAAAaAAAGmICkU0FPVDQAAAGgBkAAAc0yMhkwQ0YTBGmjRiBp
kyMAAQSakAlMUammUeKeoAAaAANNDQAAUpRExCYmjTTVPZFPJgUyYnomgNGjTMptICpJARpqMTUz
QJk1Q8Uep6jxQNANGQNHqbdklYELKqTJK6btxjDMYxYKxUVVEUVRGIgxjEVUYjEViwViKqIiLERR
RYorEUUUWIiMUYixERFFUVVEVURFiIqoMZFEZEVBQYkYqIn0PW+z2l691q9x7c2v7/qdHaLDu0gs
BGCMESAsBYQWRZFFkFhIskWEsirVUKCySkIiBFiKiIoKpFgqyKCgsWKqxVFRFFPn677Odu+H4dsW
77/mYxJXKgOXfpYyVRyFx5MJHDEdXIFE95JAlEsJY1bxGco4zaF2Yer4rv39Nmwbt7r74AdMiyYv
WWS7Au8SUkU4khdhLJDpgZSS7IZQMITLCzIacMLMhhIFkJKQlMPDANN2F0lJFlVRJSZYFMsm2G0l
0LsDCozAZAgVERNZYuUPVC5mupsgukCWZJIvVSw1q1sFUXZhLuUsl0EbpTMOmlxQjiQsrFORTpjh
LkiThQJynSE3LqamiNBXNYji9tJJmEzeTMloFwnFAgvjakkM3YLUyWrJnxzoPkPs16DZJC5kbznG
VllKlKKkk7kcWuPThYMSS1B5KdIsk8easySWZOJKUzh0m1Sy8K26NFlESewHMlAkyUSdNmN4qGeK
OYsKtDiTxRk0qpWZomgcBQ62jnC0tF0aBOW7XVrcGdNKJcklZJC5tFUq0FFiudooWSqf60Wjd+T4
RU7A/tV0VZJDMTGDLKzKzIxiFkikFkUAkUIH9fnkhA8erWeen4z1N4kwPt91DIG2hJimokjJ+7qi
t3zeTNTluBfWWIx1UjDFkDCNPJRdzbFWtkT2EHEsFFLqOHKdK+euRml5yrbNkmJIGYmYvQ2Bp6xQ
bF6wEDJ0xJjDgtc3TrFuO8yXuNUgzhWzOUVWEVbbndx7xFk7jOXnYcGbmPOvLsZrM7DIRmJzStwd
aWSYBpscYe4Srzeoze6+6ZyN1iTIS6m4zleli85aJk9pGkK8FEsvbO6RdnOevq3i5G3c3YLkhJRq
QwyDhGeqC8zxhec4t3Pkm55Eo7d1qXh7KYkhrLvOPZMnWCOI4wyGCKIWa8TdUtM83HEAT1VW0wxV
iFSFHOrMqAyizRhHiZVAo9qpVMiy9lredm6VlbdSKOkCSHt1B207AQlQFuvDHHCB2CrM2UQZQ1an
x8EQIi312jktt+A8fKwh0cd+B0sk3QkSdIGkCyXONTm04owSN3CyYRII2Z0dYlLMABtc26IzbNTD
IpDXrBRNpBtEkyQyTFmiTuLAQNzWGd5Eo0Ru1vbYHRyhUVjdeAYKdXCBZGtBA9asx46Ywx4S0SDq
0xU5W0fAtOGKIuVpEmTFEWRYlDGUjBOchnBQTZw4SQiNKLIyqb5XJupAsziDaoxshAWQzxshcs3n
urZT3UwMI8g9yCSAJ01yRA0gJt+EpWYGX4yaRQsuVmlWZIvKVWH5s4NsjOuuNk4hZXVorhYwgeSQ
IN0OdZsdGN5vZLJlnTxMN3dbqxGkQR4nwnyAAbPGJIJhmLPmoN0xvm+DqrcfHDARsZTEh5uGziaw
WQcpiJpQyBaSlskCrKJgVfXtAlG9e9bT2xkHlDCQFbNyNLxMjeUnTxFZPTuKzDIojKQtfII65VPw
lPdKpzxU6PDKa1GVGMYxjHUNtX5dX6/700yrx5VxLeELQfdsiSRYG/ly4cez7+fX2YYM8sfGu1jW
WOd+eYjFX+ciJhESbfKiJm39Jxf+vj3p4jd8v8f4ewAW9Pj8LGYBihfPKpkqnXn1hH7AjRd0qnwl
POEf9lNlkpqyqo+rhH4dz5lRREVVFEVUFkIKMyVMynofVVDSL0MLTE++k3SPJ2O5ehC9nUYUwrCg
0oX0vpfR83PSpuf1jmytBN7e3tTXM1aNcRWuNddC88qnsYSbW1tccom7fSTiCOz05nVV0489hd6r
zPtYe1j0sWrB3EuJPmiY3t5+pk9GL46aV7A00zNztQZSTaWcu/dWXZfbztOGaxewYrLizBi/7ETw
D3YYyT97pklTw+CvXrVKVauL4cbryrrS152gAoZYXZKQxqoSyEykBtRJ72XSmGfjqAVugNYzffKM
wF1qiGUsyVyg0ik+m7Q49Mykqr6ziTKSYb7qGm7AqjFjDDpy9IYdsj1U2kCyCwMMlmS+6ABQkFk2
yGWHEDiHEjVBdkpgZTrVEygS4k2kMMAvaiBjlGkyl2FPEkxb7YSEPvSSHRAMbrb25yx2vWZ+gWQA
Rx9sNCjsQKQPEW9xbWb5Dm8ERfDr5+93I0HMsMV7OZV3GG+gCARM+DFgoFq+qe6gQQJnpGQdBD2b
8oMEZKbFv7DkaHcefWh6C+Q9iQ4N49PrrfsYF0RBsV6Q4OdsCX2ybNyrl/wW0qXBUuVorYvdqDBq
2MFPj5/mqs34pykkFtPsXDo21V7C9Uui5HzIKIIbCiQvt9vtUsaZf4AkNufpnkh2TEtt4abdvX2o
sHcJfJDG+88kYPO3Jk93lrpeb2sq4vVMqy+jCoiP2DwhychPKznnTrwrFvBcgG9swncQtEOD4YGx
Lp+8SehJ5+nJkiADJrSw++H3aSLVSErS89xhMoiWYwshiBBmSAJ0IGho2FBCb31pttzbIZ1y2Y92
csQCpa2CwoKCyVUkrmvZj1+GytT23dfbHXXCBg6XsvW8+ZKoDoFXrGLB5AFehkGIREZlRAjGdX1V
omi613APJpwXDSYalqKLWLKWXz6sCHGtrWbc2WCRGVZGMoCGRlpWd2Z20dMiIcROarDL1bGC7oiM
FCAOnTKLFbX5oG7SFr9t1i+CzKfUMOu5UkqgJzzVcnMY54vxbX19o6kKGGYG5GdcMyfT8ePU1AiI
k71rK936aq7qgKuRUJXKKHco7kHXgAYsQcnscCmRT3KOxIxCb5bLI6HZWUVQM1UtExNMiklkC7Oy
RYFUUZvjWfIqi891umhlvdPwjao71m13VdcnZHXU9NzamVWTycpbN9ZmtNzhItVw2dK0XiGgVQo2
MV5yz+4fBDkunIGdVzvUnlABFIXeGTkzyWuOEPUdVMGioTGmbvaxdjdSAIWbp4REhkwKgyiZUBrq
W027Li/TUkiAPt3Q9bK3Q3pHpug+U5aQ747a8m/nrQbT0iZ8DG9Z0Wkwwj7XMm7F72vSpArCp0Ll
bqmxRO5hgCYq9W1F7kZGGQEF0KhjgqrErdU8xDjAyhIq/iXW3uo6ViYIFAxJ9ClAZAlacmeHiprp
HyNWNIcRSx0UFZFOs5qKOsIAEyYE5flyM3ARMRCEmNMBJMw66b16FDFg4N7NwZ+rk2YbNjboQLVK
qU2GwYJJookhgy6ZqDQKgfIuDX2Zxt/HzOm9ytqwQW/qOoWtw3WzkqyMpjEuRuhW7L67lZXA6ksD
scGlw2z0vqxb2we3qOQ9A7E8IGtOxfVns7wYXKmlTsqOqBwXjl/td+e00paY8VGMpQJlUAQKrR7T
/UimBSROwptAQXK6F0ppT1PgBt0Q1oyvNN2N1UKhpRJWRQlTuKERiVWrw+Oy2zrD5ZUbyNhfU81d
ESwLmmbY0NbiROxngzUJhFEwSx3MmR49fG/OtUg88GmMIRhCdou5VmIj6DBhfr81wBIMC6fPn5Ys
owyBoKIsERMzJefHu+6nh5lUcew6QbFXQ7bqmZNHBPI4CaPUYMGDueB4D5FRql7NpMIXKb9J38Fn
Ha1VdNXM3XVmlnHRT9DpiRLxPblbNWkuyjOLQpIVbwsbK2RnaOntrcoNDO2b3DV4jOIEOHQZ1fPN
u98HmWE4wQD0+ypaGNZ6q18IW2FQzegoYPT2MYfVvUp2lkOJmmQUZgWKiVIlaji3XbNx32WO8Iu2
PJW3LmjyOcZsK4/LuW5QEGBMC9ENySMDqLBLAM/ZwOj2h8AwF6HB9RpjqUmz82okow8FGBEucLGd
eNFXObx1gx6BMumCM6fiS5+NAORwjbD4l7KqidCuQMhhTGjHc4NSGszERd+XglguqBsXwASQcFGR
xyjBc+qhHVJO2Ee5Bu4a53NLL5JSTbNaLVF6gBKtR8jf3+Dauds0JDkmax6dYl/QSqGB65zsaCWq
tvcc9xQ7qqe7JmuHRuO8pAFy93s17zbxS6L1ZNU8BmeTNgpUGXUjvanfGyB9MgIN7M2uGSShoFRh
Szu7as/G2S4tLSLKp6jA2Nns6Zizvop9aY0plYFBvU7Dkzhu1VBpUuZU7cNIuyCz0Q2Ktri+t0O2
HFVMkDFLZWwx0ehes04+zD0SKmlyiCCjKl5paRx+vcis8EAAj4MEhyoKv1yB9S6uTYPsS2jHfGZk
ZpxpYSbDDS0rYg6NnIxc4FPUucHYWcG1ub9+/XfhvkhGy0bKtTootRtqMaJIH0+a6TOEOSZ3V5ey
KCe6WssW67gpTmtvW9dpRmTc3IyhucSdEht1wU3OasLb8Bh4GzhqetQuPAxLxpt3w+JJisiwktfT
aKC9XnmJSZQoBgGoiEN+J9fdCOvsR73rnBYzTRZGXGy1LC74zRhAQULsNh5GzU7l77XVxlIQAJST
VMSD4LC0H6Cs93mKcgpIEEOdzgsRCRfL2mjdDnkaiSH0l7Zq17SMYpXw1tg5NIMYazVycG99W50v
BBZwZrNXvcDFjj5OyAN5CzGHZPRWTyqtoVHdokVbL6FrTRB+LlekJU7m1uB1xdZHIqnzeY6vttyE
XXZuSxblzysl6rDLqzV7am+PpfTujBaImJNSutkisRJa1U0b3FQxgQBpU+XW3NSxK6GtnepfF6mL
2YbW8RDmb3V5j3vj3qHVsjZJE+pOOhK+Qyc+Wzvy2g8jjtfcVPyuzLMsjiGFod/UHpq3keTfWhwt
04dUCaFZgyiB6W5fn5JePYUcrWMd2nsLGGU3wOtuxRKAdkAowSSSe5cY5LlzuiJIQUYPznxRE674
xQ9ufRlvJZgsHxU8mqK9NUYIZvrzeA8xqVlvs343uYsx5rVV4Lecpzaxp4jtl716sfYZm8xvRuqZ
U9t70iWyiq0hj9ICIEDJHmedGNMCHlEOas5y+WFxMyRMVCBqxze78JEvAj6wcNsff75uLc2faUM+
SM8Pqwe9+LsP54tLYXyNk0MNrdht3aly60NkwWC2pZjeqLKqz5LFD5qfIqZWNxl7Kq3aXlyxIze2
JFcKmtsuCQWNCDprynSchHSELcEP6/X3JHbuL0Gg5JCq9S5wXnlnXnghRFFBQSFAgfQiK+aqnKhR
WfXFq4M4iNzVgUjA/kurd1cB2yuyuyaboi6lUqdhBHEE9I17Lty8lmofheN1srzFaI8JLHhc8/C5
XmjA2lQAKOSMZzFVWbxci5S4khV9hjuYGu2X7SoY8Qlp8VPqaVSMPvg7ojhwwM/QeT5qiTiX1MjC
yvcidC5I3neWeiKzccLmyUbds66c8Vx9X5X4BKiLhemN6q3s71m19ByJGebed6cu1XlGYpRI5OSi
RhRRTscnjxA5B3DpcFNrRwn1hFPkEOKbKRnt2QUFQa9IcEbfpqQ4QpiQ6IU0Wi0WGjRp3PF/FphP
ux7EldYRu52PkooWKaEKEYLPufJJOpeSJJNySGySuSqdn319Pn0jXfq4Zpr7vqRiGromYmSzMz5J
e/8YfnD4Uhfn+fuaaaaaaaaaTh8VRfCGSqc2lIXIaw+MP0hySqbDIfpD9IayqccPHKp8VC9q+L38
Sot8qngh8lRa1UupUXzvbmYx1QzTMzMzfSF0qi2w+qKnqeRJXzVGBGLIqaBJgRgR5ruq0qxGNPN5
ta8+JxSm5UZKJhZFTSrfFT0xU4RU1CNUSZKpsiht0gk1lLZh8H0LB9H6mLi0aLmD876MGR9HzbGr
cxfJubJ+1rCSP0s32dC4+fD8Ikkf4iSn4xUyU0lU/AI9sVOje5HW/zHc7UeCKGtFDyhGUUPw0Dqw
9cODqqEkf3Q5IKmoJD+z492+ncstXU73sfxebFe2vRcxWPY9Hc2u1q2vR0LmDJZc0ZLINVzN0MmK
5cwfr9EH7JD/cSCxSKQFRkFBYqowWKAsEVIqgooIqCgsRAWCiyCxYKKCxUYIigpFiqAsFjEFikWI
xQWLIoLEUQYkQQUWCowRVQRiiMRgiKKQWKLCKDEFkFEVkFWRYCigisgKfyknPOiQ+BPiL381mjg6
FOTkwZO5ixLMTlL3BiyeM2sG48vU0famZ1s2jsZOPkh5/kfGEkbrq8okYPf0tqherc/vtbT/NXZU
HGoofPE6EF1cnJzejGSc3llZesWZvT7djB5vI82x2wWXNIO90MMXg15wKkgYLmx4uYJCzR5NWDpc
XQ83qIJudLB165+0K3uTFsIU43O0UuhDoXe9b1Sntq3SqLFiSRYSQhVCIiJaSfYKOxRgOixLhB3G
DySOcISohY9S4x6nqeCiTRs6O9FTryr0BzNjixeXB36tiOKKm11Ol7+11Ox4+NmS92yQOfW+/hJA
1Otppjkvcb08jY0I/VHVKcNi2Veiyjlu3w6dRHwsEOJ7HOEg3LwhWeOVVSqpVQRmSqYxjGMYxjti
cankLsBHrqDhVKOHXxw8rR3Ne143W2NjteTxkne8mDufdNXraNrBi0WYKZqXpBI7z9JHSwsyjMRj
KifJYrR0ODieo3tXS2Loahxtrlb2x2hwfCr2VctXu5v8998vOwbwe3XxiJl9YRZ+N0QwUR7f1+DS
GVcp9FUToH/pL11fdzR2E1B4dKVO/vBHB6nG9lXUh1yitfC3SQTOBc6w6oSDuCXOf4IbNnnC8+VD
MozEzLMmZPf3bd3Up+9Th08uySS+jqq8mPmeKJ43idaHWjXqvTyQyh1qVR6IocT3+RuNkpxxQ4vs
8uy7/dR7zKuVHlslN4dsp5+7g3uzPAhMrOwKMK2VEbQh4BcmOCGHE4jVsjXvqF9jIobqtoRlmkaU
fXJa3b73gXOoXNWYtqns0neR9slvvs1vsX0XTxxv6qLwh19fXDxeir1wp7CaKgEhRKK98kkhRAge
gMnR1tVVVVVVVVVoA/NJADwHn7s+B9sk9sE7bleRaRU4I+vRGx6NpGqHD3d+rSpdsiJ7mWey+XBC
3eS/pLr2FNyC10KfN7YSDyeEkyxVV7v5xovR65JeFwftUySS2Q3UociyEbUczyOGzZuip1ZFTsIW
xkywxkxyrlQ1V7UOz08/BvcTeEYqpoEeurGgUyVTYCjZz2xsM79Qb7v7wjvBHReOqTHlq6atVbEF
ikoIdTOiTajRu9jJ8peYDpQ1lxaLVUjG9FoOG9ISDEwXxE183VDikUPVz7HflU4raaRQ6I5uSJ66
uS0S3P3Wg0Q7yGgI5onPsq1UqmzkzjyNM4RPJV1u6r6qTTkQ5FJLc4+l/8XckU4UJA6OElQA

###


-gerel




reply via email to

[Prev in Thread] Current Thread [Next in Thread]