From 4f60853960fb6df2e9a361f7148812ec55801c2b Mon Sep 17 00:00:00 2001 From: luoliangyi <87842688@qq.com> Date: Fri, 27 May 2022 10:30:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89QT=E9=87=8C=E9=9D=A2=E5=AF=B9?= =?UTF-8?q?BGR888=E6=A0=BC=E5=BC=8F=E7=9A=84=E6=94=AF=E6=8C=81=EF=BC=8C?= =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E6=9C=89=E7=9A=84qt=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=B8=8D=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner/HGImgThumb.cpp | 2 -- app/scanner/HGImgView.cpp | 2 -- app/scanner/mainwindow.cpp | 4 ---- 3 files changed, 8 deletions(-) diff --git a/app/scanner/HGImgThumb.cpp b/app/scanner/HGImgThumb.cpp index dafc3b14..de93e5b8 100644 --- a/app/scanner/HGImgThumb.cpp +++ b/app/scanner/HGImgThumb.cpp @@ -3489,8 +3489,6 @@ QImage* HGImgThumb::createItemImage(HGImage srcImage, int itemSize) fmt = QImage::Format_RGB888; else if (info.type == HGBASE_IMGTYPE_RGBA) fmt = QImage::Format_RGBA8888; - else if (info.type == HGBASE_IMGTYPE_BGR) - fmt = QImage::Format_BGR888; if (QImage::Format_Invalid == fmt) { return nullptr; diff --git a/app/scanner/HGImgView.cpp b/app/scanner/HGImgView.cpp index bc24f518..55250137 100644 --- a/app/scanner/HGImgView.cpp +++ b/app/scanner/HGImgView.cpp @@ -1999,8 +1999,6 @@ QImage* HGImgView::createQImage() fmt = QImage::Format_RGB888; else if (info.type == HGBASE_IMGTYPE_RGBA) fmt = QImage::Format_RGBA8888; - else if (info.type == HGBASE_IMGTYPE_BGR) - fmt = QImage::Format_BGR888; if (QImage::Format_Invalid == fmt) { return nullptr; diff --git a/app/scanner/mainwindow.cpp b/app/scanner/mainwindow.cpp index 6b93f779..0241fd73 100644 --- a/app/scanner/mainwindow.cpp +++ b/app/scanner/mainwindow.cpp @@ -2700,8 +2700,6 @@ void MainWindow::on_act_imageEdit_triggered() fmt = QImage::Format_RGB888; else if (info.type == HGBASE_IMGTYPE_RGBA) fmt = QImage::Format_RGBA8888; - else if (info.type == HGBASE_IMGTYPE_BGR) - fmt = QImage::Format_BGR888; if (QImage::Format_Invalid == fmt) { return; @@ -2733,8 +2731,6 @@ void MainWindow::on_act_imageEdit_triggered() info.type = HGBASE_IMGTYPE_RGB; else if (QImage::Format_RGBA8888 == image.format()) info.type = HGBASE_IMGTYPE_RGBA; - else if (QImage::Format_BGR888 == image.format()) - info.type = HGBASE_IMGTYPE_BGR; info.widthStep = (HGUInt)image.bytesPerLine(); info.origin = HGBASE_IMGORIGIN_TOP;