diff --git a/goldendict.pro b/goldendict.pro index 0c07617e..6d069ba8 100644 --- a/goldendict.pro +++ b/goldendict.pro @@ -73,6 +73,11 @@ CONFIG( use_xapian ) { LIBS+= -lxapian } +CONFIG( use_iconv ) { + DEFINES += USE_ICONV + LIBS+= -liconv +} + CONFIG += exceptions \ rtti \ stl \ @@ -207,7 +212,7 @@ mac { # You will need to use Xcode 3 and Qt Carbon SDK # if you want the support for PowerPC and/or Mac OS X 10.4 # CONFIG += x86 x86_64 ppc - LIBS = -lz \ + LIBS += -lz \ -lbz2 \ -lvorbisfile \ -lvorbis \ @@ -676,14 +681,8 @@ TS_OUT = $$TRANSLATIONS TS_OUT ~= s/.ts/.qm/g PRE_TARGETDEPS += $$TS_OUT -equals(QT_VERSION,6.4.0) { - #QTBUG-105984 - multimedia.files = $$[QT_PLUGIN_PATH]/multimedia/* - multimedia.path = plugins/multimedia - #multimedia.CONFIG += no_check_exist - message("copy qt6.4.0 multimedia") - INSTALLS += multimedia -} +#QTBUG-105984 +# avoid qt6.4.0-6.4.2 . the qtmultimedia module is buggy in all these versions include( thirdparty/qtsingleapplication/src/qtsingleapplication.pri ) diff --git a/iconv.cc b/iconv.cc index b534fda2..f5bbce50 100644 --- a/iconv.cc +++ b/iconv.cc @@ -15,21 +15,95 @@ char const * const Iconv::Utf8 = "UTF-8"; using gd::wchar; Iconv::Iconv( char const * to, char const * from ) +#ifdef USE_ICONV + :state( iconv_open( to, from ) ) +#endif { - codec = QTextCodec::codecForName(from); +#ifdef USE_ICONV + if( state == (iconv_t) -1 ) + throw exCantInit( strerror( errno ) ); +#else + codec = QTextCodec::codecForName( from ); +#endif } Iconv::~Iconv() { - + #ifdef USE_ICONV + iconv_close( state ); + #endif } QString Iconv::convert(void const* & inBuf, size_t& inBytesLeft) { +#ifdef USE_ICONV + size_t dsz = inBytesLeft; + //avoid most realloc + std::vector< char > outBuf( dsz + 32 ); + + void * outBufPtr = &outBuf.front(); + + size_t outBufLeft = outBuf.size(); + size_t result; + while( inBytesLeft > 0 ) + { + result = iconv( state, (char **) &inBuf, &inBytesLeft, (char **) &outBufPtr, &outBufLeft ); + if( result == (size_t) -1 ) + { + if( errno == E2BIG || outBufLeft == 0 ) + { + + if( inBytesLeft > 0 ) + { + // Grow the buffer and retry + // The pointer may get invalidated so we save the diff and restore it + size_t offset = (char *) outBufPtr - &outBuf.front(); + outBuf.resize( outBuf.size() + dsz ); + outBufPtr = &outBuf.front() + offset; + outBufLeft += dsz; + continue; + } + } + break; + } + } + + //flush output + if( result != (size_t) ( -1 ) ) + { + /* flush the shift-out sequences */ + for( ;; ) + { + result = iconv( state, NULL, NULL, (char **) &outBufPtr, &outBufLeft ); + + if( result != (size_t) ( -1 ) ) + { + break; + } + + if( errno == E2BIG ) + { + size_t offset = (char *) outBufPtr - &outBuf.front(); + outBuf.resize( outBuf.size() + 256 ); + outBufPtr = &outBuf.front() + offset; + outBufLeft += 256; + } + else + { + break; + } + } + } + + size_t datasize = outBuf.size() - outBufLeft; + QByteArray ba( &outBuf.front(), datasize ); + return QString( ba ); +#else if( codec ) return codec->toUnicode( static_cast< const char * >( inBuf ), inBytesLeft ); QByteArray ba( static_cast< const char * >( inBuf ), inBytesLeft ); return QString( ba ); +#endif } gd::wstring Iconv::toWstring( char const * fromEncoding, void const * fromData, @@ -44,9 +118,6 @@ gd::wstring Iconv::toWstring( char const * fromEncoding, void const * fromData, Iconv ic( GdWchar, fromEncoding ); - /// This size is usually enough, but may be enlarged during the conversion - std::vector< wchar > outBuf( dataSize ); - QString outStr = ic.convert(fromData, dataSize); return gd::toWString(outStr); } @@ -62,8 +133,6 @@ std::string Iconv::toUtf8( char const * fromEncoding, void const * fromData, Iconv ic( Utf8, fromEncoding ); - std::vector< char > outBuf( dataSize ); - QString outStr = ic.convert(fromData, dataSize); return gd::toStdString(outStr); } diff --git a/iconv.hh b/iconv.hh index 8cda0c81..dda3d2e0 100644 --- a/iconv.hh +++ b/iconv.hh @@ -9,15 +9,24 @@ #include "wstring.hh" #include "ex.hh" +#ifdef USE_ICONV +#include +#endif + /// A wrapper for the iconv() character set conversion functions class Iconv { - //iconv_t state; - QTextCodec* codec; +#ifdef USE_ICONV + iconv_t state; +#else + QTextCodec* codec; + +#endif public: DEF_EX( Ex, "Iconv exception", std::exception ) + DEF_EX_STR( exCantInit, "Can't initialize iconv conversion:", Ex ) // Some predefined character sets' names diff --git a/winlibs/include/iconv.h b/winlibs/include/iconv.h new file mode 100644 index 00000000..fdf3c537 --- /dev/null +++ b/winlibs/include/iconv.h @@ -0,0 +1,241 @@ +/* Copyright (C) 1999-2022 Free Software Foundation, Inc. + This file is part of the GNU LIBICONV Library. + + The GNU LIBICONV Library is free software; you can redistribute it + and/or modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either version 2.1 + of the License, or (at your option) any later version. + + The GNU LIBICONV Library is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU LIBICONV Library; see the file COPYING.LIB. + If not, see . */ + +/* When installed, this file is called "iconv.h". */ + +#ifndef _LIBICONV_H +#define _LIBICONV_H + +#define _LIBICONV_VERSION 0x0111 /* version number: (major<<8) + minor */ +extern __declspec (dllimport) int _libiconv_version; /* Likewise */ + +/* We would like to #include any system header file which could define + iconv_t, 1. in order to eliminate the risk that the user gets compilation + errors because some other system header file includes /usr/include/iconv.h + which defines iconv_t or declares iconv after this file, 2. when compiling + for LIBICONV_PLUG, we need the proper iconv_t type in order to produce + binary compatible code. + But gcc's #include_next is not portable. Thus, once libiconv's iconv.h + has been installed in /usr/local/include, there is no way any more to + include the original /usr/include/iconv.h. We simply have to get away + without it. + Ad 1. The risk that a system header file does + #include "iconv.h" or #include_next "iconv.h" + is small. They all do #include . + Ad 2. The iconv_t type is a pointer type in all cases I have seen. (It + has to be a scalar type because (iconv_t)(-1) is a possible return value + from iconv_open().) */ + +/* Define iconv_t ourselves. */ +#undef iconv_t +#define iconv_t libiconv_t +typedef void* iconv_t; + +/* Get size_t declaration. + Get wchar_t declaration if it exists. */ +#include + +/* Get errno declaration and values. */ +#include +/* Some systems, like SunOS 4, don't have EILSEQ. Some systems, like BSD/OS, + have EILSEQ in a different header. On these systems, define EILSEQ + ourselves. */ +#ifndef EILSEQ +#define EILSEQ +#endif + + +#ifdef __cplusplus +extern "C" { +#endif + + +/* Allocates descriptor for code conversion from encoding ‘fromcode’ to + encoding ‘tocode’. */ +#ifndef LIBICONV_PLUG +#define iconv_open libiconv_open +#endif +extern iconv_t iconv_open (const char* tocode, const char* fromcode); + +/* Converts, using conversion descriptor ‘cd’, at most ‘*inbytesleft’ bytes + starting at ‘*inbuf’, writing at most ‘*outbytesleft’ bytes starting at + ‘*outbuf’. + Decrements ‘*inbytesleft’ and increments ‘*inbuf’ by the same amount. + Decrements ‘*outbytesleft’ and increments ‘*outbuf’ by the same amount. */ +#ifndef LIBICONV_PLUG +#define iconv libiconv +#endif +extern size_t iconv (iconv_t cd, char* * inbuf, size_t *inbytesleft, char* * outbuf, size_t *outbytesleft); + +/* Frees resources allocated for conversion descriptor ‘cd’. */ +#ifndef LIBICONV_PLUG +#define iconv_close libiconv_close +#endif +extern int iconv_close (iconv_t cd); + + +#ifdef __cplusplus +} +#endif + + +#ifndef LIBICONV_PLUG + +/* Nonstandard extensions. */ + +#if 1 +#if 0 +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include +#endif +#include +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/* A type that holds all memory needed by a conversion descriptor. + A pointer to such an object can be used as an iconv_t. */ +typedef struct { + void* dummy1[28]; +#if 1 + mbstate_t dummy2; +#endif +} iconv_allocation_t; + +/* Allocates descriptor for code conversion from encoding ‘fromcode’ to + encoding ‘tocode’ into preallocated memory. Returns an error indicator + (0 or -1 with errno set). */ +#define iconv_open_into libiconv_open_into +extern int iconv_open_into (const char* tocode, const char* fromcode, + iconv_allocation_t* resultp); + +/* Control of attributes. */ +#define iconvctl libiconvctl +extern int iconvctl (iconv_t cd, int request, void* argument); + +/* Hook performed after every successful conversion of a Unicode character. */ +typedef void (*iconv_unicode_char_hook) (unsigned int uc, void* data); +/* Hook performed after every successful conversion of a wide character. */ +typedef void (*iconv_wide_char_hook) (wchar_t wc, void* data); +/* Set of hooks. */ +struct iconv_hooks { + iconv_unicode_char_hook uc_hook; + iconv_wide_char_hook wc_hook; + void* data; +}; + +/* Fallback function. Invoked when a small number of bytes could not be + converted to a Unicode character. This function should process all + bytes from inbuf and may produce replacement Unicode characters by calling + the write_replacement callback repeatedly. */ +typedef void (*iconv_unicode_mb_to_uc_fallback) + (const char* inbuf, size_t inbufsize, + void (*write_replacement) (const unsigned int *buf, size_t buflen, + void* callback_arg), + void* callback_arg, + void* data); +/* Fallback function. Invoked when a Unicode character could not be converted + to the target encoding. This function should process the character and + may produce replacement bytes (in the target encoding) by calling the + write_replacement callback repeatedly. */ +typedef void (*iconv_unicode_uc_to_mb_fallback) + (unsigned int code, + void (*write_replacement) (const char *buf, size_t buflen, + void* callback_arg), + void* callback_arg, + void* data); +#if 1 +/* Fallback function. Invoked when a number of bytes could not be converted to + a wide character. This function should process all bytes from inbuf and may + produce replacement wide characters by calling the write_replacement + callback repeatedly. */ +typedef void (*iconv_wchar_mb_to_wc_fallback) + (const char* inbuf, size_t inbufsize, + void (*write_replacement) (const wchar_t *buf, size_t buflen, + void* callback_arg), + void* callback_arg, + void* data); +/* Fallback function. Invoked when a wide character could not be converted to + the target encoding. This function should process the character and may + produce replacement bytes (in the target encoding) by calling the + write_replacement callback repeatedly. */ +typedef void (*iconv_wchar_wc_to_mb_fallback) + (wchar_t code, + void (*write_replacement) (const char *buf, size_t buflen, + void* callback_arg), + void* callback_arg, + void* data); +#else +/* If the wchar_t type does not exist, these two fallback functions are never + invoked. Their argument list therefore does not matter. */ +typedef void (*iconv_wchar_mb_to_wc_fallback) (); +typedef void (*iconv_wchar_wc_to_mb_fallback) (); +#endif +/* Set of fallbacks. */ +struct iconv_fallbacks { + iconv_unicode_mb_to_uc_fallback mb_to_uc_fallback; + iconv_unicode_uc_to_mb_fallback uc_to_mb_fallback; + iconv_wchar_mb_to_wc_fallback mb_to_wc_fallback; + iconv_wchar_wc_to_mb_fallback wc_to_mb_fallback; + void* data; +}; + +/* Requests for iconvctl. */ +#define ICONV_TRIVIALP 0 /* int *argument */ +#define ICONV_GET_TRANSLITERATE 1 /* int *argument */ +#define ICONV_SET_TRANSLITERATE 2 /* const int *argument */ +#define ICONV_GET_DISCARD_ILSEQ 3 /* int *argument */ +#define ICONV_SET_DISCARD_ILSEQ 4 /* const int *argument */ +#define ICONV_SET_HOOKS 5 /* const struct iconv_hooks *argument */ +#define ICONV_SET_FALLBACKS 6 /* const struct iconv_fallbacks *argument */ + +/* Listing of locale independent encodings. */ +#define iconvlist libiconvlist +extern void iconvlist (int (*do_one) (unsigned int namescount, + const char * const * names, + void* data), + void* data); + +/* Canonicalize an encoding name. + The result is either a canonical encoding name, or name itself. */ +extern const char * iconv_canonicalize (const char * name); + +/* Support for relocatable packages. */ + +/* Sets the original and the current installation prefix of the package. + Relocation simply replaces a pathname starting with the original prefix + by the corresponding pathname with the current prefix instead. Both + prefixes should be directory names without trailing slash (i.e. use "" + instead of "/"). */ +extern void libiconv_set_relocation_prefix (const char *orig_prefix, + const char *curr_prefix); + +#ifdef __cplusplus +} +#endif + +#endif + + +#endif /* _LIBICONV_H */ diff --git a/winlibs/lib/msvc/iconv.lib b/winlibs/lib/msvc/iconv.lib new file mode 100644 index 00000000..d6c1735d Binary files /dev/null and b/winlibs/lib/msvc/iconv.lib differ diff --git a/winlibs/lib/msvc/libiconv.dll b/winlibs/lib/msvc/libiconv.dll new file mode 100644 index 00000000..4b08f73e Binary files /dev/null and b/winlibs/lib/msvc/libiconv.dll differ