BitmapEx->Bitmap in ScanPreview

Noel Grandin · Noel Grandin · commit e2779fa3d752 · 2025-09-01T12:17:40.000+02:00
now that Bitmap supports transparency Change-Id: Ife87834ff043b79de27a1936869067135710a0e5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190462 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx
@@ -55,10 +55,10 @@ class GridWindow : public weld::CustomWidgetController
             return (maPos.X() < rComp.maPos.X());
         }
 
-        void draw(vcl::RenderContext& rRenderContext, const BitmapEx& rBitmapEx)
+        void draw(vcl::RenderContext& rRenderContext, const Bitmap& rBitmap)
         {
             const Point aOffset(rRenderContext.PixelToLogic(Point(mnOffX, mnOffY)));
-            rRenderContext.DrawBitmapEx(maPos - aOffset, rBitmapEx);
+            rRenderContext.DrawBitmapEx(maPos - aOffset, rBitmap);
         }
 
         bool isHit(OutputDevice const & rWin, const Point& rPos)
@@ -97,7 +97,7 @@ class GridWindow : public weld::CustomWidgetController
     Handles m_aHandles;
     Handles::size_type m_nDragIndex;
 
-    BitmapEx        m_aMarkerBitmap;
+    Bitmap          m_aMarkerBitmap;
 
     Point transform( double x, double y );
     void transform( const Point& rOriginal, double& x, double& y );
@@ -126,7 +126,7 @@ class GridWindow : public weld::CustomWidgetController
     void drawLine(vcl::RenderContext& rRenderContext, double x1, double y1, double x2, double y2);
 public:
     GridWindow();
-    void Init(double* pXValues, double* pYValues, int nValues, bool bCutValues, const BitmapEx &rMarkerBitmap);
+    void Init(double* pXValues, double* pYValues, int nValues, bool bCutValues, const Bitmap &rMarkerBitmap);
     virtual ~GridWindow() override;
 
     void setBoundings( double fMinX, double fMinY, double fMaxX, double fMaxY );
@@ -158,7 +158,7 @@ GridWindow::GridWindow()
 {
 }
 
