Attachment 67555 Details for Bug 55225 – 0003-Split-our-UTF.h-into-xpdf-based-UTF8.h-and-a-poppler.patch

[patch] 0003-Split-our-UTF.h-into-xpdf-based-UTF8.h-and-a-poppler.patch

0003-Split-our-UTF.h-into-xpdf-based-UTF8.h-and-a-poppler.patch (text/plain), 6.14 KB, created by Hib Eris on 2012-09-22 19:35:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hib Eris

Created: 2012-09-22 19:35:30 UTC

Size: 6.14 KB

patch

obsolete

>From a3018a91e6b96887ae5e4eac3323a42663f55493 Mon Sep 17 00:00:00 2001
>From: Hib Eris <hib@hiberis.nl>
>Date: Sat, 22 Sep 2012 20:50:07 +0200
>Subject: [PATCH 3/3] Split our UTF.h into xpdf based UTF8.h and a poppler
> specific UTF.h
>
>---
> poppler/GlobalParams.cc |    2 +-
> poppler/Makefile.am     |    1 +
> poppler/UTF.h           |   79 +-------------------------------------------
> poppler/UTF8.h          |   84 +++++++++++++++++++++++++++++++++++++++++++++++
> 4 files changed, 87 insertions(+), 79 deletions(-)
> create mode 100644 poppler/UTF8.h
>
>diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc
>index 148a0dd..098e4a4 100644
>--- a/poppler/GlobalParams.cc
>+++ b/poppler/GlobalParams.cc
>@@ -108,7 +108,7 @@
> 
> #include "NameToUnicodeTable.h"
> #include "UnicodeMapTables.h"
>-#include "UTF.h"
>+#include "UTF8.h"
> 
> #ifdef ENABLE_PLUGINS
> #  ifdef _WIN32
>diff --git a/poppler/Makefile.am b/poppler/Makefile.am
>index 3a5f4ca..e10d19d 100644
>--- a/poppler/Makefile.am
>+++ b/poppler/Makefile.am
>@@ -252,6 +252,7 @@ poppler_include_HEADERS =	\
> 	TextOutputDev.h		\
> 	SecurityHandler.h	\
> 	UTF.h			\
>+	UTF8.h			\
> 	XpdfPluginAPI.h		\
> 	Sound.h
> nodist_poppler_include_HEADERS = poppler-config.h
>diff --git a/poppler/UTF.h b/poppler/UTF.h
>index 079b3a2..1111c37 100644
>--- a/poppler/UTF.h
>+++ b/poppler/UTF.h
>@@ -2,23 +2,10 @@
> //
> // UTF.h
> //
>-// Copyright 2001-2003 Glyph & Cog, LLC
>+// This file is licensed under the GPLv2 or later
> //
>-//========================================================================
>-
>-//========================================================================
>-//
>-// Modified under the Poppler project - http://poppler.freedesktop.org
>-//
>-// All changes made under the Poppler project to this file are licensed
>-// under GPL version 2 or later
>-//
>-// Copyright (C) 2008 Koji Otani <sho@bbr.jp>
> // Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
> //
>-// To see a description of the changes please see the Changelog file that
>-// came with your tarball or type make ChangeLog if you are building from git
>-//
> //========================================================================
> 
> #ifndef UTF_H
>@@ -45,68 +32,4 @@ int UTF16toUCS4(const Unicode *utf16, int utf16_len, Unicode **ucs4_out);
> //   returns number of UCS-4 characters
> int TextStringToUCS4(GooString *textStr, Unicode **ucs4);
> 
>-
>-static int mapUTF8(Unicode u, char *buf, int bufSize) {
>-  if        (u <= 0x0000007f) {
>-    if (bufSize < 1) {
>-      return 0;
>-    }
>-    buf[0] = (char)u;
>-    return 1;
>-  } else if (u <= 0x000007ff) {
>-    if (bufSize < 2) {
>-      return 0;
>-    }
>-    buf[0] = (char)(0xc0 + (u >> 6));
>-    buf[1] = (char)(0x80 + (u & 0x3f));
>-    return 2;
>-  } else if (u <= 0x0000ffff) {
>-    if (bufSize < 3) {
>-      return 0;
>-    }
>-    buf[0] = (char)(0xe0 + (u >> 12));
>-    buf[1] = (char)(0x80 + ((u >> 6) & 0x3f));
>-    buf[2] = (char)(0x80 + (u & 0x3f));
>-    return 3;
>-  } else if (u <= 0x0010ffff) {
>-    if (bufSize < 4) {
>-      return 0;
>-    }
>-    buf[0] = (char)(0xf0 + (u >> 18));
>-    buf[1] = (char)(0x80 + ((u >> 12) & 0x3f));
>-    buf[2] = (char)(0x80 + ((u >> 6) & 0x3f));
>-    buf[3] = (char)(0x80 + (u & 0x3f));
>-    return 4;
>-  } else {
>-    return 0;
>-  }
>-}
>-
>-static int mapUCS2(Unicode u, char *buf, int bufSize) {
>-  if (u <= 0xffff) {
>-    if (bufSize < 2) {
>-      return 0;
>-     }
>-    buf[0] = (char)((u >> 8) & 0xff);
>-    buf[1] = (char)(u & 0xff);
>-    return 2;
>-  } else if (u < 0x110000) {
>-    Unicode uu;
>-
>-    /* using surrogate pair */
>-    if (bufSize < 4) {
>-      return 0;
>-    }
>-    uu = ((u - 0x10000) >> 10) + 0xd800;
>-    buf[0] = (char)((uu >> 8) & 0xff);
>-    buf[1] = (char)(uu & 0xff);
>-    uu = (u & 0x3ff)+0xdc00;
>-    buf[2] = (char)((uu >> 8) & 0xff);
>-    buf[3] = (char)(uu & 0xff);
>-    return 4;
>-  } else {
>-    return 0;
>-  }
>-}
>-
> #endif
>diff --git a/poppler/UTF8.h b/poppler/UTF8.h
>new file mode 100644
>index 0000000..34a07d4
>--- /dev/null
>+++ b/poppler/UTF8.h
>@@ -0,0 +1,84 @@
>+//========================================================================
>+//
>+// UTF8.h
>+//
>+// Copyright 2001-2003 Glyph & Cog, LLC
>+//
>+//========================================================================
>+
>+//========================================================================
>+//
>+// Modified under the Poppler project - http://poppler.freedesktop.org
>+//
>+// All changes made under the Poppler project to this file are licensed
>+// under GPL version 2 or later
>+//
>+// Copyright (C) 2008 Koji Otani <sho@bbr.jp>
>+//
>+// To see a description of the changes please see the Changelog file that
>+// came with your tarball or type make ChangeLog if you are building from git
>+//
>+//========================================================================
>+
>+static int mapUTF8(Unicode u, char *buf, int bufSize) {
>+  if        (u <= 0x0000007f) {
>+    if (bufSize < 1) {
>+      return 0;
>+    }
>+    buf[0] = (char)u;
>+    return 1;
>+  } else if (u <= 0x000007ff) {
>+    if (bufSize < 2) {
>+      return 0;
>+    }
>+    buf[0] = (char)(0xc0 + (u >> 6));
>+    buf[1] = (char)(0x80 + (u & 0x3f));
>+    return 2;
>+  } else if (u <= 0x0000ffff) {
>+    if (bufSize < 3) {
>+      return 0;
>+    }
>+    buf[0] = (char)(0xe0 + (u >> 12));
>+    buf[1] = (char)(0x80 + ((u >> 6) & 0x3f));
>+    buf[2] = (char)(0x80 + (u & 0x3f));
>+    return 3;
>+  } else if (u <= 0x0010ffff) {
>+    if (bufSize < 4) {
>+      return 0;
>+    }
>+    buf[0] = (char)(0xf0 + (u >> 18));
>+    buf[1] = (char)(0x80 + ((u >> 12) & 0x3f));
>+    buf[2] = (char)(0x80 + ((u >> 6) & 0x3f));
>+    buf[3] = (char)(0x80 + (u & 0x3f));
>+    return 4;
>+  } else {
>+    return 0;
>+  }
>+}
>+
>+static int mapUCS2(Unicode u, char *buf, int bufSize) {
>+  if (u <= 0xffff) {
>+    if (bufSize < 2) {
>+      return 0;
>+    }
>+    buf[0] = (char)((u >> 8) & 0xff);
>+    buf[1] = (char)(u & 0xff);
>+    return 2;
>+  } else if (u < 0x110000) {
>+    Unicode uu;
>+
>+    /* using surrogate pair */
>+    if (bufSize < 4) {
>+      return 0;
>+    }
>+    uu = ((u - 0x10000) >> 10) + 0xd800;
>+    buf[0] = (char)((uu >> 8) & 0xff);
>+    buf[1] = (char)(uu & 0xff);
>+    uu = (u & 0x3ff)+0xdc00;
>+    buf[2] = (char)((uu >> 8) & 0xff);
>+    buf[3] = (char)(uu & 0xff);
>+    return 4;
>+  } else {
>+    return 0;
>+  }
>+}
>-- 
>1.7.5.4
>

Actions: View | Splinter Review

Attachments on bug 55225: 67553 | 67554 | 67555

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.