const char *DecodedBitStreamParser::SHIFT_JIS = "SHIFT_JIS";
const char *DecodedBitStreamParser::EUC_JP = "EUC-JP";
-string DecodedBitStreamParser::convert(const unsigned char *bufIn, size_t nIn, const char *src) {
+void DecodedBitStreamParser::append(std::string &result, const unsigned char *bufIn, size_t nIn, const char *src) {
#ifndef NO_ICONV
if (nIn == 0) {
- return string();
+ return;
}
iconv_t cd = iconv_open(UTF8, src);
int nResult = maxOut - nTo;
bufOut[nResult] = '\0';
- string result((const char *)bufOut);
+ result.append((const char *)bufOut);
delete[] bufOut;
- return result;
#else
- return string((const char *)bufIn, nIn);
+ result.append((const char *)bufIn, nIn);
#endif
}
-string DecodedBitStreamParser::decodeKanjiSegment(Ref<BitSource> bits, int count) {
+void DecodedBitStreamParser::decodeKanjiSegment(Ref<BitSource> bits, std::string &result, int count) {
// Each character will require 2 bytes. Read the characters as 2-byte pairs
// and decode as Shift_JIS afterwards
size_t nBytes = 2 * count;
count--;
}
- string result = convert(buffer, nBytes, SHIFT_JIS);
+ append(result, buffer, nBytes, SHIFT_JIS);
delete[] buffer;
- return result;
}
-string DecodedBitStreamParser::decodeByteSegment(Ref<BitSource> bits, int count) {
+void DecodedBitStreamParser::decodeByteSegment(Ref<BitSource> bits, std::string &result, int count) {
int nBytes = count;
unsigned char* readBytes = new unsigned char[nBytes];
if (count << 3 > bits->available()) {
// Shift_JIS -- without anything like an ECI designator to
// give a hint.
const char *encoding = guessEncoding(readBytes, nBytes);
- string result = convert(readBytes, nBytes, encoding);
+ append(result, readBytes, nBytes, encoding);
delete[] readBytes;
- return result;
}
-string DecodedBitStreamParser::decodeNumericSegment(Ref<BitSource> bits, int count) {
+void DecodedBitStreamParser::decodeNumericSegment(Ref<BitSource> bits, std::string &result, int count) {
int nBytes = count;
unsigned char* bytes = new unsigned char[nBytes];
int i = 0;
}
bytes[i++] = ALPHANUMERIC_CHARS[digitBits];
}
- string result = convert(bytes, nBytes, ASCII);
+ append(result, bytes, nBytes, ASCII);
delete[] bytes;
- return result;
}
-string DecodedBitStreamParser::decodeAlphanumericSegment(Ref<BitSource> bits, int count) {
+void DecodedBitStreamParser::decodeAlphanumericSegment(Ref<BitSource> bits, std::string &result, int count) {
int nBytes = count;
unsigned char* bytes = new unsigned char[nBytes];
int i = 0;
if (count == 1) {
bytes[i++] = ALPHANUMERIC_CHARS[bits->readBits(6)];
}
- string result = convert(bytes, nBytes, ASCII);
+ append(result, bytes, nBytes, ASCII);
delete[] bytes;
- return result;
}
const char *
// How many characters will follow, encoded in this mode?
int count = bits->readBits(mode->getCharacterCountBits(version));
if (mode == &Mode::NUMERIC) {
- result = decodeNumericSegment(bits, count);
+ decodeNumericSegment(bits, result, count);
} else if (mode == &Mode::ALPHANUMERIC) {
- result = decodeAlphanumericSegment(bits, count);
+ decodeAlphanumericSegment(bits, result, count);
} else if (mode == &Mode::BYTE) {
- result = decodeByteSegment(bits, count);
+ decodeByteSegment(bits, result, count);
} else if (mode == &Mode::KANJI) {
- result = decodeKanjiSegment(bits, count);
+ decodeKanjiSegment(bits, result, count);
} else {
throw ReaderException("Unsupported mode indicator");
}
static const char *SHIFT_JIS;
static const char *EUC_JP;
- static std::string decodeKanjiSegment(Ref<BitSource> bits, int count);
- static std::string decodeByteSegment(Ref<BitSource> bits, int count);
- static std::string decodeAlphanumericSegment(Ref<BitSource> bits, int count);
- static std::string decodeNumericSegment(Ref<BitSource> bits, int count);
+ static void decodeKanjiSegment(Ref<BitSource> bits, std::string &result, int count);
+ static void decodeByteSegment(Ref<BitSource> bits, std::string &result, int count);
+ static void decodeAlphanumericSegment(Ref<BitSource> bits, std::string &result, int count);
+ static void decodeNumericSegment(Ref<BitSource> bits, std::string &result, int count);
static const char *guessEncoding(unsigned char *bytes, int length);
- static std::string convert(const unsigned char *bufIn, size_t nIn, const char *src);
+ static void append(std::string &ost, const unsigned char *bufIn, size_t nIn, const char *src);
public:
static std::string decode(ArrayRef<unsigned char> bytes, Version *version);