tiff2img buffer copy

xiaoyifang · Feb 9, 2025 · dadba36 · dadba36
1 parent d7ca99c
commit dadba36
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/tiff.cc b/src/tiff.cc
@@ -8,20 +8,23 @@
 
 namespace GdTiff {
 
-void tiff2img( std::vector< char > & data, const char * format )
+void tiff2img( std::vector< char > & data )
 {
   QImage img = QImage::fromData( (unsigned char *)&data.front(), data.size() );
 
   if ( !img.isNull() ) {
     QByteArray ba;
-    QBuffer buffer( &ba );
+
+    QBuffer buffer( &ba ); // buffer doesn't own ba
     buffer.open( QIODevice::WriteOnly );
+
     QSize screenSize = QApplication::primaryScreen()->availableSize();
     QSize imgSize    = img.size();
     int scaleSize    = qMin( imgSize.width(), screenSize.width() );
-    img.scaledToWidth( scaleSize ).save( &buffer, format );
-    buffer.setData( data.data(),data.size() );
-    buffer.close();
+    img.scaledToWidth( scaleSize ).save( &buffer, "webp" );
+
+    memcpy( data.data(), ba.data(), ba.size() );
+    data.resize( ba.size() );
   }
 }
 

diff --git a/src/tiff.hh b/src/tiff.hh
@@ -4,6 +4,6 @@
 #include <vector>
 namespace GdTiff {
 
-void tiff2img( std::vector< char > & data, const char * format = "webp" );
+void tiff2img( std::vector< char > & data );
 
 }