-void GridWindow::Init(double* pXValues, double* pYValues, int nValues, bool bCutValues, const BitmapEx &rMarkerBitmap)
+void GridWindow::Init(double* pXValues, double* pYValues, int nValues, bool bCutValues, const Bitmap &rMarkerBitmap)
 {
     m_aMarkerBitmap = rMarkerBitmap;
     m_pXValues = pXValues;
@@ -211,7 +211,7 @@ GridDialog::GridDialog(weld::Window* pParent, double* pXValues, double* pYValues
     , m_xGridWindow(new GridWindow)
     , m_xGridWindowWND(new weld::CustomWeld(*m_xBuilder, u"gridwindow"_ustr, *m_xGridWindow))
 {
-    m_xGridWindow->Init(pXValues, pYValues, nValues, true/*bCutValues*/, BitmapEx(Bitmap(RID_SCANNER_HANDLE)));
+    m_xGridWindow->Init(pXValues, pYValues, nValues, true/*bCutValues*/, Bitmap(RID_SCANNER_HANDLE));
     m_xResetTypeBox->set_active(0);
     m_xResetButton->connect_clicked( LINK( this, GridDialog, ClickButtonHdl ) );
 }
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
@@ -100,7 +100,7 @@ class ScanPreview : public weld::CustomWidgetController
     enum DragDirection { TopLeft, Top, TopRight, Right, BottomRight, Bottom,
                          BottomLeft, Left };
 
-    BitmapEx  maPreviewBitmapEx;
+    Bitmap    maPreviewBitmap;
     tools::Rectangle maPreviewRect;
     Point     maTopLeft, maBottomRight;
     Point     maMinTopLeft, maMaxBottomRight;
@@ -206,7 +206,7 @@ class ScanPreview : public weld::CustomWidgetController
     void UpdatePreviewBounds();
     void SetBitmap(SvStream &rStream)
     {
-        ReadDIBBitmapEx(maPreviewBitmapEx, rStream, true);
+        ReadDIBBitmapEx(maPreviewBitmap, rStream, true);
     }
     virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override
     {
@@ -917,7 +917,7 @@ void ScanPreview::UpdatePreviewBounds()
     }
     else
     {
-        Size aBMSize( maPreviewBitmapEx.GetSizePixel() );
+        Size aBMSize( maPreviewBitmap.GetSizePixel() );
         if( aBMSize.Width() > aBMSize.Height() && aBMSize.Width() )
         {
             int nVHeight = (maBottomRight.X() - maTopLeft.X()) * aBMSize.Height() / aBMSize.Width();
@@ -944,7 +944,7 @@ void ScanPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang
                                       Size(PREVIEW_WIDTH, PREVIEW_HEIGHT)));
     rRenderContext.SetMapMode(MapMode(MapUnit::MapPixel));
     // check for sane values
-    rRenderContext.DrawBitmapEx(maPreviewRect.TopLeft(), maPreviewRect.GetSize(), maPreviewBitmapEx);
+    rRenderContext.DrawBitmapEx(maPreviewRect.TopLeft(), maPreviewRect.GetSize(), maPreviewBitmap);
 
     DrawDrag(rRenderContext);
 }

Original file line number	Diff line number	Diff line change
`@@ -55,10 +55,10 @@ class GridWindow : public weld::CustomWidgetController`
`55`	`55`	`return (maPos.X() < rComp.maPos.X());`
`56`	`56`	`}`
`57`	`57`
`58`		`- void draw(vcl::RenderContext& rRenderContext, const BitmapEx& rBitmapEx)`
	`58`	`+ void draw(vcl::RenderContext& rRenderContext, const Bitmap& rBitmap)`
`59`	`59`	`{`
`60`	`60`	`const Point aOffset(rRenderContext.PixelToLogic(Point(mnOffX, mnOffY)));`
`61`		`- rRenderContext.DrawBitmapEx(maPos - aOffset, rBitmapEx);`
	`61`	`+ rRenderContext.DrawBitmapEx(maPos - aOffset, rBitmap);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`bool isHit(OutputDevice const & rWin, const Point& rPos)`
`@@ -97,7 +97,7 @@ class GridWindow : public weld::CustomWidgetController`
`97`	`97`	`Handles m_aHandles;`
`98`	`98`	`Handles::size_type m_nDragIndex;`
`99`	`99`
`100`		`- BitmapEx m_aMarkerBitmap;`
	`100`	`+ Bitmap m_aMarkerBitmap;`
`101`	`101`
`102`	`102`	`Point transform( double x, double y );`
`103`	`103`	`void transform( const Point& rOriginal, double& x, double& y );`
`@@ -126,7 +126,7 @@ class GridWindow : public weld::CustomWidgetController`
`126`	`126`	`void drawLine(vcl::RenderContext& rRenderContext, double x1, double y1, double x2, double y2);`
`127`	`127`	`public:`
`128`	`128`	`GridWindow();`
`129`		`- void Init(double* pXValues, double* pYValues, int nValues, bool bCutValues, const BitmapEx &rMarkerBitmap);`
	`129`	`+ void Init(double* pXValues, double* pYValues, int nValues, bool bCutValues, const Bitmap &rMarkerBitmap);`
`130`	`130`	`virtual ~GridWindow() override;`
`131`	`131`
`132`	`132`	`void setBoundings( double fMinX, double fMinY, double fMaxX, double fMaxY );`
`@@ -158,7 +158,7 @@ GridWindow::GridWindow()`
`158`	`158`	`{`
`159`	`159`	`}`
`160`	`160`
`161`		`-void GridWindow::Init(double* pXValues, double* pYValues, int nValues, bool bCutValues, const BitmapEx &rMarkerBitmap)`
	`161`	`+void GridWindow::Init(double* pXValues, double* pYValues, int nValues, bool bCutValues, const Bitmap &rMarkerBitmap)`
`162`	`162`	`{`
`163`	`163`	`m_aMarkerBitmap = rMarkerBitmap;`
`164`	`164`	`m_pXValues = pXValues;`
`@@ -211,7 +211,7 @@ GridDialog::GridDialog(weld::Window* pParent, double* pXValues, double* pYValues`
`211`	`211`	`, m_xGridWindow(new GridWindow)`
`212`	`212`	`, m_xGridWindowWND(new weld::CustomWeld(m_xBuilder, u"gridwindow"_ustr, m_xGridWindow))`
`213`	`213`	`{`
`214`		`- m_xGridWindow->Init(pXValues, pYValues, nValues, true/bCutValues/, BitmapEx(Bitmap(RID_SCANNER_HANDLE)));`
	`214`	`+ m_xGridWindow->Init(pXValues, pYValues, nValues, true/bCutValues/, Bitmap(RID_SCANNER_HANDLE));`
`215`	`215`	`m_xResetTypeBox->set_active(0);`
`216`	`216`	`m_xResetButton->connect_clicked( LINK( this, GridDialog, ClickButtonHdl ) );`
`217`	`217`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ class ScanPreview : public weld::CustomWidgetController`
`100`	`100`	`enum DragDirection { TopLeft, Top, TopRight, Right, BottomRight, Bottom,`
`101`	`101`	`BottomLeft, Left };`
`102`	`102`
`103`		`- BitmapEx maPreviewBitmapEx;`
	`103`	`+ Bitmap maPreviewBitmap;`
`104`	`104`	`tools::Rectangle maPreviewRect;`
`105`	`105`	`Point maTopLeft, maBottomRight;`
`106`	`106`	`Point maMinTopLeft, maMaxBottomRight;`
`@@ -206,7 +206,7 @@ class ScanPreview : public weld::CustomWidgetController`
`206`	`206`	`void UpdatePreviewBounds();`
`207`	`207`	`void SetBitmap(SvStream &rStream)`
`208`	`208`	`{`
`209`		`- ReadDIBBitmapEx(maPreviewBitmapEx, rStream, true);`
	`209`	`+ ReadDIBBitmapEx(maPreviewBitmap, rStream, true);`
`210`	`210`	`}`
`211`	`211`	`virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override`
`212`	`212`	`{`
`@@ -917,7 +917,7 @@ void ScanPreview::UpdatePreviewBounds()`
`917`	`917`	`}`
`918`	`918`	`else`
`919`	`919`	`{`
`920`		`- Size aBMSize( maPreviewBitmapEx.GetSizePixel() );`
	`920`	`+ Size aBMSize( maPreviewBitmap.GetSizePixel() );`
`921`	`921`	`if( aBMSize.Width() > aBMSize.Height() && aBMSize.Width() )`
`922`	`922`	`{`
`923`	`923`	`int nVHeight = (maBottomRight.X() - maTopLeft.X()) * aBMSize.Height() / aBMSize.Width();`
`@@ -944,7 +944,7 @@ void ScanPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang`
`944`	`944`	`Size(PREVIEW_WIDTH, PREVIEW_HEIGHT)));`
`945`	`945`	`rRenderContext.SetMapMode(MapMode(MapUnit::MapPixel));`
`946`	`946`	`// check for sane values`
`947`		`- rRenderContext.DrawBitmapEx(maPreviewRect.TopLeft(), maPreviewRect.GetSize(), maPreviewBitmapEx);`
	`947`	`+ rRenderContext.DrawBitmapEx(maPreviewRect.TopLeft(), maPreviewRect.GetSize(), maPreviewBitmap);`
`948`	`948`
`949`	`949`	`DrawDrag(rRenderContext);`
`950`	`950`	`}`