From 50de3d71e7ae975f781fa2db91ea2f15683f0556 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Thu, 5 Aug 2021 12:11:51 +1000
Subject: [PATCH] Add pending upstream fix to remove warning

---
 external/libdxfrw/intern/drw_textcodec.cpp | 11 +++++++----
 external/libdxfrw/intern/drw_textcodec.h   | 10 +---------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/external/libdxfrw/intern/drw_textcodec.cpp b/external/libdxfrw/intern/drw_textcodec.cpp
index ae5a0b7f474..04795e1b2fb 100644
--- a/external/libdxfrw/intern/drw_textcodec.cpp
+++ b/external/libdxfrw/intern/drw_textcodec.cpp
@@ -57,8 +57,7 @@ void DRW_TextCodec::setCodePage(std::string *c, bool dxfFormat){
         if (cp == "ANSI_874")
             conv.reset( new DRW_ConvTable(DRW_Table874, CPLENGTHCOMMON) );
         else if (cp == "ANSI_932")
-            conv.reset( new DRW_Conv932Table(DRW_Table932, DRW_LeadTable932,
-                                         DRW_DoubleTable932, CPLENGTH932) );
+            conv.reset( new DRW_Conv932Table() );
         else if (cp == "ANSI_936")
             conv.reset( new DRW_ConvDBCSTable(DRW_Table936, DRW_LeadTable936,
                                          DRW_DoubleTable936, CPLENGTH936) );
@@ -345,6 +344,10 @@ std::string DRW_ConvDBCSTable::toUtf8(std::string *s) {
     return res;
 }
 
+DRW_Conv932Table::DRW_Conv932Table()
+    :DRW_Converter(DRW_Table932, CPLENGTH932)
+{}
+
 std::string DRW_Conv932Table::fromUtf8(std::string *s) {
     std::string result;
     bool notFound;
@@ -369,8 +372,8 @@ std::string DRW_Conv932Table::fromUtf8(std::string *s) {
             if (notFound && ( code<0xF8 || (code>0x390 && code<0x542) ||
                     (code>0x200F && code<0x9FA1) || code>0xF928 )) {
                 for (int k=0; k<cpLength; k++){
-                    if(doubleTable[k][1] == code) {
-                        int data = doubleTable[k][0];
+                    if(DRW_DoubleTable932[k][1] == code) {
+                        int data = DRW_DoubleTable932[k][0];
                         char d[3];
                         d[0] = data >> 8;
                         d[1] = data & 0xFF;
diff --git a/external/libdxfrw/intern/drw_textcodec.h b/external/libdxfrw/intern/drw_textcodec.h
index 04329909a4d..7c358382e0d 100644
--- a/external/libdxfrw/intern/drw_textcodec.h
+++ b/external/libdxfrw/intern/drw_textcodec.h
@@ -79,17 +79,9 @@ private:
 
 class DRW_Conv932Table : public DRW_Converter {
 public:
-    DRW_Conv932Table(const int *t,  const int *lt, const int dt[][2], int l)
-        :DRW_Converter(t, l)
-        ,leadTable{lt}
-        ,doubleTable{dt}
-    {}
-
+    DRW_Conv932Table();
     virtual std::string fromUtf8(std::string *s);
     virtual std::string toUtf8(std::string *s);
-private:
-    const int *leadTable;
-    const int (*doubleTable)[2];
 
 };