Commit 00c1566e authored by Albert Astals Cid's avatar Albert Astals Cid

UnicodeMapFuncs: Move implementation to .cpp

With that the last warning i got on poppler core is gone \o/
parent bf6d79b5
...@@ -378,6 +378,7 @@ set(poppler_SRCS ...@@ -378,6 +378,7 @@ set(poppler_SRCS
poppler/StructTreeRoot.cc poppler/StructTreeRoot.cc
poppler/StructElement.cc poppler/StructElement.cc
poppler/UnicodeMap.cc poppler/UnicodeMap.cc
poppler/UnicodeMapFuncs.cc
poppler/UnicodeTypeTable.cc poppler/UnicodeTypeTable.cc
poppler/UTF.cc poppler/UTF.cc
poppler/XRef.cc poppler/XRef.cc
......
//========================================================================
//
// UnicodeMapFuncs.cc
//
// 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>
// Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2018 Albert Astals Cid <aacid@kde.org>
//
// 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
//
//========================================================================
#include "UnicodeMapFuncs.h"
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;
}
}
int mapUTF16(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;
}
}
...@@ -15,71 +15,15 @@ ...@@ -15,71 +15,15 @@
// //
// Copyright (C) 2008 Koji Otani <sho@bbr.jp> // Copyright (C) 2008 Koji Otani <sho@bbr.jp>
// Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com> // Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2018 Albert Astals Cid <aacid@kde.org>
// //
// To see a description of the changes please see the Changelog file that // 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 // came with your tarball or type make ChangeLog if you are building from git
// //
//======================================================================== //========================================================================
static int mapUTF8(Unicode u, char *buf, int bufSize) { #include "UTF.h"
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 mapUTF16(Unicode u, char *buf, int bufSize) { int mapUTF8(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 */ int mapUTF16(Unicode u, char *buf, int bufSize);
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;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment