pdf-devel
[Top][All Lists]
Advanced

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

[pdf-devel] Patch for FS#79


From: gerel
Subject: [pdf-devel] Patch for FS#79
Date: Sat, 27 Dec 2008 18:10:15 -0800 (PST)

Hi hackers,

I attach a patch for "FS#79 - Make the text module tests to work with opaque
pointers". All test cases are passing with this patch.

##
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: file:///home/gerel/PROJECTS/libgnupdf/trunk/
# testament_sha1: 09824bc89f58c553f6a14e13f1f8edb541fa0e99
# timestamp: 2008-12-27 22:56:46 -0300
# base_revision_id: address@hidden
# 
# Begin patch
=== modified file 'ChangeLog'
--- ChangeLog   2008-12-27 21:39:44 +0000
+++ ChangeLog   2008-12-28 01:55:54 +0000
@@ -1,3 +1,36 @@
+2008-12-27  Gerardo E. Gidoni  <address@hidden>
+
+       * torture/unit/base/text/pdf-text-cmp.c: fixed test cases to not
+       access internal data without the API.
+
+       * torture/unit/base/text/pdf-text-filter.c: same.
+
+       * torture/unit/base/text/pdf-text-get-country.c: same.
+
+       * torture/unit/base/text/pdf-text-get-language.c: same.
+
+       * torture/unit/base/text/pdf-text-get-pdfdocenc.c: same.
+
+       * torture/unit/base/text/pdf-text-get-unicode.c: same.
+
+       * torture/unit/base/text/pdf-text-new-from-host.c: same.
+
+       * torture/unit/base/text/pdf-text-new-from-pdf-string.c: same.
+
+       * torture/unit/base/text/pdf-text-new-from-u32.c: same.
+
+       * torture/unit/base/text/pdf-text-new-from-unicode.c: same.
+
+       * torture/unit/base/text/pdf-text-set-country.c: same.
+
+       * torture/unit/base/text/pdf-text-set-host.c: same.
+
+       * torture/unit/base/text/pdf-text-set-language.c: same.
+
+       * torture/unit/base/text/pdf-text-set-pdfdocenc.c: same.
+
+       * torture/unit/base/text/pdf-text-set-unicode.c: same.
+
 2008-12-27  Jose E. Marchesi  <address@hidden>
 
        * src/base/pdf-fp-func.c (pdf_eval_type4): Use sinf and cosf

