Skip to content

Commit 4ba46da

Browse files
Remove unneeded bind_textdomain_codeset call
libexiv2 does this when localisation is initialised.
1 parent 85f3399 commit 4ba46da

File tree

4 files changed

+0
-42
lines changed

4 files changed

+0
-42
lines changed

src/interface/error.i

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,6 @@
2222

2323
%include "std_except.i"
2424

25-
// Make all exiv2's localised strings UTF-8
26-
%{
27-
#ifdef EXV_ENABLE_NLS
28-
#include "libintl.h"
29-
#endif
30-
%}
31-
%init %{
32-
#ifdef EXV_ENABLE_NLS
33-
bind_textdomain_codeset("exiv2", "UTF-8");
34-
#endif
35-
%}
36-
3725

3826
// Set Python logger as Exiv2 log handler
3927
%{

src/swig-0_27_0/error_wrap.cxx

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4091,11 +4091,6 @@ static PyObject* PyExc_Exiv2Error = NULL;
40914091
#include <stdexcept>
40924092

40934093

4094-
#ifdef EXV_ENABLE_NLS
4095-
#include "libintl.h"
4096-
#endif
4097-
4098-
40994094
static PyObject* logger = NULL;
41004095
static void log_to_python(int level, const char* msg) {
41014096
Py_ssize_t len = strlen(msg);
@@ -5160,11 +5155,6 @@ SWIG_init(void) {
51605155
}
51615156

51625157

5163-
#ifdef EXV_ENABLE_NLS
5164-
bind_textdomain_codeset("exiv2", "UTF-8");
5165-
#endif
5166-
5167-
51685158
{
51695159
PyObject *module = PyImport_ImportModule("logging");
51705160
if (!module)

src/swig-0_27_4/error_wrap.cxx

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4091,11 +4091,6 @@ static PyObject* PyExc_Exiv2Error = NULL;
40914091
#include <stdexcept>
40924092

40934093

4094-
#ifdef EXV_ENABLE_NLS
4095-
#include "libintl.h"
4096-
#endif
4097-
4098-
40994094
static PyObject* logger = NULL;
41004095
static void log_to_python(int level, const char* msg) {
41014096
Py_ssize_t len = strlen(msg);
@@ -5160,11 +5155,6 @@ SWIG_init(void) {
51605155
}
51615156

51625157

5163-
#ifdef EXV_ENABLE_NLS
5164-
bind_textdomain_codeset("exiv2", "UTF-8");
5165-
#endif
5166-
5167-
51685158
{
51695159
PyObject *module = PyImport_ImportModule("logging");
51705160
if (!module)

src/swig-0_28_0/error_wrap.cxx

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4091,11 +4091,6 @@ static PyObject* PyExc_Exiv2Error = NULL;
40914091
#include <stdexcept>
40924092

40934093

4094-
#ifdef EXV_ENABLE_NLS
4095-
#include "libintl.h"
4096-
#endif
4097-
4098-
40994094
static PyObject* logger = NULL;
41004095
static void log_to_python(int level, const char* msg) {
41014096
Py_ssize_t len = strlen(msg);
@@ -5164,11 +5159,6 @@ SWIG_init(void) {
51645159
}
51655160

51665161

5167-
#ifdef EXV_ENABLE_NLS
5168-
bind_textdomain_codeset("exiv2", "UTF-8");
5169-
#endif
5170-
5171-
51725162
{
51735163
PyObject *module = PyImport_ImportModule("logging");
51745164
if (!module)

0 commit comments

Comments
 (0)