[poppler] Branch 'poppler-0.22' - poppler/PageLabelInfo.cc

[Albert Astals Cid]

 poppler/PageLabelInfo.cc |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 95609be551fc4413874b8980010be70fbbab112a
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Feb 18 19:47:19 2013 +0100

    Use the toLatin function in PageLabelInfo::indexToLabel
    
    Wonder why Kristian never enabled it?
    Fixes bug #61034

diff --git a/poppler/PageLabelInfo.cc b/poppler/PageLabelInfo.cc
index a099d11..7e1c155 100644
--- a/poppler/PageLabelInfo.cc
+++ b/poppler/PageLabelInfo.cc
@@ -136,7 +136,6 @@ static int fromLatin(const char *buffer)
   return -1;
 }
 
-#ifdef TEST
 static void toLatin(int number, GooString *str, GBool uppercase) {
   char base, letter;
   int i, count;
@@ -152,7 +151,6 @@ static void toLatin(int number, GooString *str, GBool uppercase) {
   for (i = 0; i < count; i++)
     str->append(letter);
 }
-#endif
 
 PageLabelInfo::Interval::Interval(Object *dict, int baseA) {
   Object obj;
@@ -332,9 +330,11 @@ GBool PageLabelInfo::indexToLabel(int index, GooString *label)
   case Interval::UppercaseRoman:
     toRoman(number, &number_string, gTrue);
     break;
-  case Interval::UppercaseLatin:
   case Interval::LowercaseLatin:
-    number = 0;
+    toLatin(number, &number_string, gFalse);
+    break;
+  case Interval::UppercaseLatin:
+    toLatin(number, &number_string, gTrue);
     break;
   case Interval::None:
     break;