=== 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-28 01:55:54 +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,11 @@
   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_UTF32_HE,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 +123,11 @@
   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_UTF32_HE,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 +142,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-28 01:55:54 +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_UTF32_HE,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,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_UTF32_HE,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 +123,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -130,9 +138,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 +159,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_UTF32_HE,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 +176,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_UTF32_HE,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 +200,7 @@
   
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -200,9 +216,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 +247,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_UTF32_HE,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 +265,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_UTF32_HE,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 +289,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -280,9 +304,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 +325,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_UTF32_HE,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 +343,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_UTF32_HE,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 +367,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -351,9 +383,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 +407,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_UTF32_HE,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 +424,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_UTF32_HE,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 +448,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -423,9 +463,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 +484,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_UTF32_HE,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 +501,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_UTF32_HE,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 +525,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -494,9 +542,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 +571,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_UTF32_HE,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 +589,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_UTF32_HE,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 +613,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -573,9 +629,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 +652,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_UTF32_HE,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 +670,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_UTF32_HE,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 +694,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -645,9 +709,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 +730,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_UTF32_HE,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 +748,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_UTF32_HE,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 +772,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -718,9 +790,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 +819,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_UTF32_HE,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 +836,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_UTF32_HE,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 +863,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -799,9 +879,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 +908,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_UTF32_HE,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 +925,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_UTF32_HE,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 +949,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -877,9 +965,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 +1015,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_UTF32_HE,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 +1067,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_UTF32_HE,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 +1091,7 @@
       pdf_dealloc(output_data);
       pdf_text_destroy(text);
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1011,9 +1107,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 +1137,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_UTF32_HE,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 +1154,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_UTF32_HE,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 +1178,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1089,9 +1193,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 +1226,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_UTF32_HE,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 +1243,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_UTF32_HE,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 +1268,7 @@
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
 
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1193,9 +1305,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 +1338,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_UTF32_HE,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 +1355,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_UTF32_HE,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 +1379,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1276,9 +1396,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 +1427,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_UTF32_HE,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 +1444,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_UTF32_HE,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 +1468,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1359,9 +1487,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 +1520,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_UTF32_HE,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 +1537,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_UTF32_HE,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 +1561,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1444,9 +1580,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 +1614,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_UTF32_HE,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 +1631,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_UTF32_HE,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 +1655,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1527,9 +1671,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 +1726,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_UTF32_HE,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 +1779,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_UTF32_HE,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 +1803,7 @@
       pdf_dealloc(output_data);
       pdf_text_destroy(text);
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1668,9 +1820,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 +1853,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_UTF32_HE,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 +1870,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_UTF32_HE,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 +1894,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1750,9 +1910,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 +1946,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_UTF32_HE,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 +1963,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_UTF32_HE,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 +1987,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1858,9 +2026,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 +2062,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_UTF32_HE,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 +2079,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_UTF32_HE,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 +2103,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1944,9 +2120,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 +2151,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_UTF32_HE,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 +2168,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_UTF32_HE,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 +2192,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2028,9 +2212,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 +2248,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_UTF32_HE,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 +2265,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_UTF32_HE,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 +2289,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2117,9 +2309,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 +2346,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_UTF32_HE,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 +2363,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_UTF32_HE,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 +2387,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2206,9 +2406,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 +2435,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_UTF32_HE,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 +2452,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_UTF32_HE,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 +2479,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2287,9 +2495,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 +2518,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_UTF32_HE,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 +2535,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_UTF32_HE,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 +2559,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2360,9 +2576,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 +2629,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_UTF32_HE,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 +2645,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_UTF32_HE,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 +2699,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_UTF32_HE,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 +2715,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_UTF32_HE,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 +2739,7 @@
       pdf_dealloc(output_data);
       pdf_text_destroy(text);
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2524,9 +2756,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 +2786,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_UTF32_HE,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 +2803,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_UTF32_HE,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 +2827,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2602,9 +2842,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 +2875,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_UTF32_HE,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 +2892,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_UTF32_HE,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 +2916,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2705,9 +2953,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 +2985,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_UTF32_HE,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 +3002,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_UTF32_HE,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 +3026,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2787,9 +3043,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 +3073,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_UTF32_HE,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 +3090,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_UTF32_HE,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 +3114,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2869,9 +3133,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 +3165,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_UTF32_HE,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 +3182,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_UTF32_HE,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 +3206,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2953,9 +3225,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 +3259,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_UTF32_HE,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 +3276,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_UTF32_HE,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 +3300,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -3037,9 +3317,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 +3378,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_UTF32_HE,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 +3438,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_UTF32_HE,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 +3462,7 @@
       pdf_dealloc(output_data);
       pdf_text_destroy(text);
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -3192,9 +3480,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 +3513,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_UTF32_HE,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 +3530,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_UTF32_HE,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 +3554,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -3275,9 +3571,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 +3607,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_UTF32_HE,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 +3624,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_UTF32_HE,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 +3648,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -3383,9 +3687,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 +3723,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_UTF32_HE,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 +3740,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_UTF32_HE,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 +3764,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -3469,9 +3781,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 +3812,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_UTF32_HE,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 +3829,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_UTF32_HE,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 +3853,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -3553,9 +3873,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 +3909,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_UTF32_HE,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 +3926,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_UTF32_HE,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 +3950,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -3642,9 +3970,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 +4006,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_UTF32_HE,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 +4023,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_UTF32_HE,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 +4047,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -3730,9 +4066,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 +4095,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_UTF32_HE,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 +4112,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_UTF32_HE,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 +4139,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -3811,9 +4155,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 +4180,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_UTF32_HE,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 +4197,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_UTF32_HE,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 +4221,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -3886,9 +4238,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 +4298,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_UTF32_HE,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 +4357,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_UTF32_HE,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 +4381,7 @@
       pdf_dealloc(output_data);
       pdf_text_destroy(text);
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -4038,9 +4398,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 +4428,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_UTF32_HE,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 +4445,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_UTF32_HE,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 +4469,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -4116,9 +4484,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 +4519,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_UTF32_HE,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 +4536,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_UTF32_HE,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 +4560,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -4221,9 +4597,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 +4631,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_UTF32_HE,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 +4648,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_UTF32_HE,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 +4672,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -4305,9 +4689,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 +4721,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_UTF32_HE,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 +4738,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_UTF32_HE,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 +4762,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -4389,9 +4781,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 +4815,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_UTF32_HE,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 +4832,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_UTF32_HE,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 +4856,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -4475,9 +4875,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 +4911,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_UTF32_HE,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 +4928,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_UTF32_HE,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 +4952,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -4561,9 +4969,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 +5035,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_UTF32_HE,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 +5097,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_UTF32_HE,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 +5121,7 @@
       pdf_dealloc(output_data);
       pdf_text_destroy(text);
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -4722,9 +5138,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 +5173,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_UTF32_HE,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 +5190,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_UTF32_HE,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 +5214,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -4807,9 +5231,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 +5269,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_UTF32_HE,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 +5286,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_UTF32_HE,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 +5310,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -4917,9 +5349,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 +5387,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_UTF32_HE,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 +5404,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_UTF32_HE,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 +5429,7 @@
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
 
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -5006,9 +5446,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 +5479,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_UTF32_HE,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 +5496,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_UTF32_HE,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 +5520,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -5092,9 +5540,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 +5578,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_UTF32_HE,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 +5595,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_UTF32_HE,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 +5619,7 @@
 
   pdf_dealloc(output_data);
   pdf_text_destroy(text);
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -5183,9 +5639,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 +5675,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_UTF32_HE,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 +5692,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_UTF32_HE,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 +5716,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-28 01:55:54 
+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;
 
