From de2036ea2c0387f46d5f399f972998179f407668 Mon Sep 17 00:00:00 2001
From: gb <741021719@qq.com>
Date: Thu, 3 Aug 2023 09:09:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DMemory=E4=BC=A0=E8=BE=93?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F+GROUP4=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8CBM?=
 =?UTF-8?q?P=E4=BD=8D=E5=9B=BE=E6=96=87=E4=BB=B6=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E5=86=99=E5=A4=B4=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E5=9B=BE=E5=83=8F=E7=A7=BB=E4=BD=8D=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sane/scanned_img.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/sane/scanned_img.cpp b/sane/scanned_img.cpp
index 24a4cdc..e5992fb 100644
--- a/sane/scanned_img.cpp
+++ b/sane/scanned_img.cpp
@@ -564,16 +564,15 @@ void scanned_img::do_result(bool ok, twain_xfer xfer)
 			xfer == TWAIN_XFER_Memory)
 		{
 			// convert to black-white ...
-			std::string	head(file_header(SANE_IMAGE_TYPE_BMP, (float)dpi_, TWAIN_XFER_File));
-			size_t		size = head.length();
+		size_t		size = data_->bytes();
 			mapping_buf* buf = new mapping_buf();
 			std::wstring	file(file_ + L".tmp");
 			unsigned long long off = 0;
 
-			if (buf->allocate(file.c_str(), size + data_->bytes(), true) &&
-				buf->save(head.c_str(), &size, off))
+		if (buf->allocate(file.c_str(), size, true) &&
+			buf->save(0, data_))
 			{
-				if (buf->save(size, data_))
+			//	if (buf->save(size, data_))
 				{
 					SANE_ImageFormatConvert	conv;
 					std::string				sf(local_trans::u2a(file.c_str()));