qgis · Feb 19, 2019
diff --git a/‎external/libdxfrw/drw_entities.cpp
Lines changed: 15 additions & 555 deletions b/‎external/libdxfrw/drw_entities.cpp
Lines changed: 15 additions & 555 deletions
diff --git a/‎external/libdxfrw/intern/dwgbuffer.cpp
Lines changed: 7 additions & 6 deletions b/‎external/libdxfrw/intern/dwgbuffer.cpp
Lines changed: 7 additions & 6 deletions
diff --git a/‎external/libdxfrw/intern/dwgreader.cpp
Lines changed: 3 additions & 2 deletions b/‎external/libdxfrw/intern/dwgreader.cpp
Lines changed: 3 additions & 2 deletions
diff --git a/‎src/app/dwg/qgsdwgimporter.cpp
Lines changed: 1 addition & 1 deletion b/‎src/app/dwg/qgsdwgimporter.cpp
Lines changed: 1 addition & 1 deletion
@@ -711,7 +711,8 @@ std::string dwgBuffer::getCP8Text()
 
 //TU unicode 16 bit (UCS) text converted to utf8
 
-/** Reads 2-bytes char (UCS2, nullptr terminated) and convert to std::string (only for Latin-1)
+/**
+ * Reads 2-bytes char (UCS2, nullptr terminated) and convert to std::string (only for Latin-1)
    ts= total input size in bytes.
 **/
 std::string dwgBuffer::getUCSStr( duint16 ts )
@@ -919,31 +920,31 @@ duint32 dwgBuffer::getEnColor( DRW::Version v, int &rgb, int &transparency )
   transparency = 0;
 
   duint16 idx = getBitShort();
-  QgsDebugMsg( QString( "idx reads COLOR: 0x%1" ).arg( idx, 0, 16 ) );
+  QgsDebugMsgLevel( QString( "idx reads COLOR: 0x%1" ).arg( idx, 0, 16 ), 4 );
 
   duint16 flags = idx >> 8;
 
   idx = idx & 0x1FF; //RLZ: warning this is correct?
 
-  QgsDebugMsg( QString( "flag COLOR:0x%1, index COLOR:0x%2" ).arg( flags, 0, 16 ).arg( idx, 0, 16 ) );
+  QgsDebugMsgLevel( QString( "flag COLOR:0x%1, index COLOR:0x%2" ).arg( flags, 0, 16 ).arg( idx, 0, 16 ), 4 );
 
   if ( flags & 0x80 )
   {
     // complex color (rgb)
     rgb = getBitLong() & 0xffffff;
 
-    QgsDebugMsg( QString( "RGB COLOR:0x%1" ).arg( rgb, 0, 16 ) );
+    QgsDebugMsgLevel( QString( "RGB COLOR:0x%1" ).arg( rgb, 0, 16 ), 4 );
 
     if ( flags & 0x80 )
     {
-      QgsDebugMsg( "acdbColor COLOR are present" );
+      QgsDebugMsgLevel( "acdbColor COLOR are present", 4 );
     }
   }
 
   if ( flags & 0x20 )
   {
     transparency = getBitLong();
-    QgsDebugMsg( QString( "Transparency COLOR:0x%1" ).arg( transparency, 0, 16 ) );
+    QgsDebugMsgLevel( QString( "Transparency COLOR:0x%1" ).arg( transparency, 0, 16 ), 4 );
   }
 
   return idx; //default return ByLayer
 
@@ -149,7 +149,8 @@ bool dwgReader::checkSentinel( dwgBuffer *buf, enum secEnum::DWGSection, bool st
 
 /*********** objects map ************************/
 
-/** Note: object map are split in sections with max size 2035?
+/**
+ * Note: object map are split in sections with max size 2035?
  *  each section are 2 bytes size + data bytes + 2 bytes crc
  *  size value are data bytes + 2 and to calculate crc are used
  *  2 bytes size + data bytes
@@ -973,7 +974,7 @@ bool dwgReader::readDwgBlocks( DRW_Interface &intfa, dwgBuffer *dbuf )
             ret = false;
             continue;
           }
-          else  //foud entity reads it
+          else  //found entity, read it
           {
             oc = mit->second;
             ObjectMap.erase( mit );
 
@@ -2196,7 +2196,7 @@ void QgsDwgImporter::addText( const DRW_Text &data )
   addEntity( dfn, f, data );
 
   SETDOUBLE( height );
-  SETSTRING( text );
+  SETSTRING( text );  // TODO: parse MTEXT
   SETDOUBLE( angle );
   SETDOUBLE( widthscale );
   SETDOUBLE( oblique );