@@ -51,8 +51,7 @@
   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';
+  fail_if(pdf_text_set_country(text, "FR") != PDF_OK);
   
   /* 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-28 01:55:54 
+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;
   
@@ -51,8 +51,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';
+  fail_if(pdf_text_set_language(text, "en") != PDF_OK);
   
   /* Get country ID */
   language = pdf_text_get_language(text);
@@ -64,7 +63,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-28 01:55:54 
+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-28 01:55:54 
+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,11 @@
         {
           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_HE,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 +117,7 @@
       
       ++i;
     }
-#endif /* DEACTIVATED */  
+  
 }
 END_TEST
 
@@ -132,9 +136,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 +179,11 @@
           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_UTF32_HE,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 +213,7 @@
       
       ++i;
     }
-#endif /* DEACTIVATED */  
+  
 }
 END_TEST
 
@@ -383,9 +391,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 +433,11 @@
         {
           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_HE,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 +461,7 @@
       
       ++i;
     }
-#endif /* DEACTIVATED */  
+  
 }
 END_TEST
 
@@ -467,9 +479,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 +521,11 @@
         {
           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_HE,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 +549,7 @@
       
       ++i;
     }
-#endif /* DEACTIVATED */  
+  
 }
 END_TEST
 
@@ -634,9 +650,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 +694,11 @@
           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_UTF32_HE,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 +732,7 @@
       pdf_dealloc(data);
       ++i;
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -732,9 +752,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 +795,11 @@
           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_UTF32_HE,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 +834,7 @@
       ++i;
     }
 
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1306,9 +1330,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 +1376,11 @@
         {
           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_HE,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 +1406,7 @@
       
       ++i;
     }
-#endif /* DEACTIVATED */  
+  
 }
 END_TEST
 
@@ -1778,9 +1806,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 +1838,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_UTF32_HE,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 +1885,7 @@
       pdf_dealloc(data);      
       ++i;
     }
-#endif /* DEACTIVATED */  
+  
 }
 END_TEST
 
@@ -1870,9 +1902,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 +1944,11 @@
         {
           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_HE,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 +1973,7 @@
       
       ++i;
     }
-#endif /* DEACTIVATED */  
+  
 }
 END_TEST
 
@@ -2414,9 +2450,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 +2496,11 @@
         {
           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_HE,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 +2526,7 @@
       
       ++i;
     }
-#endif /* DEACTIVATED */  
+  
 }
 END_TEST
 
@@ -2884,9 +2924,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 +2969,11 @@
         {
           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_HE,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 +2999,7 @@
       
       ++i;
     }
-#endif /* DEACTIVATED */  
+  
 }
 END_TEST
 
@@ -2979,9 +3023,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 +3071,11 @@
           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_UTF32_HE,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 +3106,7 @@
       
       ++i;
     }
-#endif /* DEACTIVATED */  
+  
 }
 END_TEST
 
