[poppler] poppler/goo: GooString.cc,1.2,1.3 GooString.h,1.2,1.3

[Kristian Høgsberg]

Update of /cvs/poppler/poppler/goo
In directory kemper:/tmp/cvs-serv19780/goo

Modified Files:
	GooString.cc GooString.h 
Log Message:
2006-02-28  Kristian Høgsberg  <krh at redhat.com>

        * glib/poppler-document.cc (info_dict_get_string): Refactor
        _popper_goo_string_to_utf8() out into it's own function.

        * glib/poppler-page.cc (poppler_page_get_property): Use
        _popper_goo_string_to_utf8() here to convert ucs2 page labels.

        * glib/poppler-page.cc (poppler_page_get_selection_region): Add
        braces to fix warning.

        * poppler/PageLabelInfo.cc: If the label prefix string has a ucs2
        marker, append the number part of the label as ucs2 (#5952).



Index: GooString.cc
===================================================================
RCS file: /cvs/poppler/poppler/goo/GooString.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- GooString.cc	28 Aug 2005 09:43:18 -0000	1.2
+++ GooString.cc	28 Feb 2006 18:25:00 -0000	1.3
@@ -317,3 +317,8 @@
   }
   return 0;
 }
+
+GBool GooString::hasUnicodeMarker(void)
+{
+    return (s[0] & 0xff) == 0xfe && (s[1] & 0xff) == 0xff;
+}

Index: GooString.h
===================================================================
RCS file: /cvs/poppler/poppler/goo/GooString.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- GooString.h	28 Aug 2005 09:43:18 -0000	1.2
+++ GooString.h	28 Feb 2006 18:25:00 -0000	1.3
@@ -15,6 +15,8 @@
 #pragma interface
 #endif
 
+#include "gtypes.h"
+
 class GooString {
 public:
 
@@ -84,6 +86,8 @@
   int cmp(const char *sA);
   int cmpN(const char *sA, int n);
 
+  GBool hasUnicodeMarker(void);
+
 private:
 
   int length;