summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/filter/graphicfilter.cxx8
-rw-r--r--vcl/source/filter/jpeg/JpegWriter.cxx4
-rw-r--r--vcl/source/gdi/dibtools.cxx5
-rw-r--r--vcl/source/gdi/graph.cxx5
-rw-r--r--vcl/source/gdi/pdfextoutdevdata.cxx2
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx8
-rw-r--r--vcl/source/gdi/svmconverter.cxx12
-rw-r--r--vcl/source/graphic/UnoGraphicProvider.cxx7
-rw-r--r--vcl/workben/icontest.cxx2
-rw-r--r--vcl/workben/svpclient.cxx4
10 files changed, 24 insertions, 33 deletions
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 6e37dd6d3ff1..9f5d6caeb0eb 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -825,7 +825,7 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r
// Resolution is set
if( nMode == 1 )
{
- Bitmap aBitmap( rGraphic.GetBitmap() );
+ BitmapEx aBitmap( rGraphic.GetBitmapEx() );
MapMode aMap( MapUnit::Map100thInch );
sal_Int32 nDPI = rConfigItem.ReadInt32( "Resolution", 75 );
@@ -2213,16 +2213,16 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString& r
{
if( aFilterName.equalsIgnoreAsciiCase( EXP_BMP ) )
{
- Bitmap aBmp( aGraphic.GetBitmap() );
+ BitmapEx aBmp( aGraphic.GetBitmapEx() );
BmpConversion nColorRes = static_cast<BmpConversion>(aConfigItem.ReadInt32( "Colors", 0 ));
if ( nColorRes != BmpConversion::NNONE && ( nColorRes <= BmpConversion::N24Bit) )
{
if( !aBmp.Convert( nColorRes ) )
- aBmp = aGraphic.GetBitmap();
+ aBmp = aGraphic.GetBitmapEx();
}
bool bRleCoding = aConfigItem.ReadBool( "RLE_Coding", true );
// save RLE encoded?
- WriteDIB(aBmp, rOStm, bRleCoding, true);
+ WriteDIB(aBmp, rOStm, bRleCoding);
if( rOStm.GetError() )
nStatus = ERRCODE_GRFILTER_IOERROR;
diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx
index f6787145eabf..c5916a7a992d 100644
--- a/vcl/source/filter/jpeg/JpegWriter.cxx
+++ b/vcl/source/filter/jpeg/JpegWriter.cxx
@@ -190,12 +190,12 @@ bool JPEGWriter::Write( const Graphic& rGraphic )
mxStatusIndicator->start( OUString(), 100 );
}
- Bitmap aGraphicBmp( rGraphic.GetBitmap() );
+ Bitmap aGraphicBmp( rGraphic.GetBitmapEx().GetBitmap() );
if ( mbGreys )
{
if ( !aGraphicBmp.Convert( BmpConversion::N8BitGreys ) )
- aGraphicBmp = rGraphic.GetBitmap();
+ aGraphicBmp = rGraphic.GetBitmapEx().GetBitmap();
}
mpReadAccess = Bitmap::ScopedReadAccess(aGraphicBmp);
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index de8615226492..d0a0a53b2e87 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -1830,9 +1830,10 @@ bool WriteDIB(
bool WriteDIB(
const BitmapEx& rSource,
- SvStream& rOStm)
+ SvStream& rOStm,
+ bool bCompressed)
{
- return ImplWriteDIB(rSource.GetBitmapRef(), rOStm, /*bCompressed*/true, /*bFileHeader*/true);
+ return ImplWriteDIB(rSource.GetBitmapRef(), rOStm, bCompressed, /*bFileHeader*/true);
}
bool WriteDIBBitmapEx(
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index 2533a75e47c4..19bb99d254e4 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -348,11 +348,6 @@ bool Graphic::IsEPS() const
return mxImpGraphic->ImplIsEPS();
}
-Bitmap Graphic::GetBitmap(const GraphicConversionParameters& rParameters) const
-{
- return mxImpGraphic->ImplGetBitmap(rParameters);
-}
-
BitmapEx Graphic::GetBitmapEx(const GraphicConversionParameters& rParameters) const
{
return mxImpGraphic->ImplGetBitmapEx(rParameters);
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index d36ab2844f17..aa9ee14466c1 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -481,7 +481,7 @@ bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAc
}
}
- rWriter.DrawJPGBitmap( aTmp, aGraphic.GetBitmap().GetBitCount() > 8, aGraphic.GetSizePixel(), aOutputRect, aMask, aGraphic );
+ rWriter.DrawJPGBitmap( aTmp, aGraphic.GetBitmapEx().GetBitCount() > 8, aGraphic.GetSizePixel(), aOutputRect, aMask, aGraphic );
}
if ( bClippingNeeded )
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index f5b7efe16570..b72078caa819 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -9750,7 +9750,7 @@ void PDFWriterImpl::createEmbeddedFile(const Graphic& rGraphic, ReferenceXObject
rEmit.m_aPDFData = rGraphic.getPdfData();
rEmit.m_nFormObject = createObject();
- rEmit.m_aPixelSize = rGraphic.GetBitmap().GetPrefSize();
+ rEmit.m_aPixelSize = rGraphic.GetPrefSize();
}
void PDFWriterImpl::drawJPGBitmap( SvStream& rDCTData, bool bIsTrueColor, const Size& rSizePixel, const tools::Rectangle& rTargetArea, const Bitmap& rMask, const Graphic& rGraphic )
@@ -9773,14 +9773,14 @@ void PDFWriterImpl::drawJPGBitmap( SvStream& rDCTData, bool bIsTrueColor, const
// load stream to bitmap and draw the bitmap instead
Graphic aGraphic;
GraphicConverter::Import( rDCTData, aGraphic, ConvertDataFormat::JPG );
- Bitmap aBmp( aGraphic.GetBitmap() );
- if( !!rMask && rMask.GetSizePixel() == aBmp.GetSizePixel() )
+ if( !!rMask && rMask.GetSizePixel() == aGraphic.GetSizePixel() )
{
+ Bitmap aBmp( aGraphic.GetBitmapEx().GetBitmap() );
BitmapEx aBmpEx( aBmp, rMask );
drawBitmap( rTargetArea.TopLeft(), rTargetArea.GetSize(), aBmpEx );
}
else
- drawBitmap( rTargetArea.TopLeft(), rTargetArea.GetSize(), BitmapEx(aBmp) );
+ drawBitmap( rTargetArea.TopLeft(), rTargetArea.GetSize(), aGraphic.GetBitmapEx() );
return;
}
diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index a9773ffbd682..8e6db507764d 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/gdi/svmconverter.cxx
@@ -1962,12 +1962,12 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile const & r
case MetaActionType::BMPEX:
{
const MetaBmpExAction* pAct = static_cast<const MetaBmpExAction*>(pAction);
- const Bitmap aBmp( Graphic( pAct->GetBitmapEx() ).GetBitmap() );
+ const BitmapEx aBmp( pAct->GetBitmapEx() );
rOStm.WriteInt16( GDI_BITMAP_ACTION );
rOStm.WriteInt32( 12 );
WritePair( rOStm, pAct->GetPoint() );
- WriteDIB(aBmp, rOStm, false, true);
+ WriteDIB(aBmp, rOStm, false);
nCount++;
}
break;
@@ -1975,13 +1975,13 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile const & r
case MetaActionType::BMPEXSCALE:
{
const MetaBmpExScaleAction* pAct = static_cast<const MetaBmpExScaleAction*>(pAction);
- const Bitmap aBmp( Graphic( pAct->GetBitmapEx() ).GetBitmap() );
+ const BitmapEx aBmp( pAct->GetBitmapEx() );
rOStm.WriteInt16( GDI_BITMAPSCALE_ACTION );
rOStm.WriteInt32( 20 );
WritePair( rOStm, pAct->GetPoint() );
WritePair( rOStm, pAct->GetSize() );
- WriteDIB(aBmp, rOStm, false, true);
+ WriteDIB(aBmp, rOStm, false);
nCount++;
}
break;
@@ -1989,7 +1989,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile const & r
case MetaActionType::BMPEXSCALEPART:
{
const MetaBmpExScalePartAction* pAct = static_cast<const MetaBmpExScalePartAction*>(pAction);
- const Bitmap aBmp( Graphic( pAct->GetBitmapEx() ).GetBitmap() );
+ const BitmapEx aBmp( pAct->GetBitmapEx() );
rOStm.WriteInt16( GDI_BITMAPSCALEPART_ACTION );
rOStm.WriteInt32( 36 );
@@ -1997,7 +1997,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile const & r
WritePair( rOStm, pAct->GetDestSize() );
WritePair( rOStm, pAct->GetSrcPoint() );
WritePair( rOStm, pAct->GetSrcSize() );
- WriteDIB(aBmp, rOStm, false, true);
+ WriteDIB(aBmp, rOStm, false);
nCount++;
}
break;
diff --git a/vcl/source/graphic/UnoGraphicProvider.cxx b/vcl/source/graphic/UnoGraphicProvider.cxx
index 3576213fd9b2..4ecb6eedb2db 100644
--- a/vcl/source/graphic/UnoGraphicProvider.cxx
+++ b/vcl/source/graphic/UnoGraphicProvider.cxx
@@ -681,12 +681,7 @@ void ImplApplyFilterData( ::Graphic& rGraphic, uno::Sequence< beans::PropertyVal
ImplApplyBitmapResolution( aGraphic, nImageResolution,
aGraphic.GetSizePixel(), awt::Size( aSize100thmm2.Width(), aSize100thmm2.Height() ) );
- rtl::Reference<MetaAction> pNewAction;
- if ( pAction->GetType() == MetaActionType::BMPSCALE )
- pNewAction = new MetaBmpScaleAction ( aPos, aSize, aGraphic.GetBitmap() );
- else
- pNewAction = new MetaBmpExScaleAction( aPos, aSize, aGraphic.GetBitmapEx() );
-
+ rtl::Reference<MetaAction> pNewAction = new MetaBmpExScaleAction( aPos, aSize, aGraphic.GetBitmapEx() );
aMtf.ReplaceAction( pNewAction, i );
break;
}
diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
index eac9f8c8d59e..35ea9510d442 100644
--- a/vcl/workben/icontest.cxx
+++ b/vcl/workben/icontest.cxx
@@ -115,7 +115,7 @@ void MyWorkWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectan
BitmapEx aEmpty;
mpFixedBitmap->SetBitmap( aEmpty );
GraphicConversionParameters aConv( aSize );
- mpBitmap = new BitmapEx( maGraphic.GetBitmap( aConv ) );
+ mpBitmap = new BitmapEx(maGraphic.GetBitmapEx( aConv ));
mpFixedBitmap->SetBitmap( *mpBitmap );
mpFixedBitmap->SetSizePixel( aSize );
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index 8763ab398636..c84919cb59aa 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -266,14 +266,14 @@ IMPL_LINK_NOARG( MyWin, SelectHdl, ListBox&, void)
GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter();
rFilter.ImportGraphic( aGraphicResult, OUString("import"), aStream );
- Bitmap aBitmap = aGraphicResult.GetBitmap();
+ BitmapEx aBitmap = aGraphicResult.GetBitmapEx();
SAL_INFO("vcl", "got bitmap of size " << aBitmap.GetSizePixel().Width() << "x" << aBitmap.GetSizePixel().Height());
Size aFixedSize( aBitmap.GetSizePixel() );
aFixedSize.AdjustWidth(10 );
aFixedSize.AdjustHeight(10 );
m_aImage->SetSizePixel( aFixedSize );
- m_aImage->SetImage( Image( BitmapEx( aBitmap ) ) );
+ m_aImage->SetImage( Image( aBitmap ) );
}
generated by cgit (git 2.34.1) at 2024-07-16 19:14:13 +0000