@@ -3245,9 +3293,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 +3339,11 @@
         {
           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_HE,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 +3368,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-28 01:55:54 
+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;
   
@@ -96,9 +96,13 @@
                                          &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_HE,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)
@@ -108,7 +112,7 @@
 
       ++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-28 
01:55:54 +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;
   
@@ -97,8 +97,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_UTF32_HE,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);
@@ -119,7 +123,7 @@
         }
       ++i;
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -173,9 +177,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;
   
@@ -226,7 +230,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_UTF32_HE,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 +248,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_UTF32_HE,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);
@@ -261,7 +274,7 @@
         }
       ++i;
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -389,9 +402,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";
@@ -454,8 +467,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_UTF32_HE,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 +489,13 @@
         }
       
       /* 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_UTF32_HE,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 */
@@ -498,7 +520,7 @@
       pdf_dealloc(input_data);
       ++i;
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -520,9 +542,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";
@@ -588,8 +610,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_UTF32_HE,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 +632,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_UTF32_HE,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 */
@@ -634,7 +664,7 @@
       pdf_dealloc(input_data);
       ++i;
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -674,9 +704,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";
@@ -800,8 +830,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_UTF32_HE,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 +857,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_UTF32_HE,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 */
@@ -856,8 +894,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_UTF32_HE,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 +921,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_UTF32_HE,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 */
@@ -912,8 +956,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_UTF32_HE,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 +983,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_UTF32_HE,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 */
@@ -967,7 +1017,7 @@
       ++i;
     }
 
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1009,9 +1059,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";
@@ -1141,8 +1191,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_UTF32_HE,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 +1218,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_UTF32_HE,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 */
@@ -1199,8 +1257,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_UTF32_HE,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 +1284,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_UTF32_HE,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 */
@@ -1257,8 +1321,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_UTF32_HE,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 +1348,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_UTF32_HE,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 */
@@ -1313,7 +1383,7 @@
       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-28 01:55:54 
+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_UTF32_HE,0) == PDF_OK);
+  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_UTF32_HE,0) == PDF_OK);
+  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-28 01:55:54 
+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;
   
@@ -92,8 +92,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_UTF32_HE,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);
@@ -110,7 +114,7 @@
         }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -129,9 +133,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_002)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -175,8 +179,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_UTF32_HE,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);
@@ -192,7 +200,7 @@
         }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -211,9 +219,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_003)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -259,8 +267,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_UTF32_HE,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);
@@ -278,7 +290,7 @@
       ++i;
     }  
 
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -296,9 +308,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_004)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -356,8 +368,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_UTF32_HE,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);
@@ -377,7 +393,7 @@
         }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -396,9 +412,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_005)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -442,8 +458,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_UTF32_HE,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);
@@ -460,7 +480,7 @@
       ++i;
     }  
 
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -479,9 +499,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_006)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -527,8 +547,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_UTF32_HE,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);
@@ -546,7 +570,7 @@
       ++i;
     }  
 
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -565,9 +589,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_007)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -624,8 +648,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_UTF32_HE,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);
@@ -645,7 +673,7 @@
         }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -663,9 +691,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_008)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf8_strings[];
   int i;
   
@@ -709,8 +737,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_UTF32_HE,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);
@@ -728,7 +760,7 @@
       ++i;
     }  
 
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -747,9 +779,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_009)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -793,8 +825,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_UTF32_HE,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);
@@ -810,7 +846,7 @@
         }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -829,9 +865,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_010)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -877,8 +913,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_UTF32_HE,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);
@@ -895,7 +935,7 @@
       pdf_dealloc(input_data);
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -913,9 +953,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_011)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -973,8 +1013,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_UTF32_HE,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);
@@ -995,7 +1039,7 @@
       ++i;
     }  
 
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1014,9 +1058,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_012)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -1061,7 +1105,11 @@
           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_HE,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 +1130,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_UTF32_HE,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);
@@ -1100,7 +1152,7 @@
       ++i;
     }  
 
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1119,9 +1171,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_013)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -1167,8 +1219,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_UTF32_HE,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);
@@ -1186,7 +1242,7 @@
       ++i;
     }  
 
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1205,9 +1261,9 @@
  */
 START_TEST(pdf_text_new_from_unicode_014)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -1264,8 +1320,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_UTF32_HE,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);
@@ -1286,7 +1346,7 @@
       ++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-28 01:55:54 
+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-28 01:55:54 +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,13 @@
                                     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_UTF32_HE,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 +112,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-28 01:55:54 
+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-28 01:55:54 
+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,13 @@
                                      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_UTF32_HE,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 +105,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-28 01:55:54 
+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;
   
@@ -89,8 +89,13 @@
       
       /* 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_UTF32_HE,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 +105,7 @@
         }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -116,9 +121,9 @@
  */
 START_TEST(pdf_text_set_unicode_002)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -161,8 +166,13 @@
                                    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_UTF32_HE,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);
       
@@ -172,7 +182,7 @@
         }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -188,9 +198,9 @@
  */
 START_TEST(pdf_text_set_unicode_003)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -235,8 +245,13 @@
                                    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_UTF32_HE,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);
       
@@ -247,7 +262,7 @@
       pdf_dealloc(input_data);
       ++i;
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -262,9 +277,9 @@
  */
 START_TEST(pdf_text_set_unicode_004)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -321,8 +336,13 @@
                                    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_UTF32_HE,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);
       
@@ -336,7 +356,7 @@
         }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -352,9 +372,9 @@
  */
 START_TEST(pdf_text_set_unicode_005)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -397,8 +417,13 @@
                                    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_HE,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);
       
@@ -408,7 +433,7 @@
         }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -424,9 +449,9 @@
  */
 START_TEST(pdf_text_set_unicode_006)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -471,8 +496,13 @@
                                    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_HE,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);
       
@@ -483,7 +513,7 @@
       pdf_dealloc(input_data);
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -499,9 +529,9 @@
  */
 START_TEST(pdf_text_set_unicode_007)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -557,8 +587,13 @@
                                    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,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);
       
@@ -572,7 +607,7 @@
         }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -587,9 +622,9 @@
  */
 START_TEST(pdf_text_set_unicode_008)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf8_strings[];
   int i;
   
@@ -632,8 +667,13 @@
                                    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_UTF32_HE,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);
       
@@ -643,7 +683,7 @@
         }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -659,9 +699,9 @@
  */
 START_TEST(pdf_text_set_unicode_009)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -704,8 +744,13 @@
                                    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_UTF32_HE,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);
       
@@ -715,7 +760,7 @@
         }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -731,9 +776,9 @@
  */
 START_TEST(pdf_text_set_unicode_010)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -778,8 +823,13 @@
                                    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_UTF32_HE,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);
       
@@ -790,7 +840,7 @@
       pdf_dealloc(input_data);
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -805,9 +855,9 @@
  */
 START_TEST(pdf_text_set_unicode_011)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf16be_strings[];
   int i;
   
@@ -864,8 +914,13 @@
                                    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_UTF32_HE,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);
       
@@ -879,7 +934,7 @@
         }
       ++i;
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -895,9 +950,9 @@
  */
 START_TEST(pdf_text_set_unicode_012)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -944,7 +999,11 @@
           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_HE,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);
@@ -962,8 +1021,13 @@
         }
       
       /* 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,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);
       
@@ -973,7 +1037,7 @@
         }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -989,9 +1053,9 @@
  */
 START_TEST(pdf_text_set_unicode_013)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -1036,8 +1100,13 @@
                                    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_HE,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);
       
@@ -1048,7 +1117,7 @@
       pdf_dealloc(input_data);
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -1064,9 +1133,9 @@
  */
 START_TEST(pdf_text_set_unicode_014)
 {
-  fail_if(0 == 0);
-
-#ifdef DEACTIVATED
+  
+
+
   extern const test_string_t utf32be_strings[];
   int i;
   
@@ -1122,8 +1191,13 @@
                                    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,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);
       
@@ -1137,7 +1211,7 @@
         }
       ++i;
     }  
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2063,9 +2137,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";
@@ -2142,7 +2216,11 @@
         {
           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_HE,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);
           fail_if(expected_hex == NULL);          
@@ -2155,8 +2233,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_UTF32_HE,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 +2253,7 @@
 
       ++i;
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 
@@ -2189,9 +2272,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";
@@ -2266,7 +2349,11 @@
         {
           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_HE,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);
           fail_if(expected_hex == NULL);          
@@ -2279,8 +2366,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_UTF32_HE,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);
@@ -2294,7 +2386,7 @@
       
       ++i;
     }
-#endif /* DEACTIVATED */
+
 }
 END_TEST
 

# Begin bundle
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

###

cheers

-gerel




reply via email to

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