Skip to content

C
core
Kaydet (Commit) 6fe89253 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

basebmp now only used from vcl/headless code 

Change-Id: I068d404431d3565f6ad5741edbd3693225824a4d
üst f8779bbc
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 70 deletions
basctl/inc/pch/precompiled_basctl.hxx
Dosyayı görüntüle @ 6fe89253
......@@ -184,9 +184,6 @@
#include <vcl/wall.hxx>
#include <vcl/window.hxx>
#include <vcl/xtextedt.hxx>
#include <basebmp/basebmpdllapi.h>
#include <basebmp/bitmapdevice.hxx>
#include <basebmp/scanlineformats.hxx>
#include <basegfx/basegfxdllapi.h>
#include <basegfx/color/bcolor.hxx>
#include <basegfx/color/bcolormodifier.hxx>
......
chart2/inc/pch/precompiled_chartcontroller.hxx
Dosyayı görüntüle @ 6fe89253
......@@ -174,9 +174,6 @@
#include <vcl/wall.hxx>
#include <vcl/window.hxx>
#include <ChartModel.hxx>
#include <basebmp/basebmpdllapi.h>
#include <basebmp/bitmapdevice.hxx>
#include <basebmp/scanlineformats.hxx>
#include <basegfx/basegfxdllapi.h>
#include <basegfx/color/bcolor.hxx>
#include <basegfx/color/bcolormodifier.hxx>
......
cui/inc/pch/precompiled_cui.hxx
Dosyayı görüntüle @ 6fe89253
......@@ -177,9 +177,6 @@
#include <vcl/virdev.hxx>
#include <vcl/wall.hxx>
#include <vcl/window.hxx>
#include <basebmp/basebmpdllapi.h>
#include <basebmp/bitmapdevice.hxx>
#include <basebmp/scanlineformats.hxx>
#include <basegfx/basegfxdllapi.h>
#include <basegfx/color/bcolor.hxx>
#include <basegfx/color/bcolormodifier.hxx>
......
desktop/CppunitTest_desktop_lib.mk
Dosyayı görüntüle @ 6fe89253
......@@ -16,7 +16,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,desktop_lib, \
))
$(eval $(call gb_CppunitTest_use_libraries,desktop_lib, \
basebmp \
comphelper \
cppu \
cppuhelper \
......@@ -32,7 +31,10 @@ $(eval $(call gb_CppunitTest_use_libraries,desktop_lib, \
$(gb_UWINAPI) \
))
$(eval $(call gb_CppunitTest_use_external,desktop_lib,boost_headers))
$(eval $(call gb_CppunitTest_use_externals,desktop_lib, \
boost_headers \
cairo \
))
$(eval $(call gb_CppunitTest_use_api,desktop_lib,\
offapi \
......
desktop/Library_sofficeapp.mk
Dosyayı görüntüle @ 6fe89253
......@@ -41,7 +41,6 @@ $(eval $(call gb_Library_add_defs,sofficeapp,\
$(eval $(call gb_Library_set_precompiled_header,sofficeapp,$(SRCDIR)/desktop/inc/pch/precompiled_sofficeapp))
$(eval $(call gb_Library_use_libraries,sofficeapp,\
$(if $(filter $(OS),ANDROID),,basebmp) \
comphelper \
cppu \
cppuhelper \
......
desktop/qa/desktop_lib/test_desktop_lib.cxx
Dosyayı görüntüle @ 6fe89253
......@@ -14,7 +14,6 @@
#include <com/sun/star/awt/Key.hpp>
#include <com/sun/star/awt/XReschedule.hpp>
#include <com/sun/star/awt/Toolkit.hpp>
#include <basebmp/bitmapdevice.hxx>
#include <boost/property_tree/json_parser.hpp>
#include <comphelper/processfactory.hxx>
#include <sfx2/objsh.hxx>
......@@ -27,6 +26,7 @@
#include <svl/srchitem.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <unotools/tempfile.hxx>
#include <cairo.h>
#include "../../inc/lib/init.hxx"
......@@ -351,8 +351,7 @@ void DesktopLOKTest::testPaintTile()
LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
int nCanvasWidth = 100;
int nCanvasHeight = 300;
sal_Int32 nStride = basebmp::getBitmapDeviceStrideForWidth(basebmp::Format::ThirtyTwoBitTcMaskBGRA,
nCanvasWidth);
sal_Int32 nStride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, nCanvasWidth);
std::vector<unsigned char> aBuffer(nStride * nCanvasHeight);
int nTilePosX = 0;
int nTilePosY = 0;
......
desktop/source/lib/init.cxx
Dosyayı görüntüle @ 6fe89253
......@@ -103,7 +103,7 @@ typedef struct
// We need a shared_array for passing into the BitmapDevice (via
// VirtualDevice.SetOutputSizePixelScaleOffsetAndBuffer which goes via the
// SvpVirtualDevice, ending up in the basebmp BitmapDevice. However as we're
// SvpVirtualDevice, ending up in the cairo surface. However as we're
// given the array externally we can't delete it, and hence need to override
// shared_array's default of deleting its pointer.
template<typename T>
......
editeng/inc/pch/precompiled_editeng.hxx
Dosyayı görüntüle @ 6fe89253
......@@ -129,9 +129,6 @@
#include <vcl/vclptr.hxx>
#include <vcl/window.hxx>
#include <vcl/wrkwin.hxx>
#include <basebmp/basebmpdllapi.h>
#include <basebmp/bitmapdevice.hxx>
#include <basebmp/scanlineformats.hxx>
#include <basegfx/basegfxdllapi.h>
#include <basegfx/color/bcolor.hxx>
#include <basegfx/color/bcolormodifier.hxx>
......
include/vcl/virdev.hxx
Dosyayı görüntüle @ 6fe89253
......@@ -20,10 +20,10 @@
#ifndef INCLUDED_VCL_VIRDEV_HXX
#define INCLUDED_VCL_VIRDEV_HXX
#include <basebmp/bitmapdevice.hxx>
#include <vcl/dllapi.h>
#include <vcl/salgtype.hxx>
#include <vcl/outdev.hxx>
#include <boost/shared_array.hpp>
class SalVirtualDevice;
struct SystemGraphicsData;
......@@ -46,9 +46,9 @@ private:
SAL_DLLPRIVATE void ImplInitVirDev( const OutputDevice* pOutDev, long nDX, long nDY, DeviceFormat eFormat, const SystemGraphicsData *pData = nullptr );
SAL_DLLPRIVATE bool InnerImplSetOutputSizePixel( const Size& rNewSize, bool bErase,
const basebmp::RawMemorySharedArray &pBuffer );
const boost::shared_array<sal_uInt8> &pBuffer );
SAL_DLLPRIVATE bool ImplSetOutputSizePixel( const Size& rNewSize, bool bErase,
const basebmp::RawMemorySharedArray &pBuffer );
const boost::shared_array<sal_uInt8> &pBuffer );
VirtualDevice (const VirtualDevice &) = delete;
VirtualDevice & operator= (const VirtualDevice &) = delete;
......@@ -126,7 +126,7 @@ public:
bool SetOutputSizePixelScaleOffsetAndBuffer( const Size& rNewSize,
const Fraction& rScale,
const Point& rNewOffset,
const basebmp::RawMemorySharedArray &pBuffer );
const boost::shared_array<sal_uInt8> &pBuffer );
bool SetOutputSize( const Size& rNewSize, bool bErase = true )
{ return SetOutputSizePixel( LogicToPixel( rNewSize ), bErase ); }
......
reportdesign/inc/pch/precompiled_rptui.hxx
Dosyayı görüntüle @ 6fe89253
......@@ -192,9 +192,6 @@
#include <RptObject.hxx>
#include <RptPage.hxx>
#include <UndoActions.hxx>
#include <basebmp/basebmpdllapi.h>
#include <basebmp/bitmapdevice.hxx>
#include <basebmp/scanlineformats.hxx>
#include <basegfx/basegfxdllapi.h>
#include <basegfx/color/bcolor.hxx>
#include <basegfx/color/bcolormodifier.hxx>
......
sd/inc/pch/precompiled_sdui.hxx
Dosyayı görüntüle @ 6fe89253
......@@ -185,9 +185,6 @@
#include <vcl/virdev.hxx>
#include <vcl/wall.hxx>
#include <vcl/window.hxx>
#include <basebmp/basebmpdllapi.h>
#include <basebmp/bitmapdevice.hxx>
#include <basebmp/scanlineformats.hxx>
#include <basegfx/basegfxdllapi.h>
#include <basegfx/color/bcolor.hxx>
#include <basegfx/color/bcolormodifier.hxx>
......
sw/inc/pch/precompiled_msword.hxx
Dosyayı görüntüle @ 6fe89253
......@@ -183,9 +183,6 @@
#include <IMark.hxx>
#include <IShellCursorSupplier.hxx>
#include <SwGetPoolIdFromName.hxx>
#include <basebmp/basebmpdllapi.h>
#include <basebmp/bitmapdevice.hxx>
#include <basebmp/scanlineformats.hxx>
#include <basegfx/basegfxdllapi.h>
#include <basegfx/color/bcolor.hxx>
#include <basegfx/color/bcolormodifier.hxx>
......
sw/inc/pch/precompiled_swui.hxx
Dosyayı görüntüle @ 6fe89253
......@@ -192,9 +192,6 @@
#include <IMark.hxx>
#include <SwNumberTreeTypes.hxx>
#include <SwStyleNameMapper.hxx>
#include <basebmp/basebmpdllapi.h>
#include <basebmp/bitmapdevice.hxx>
#include <basebmp/scanlineformats.hxx>
#include <basegfx/basegfxdllapi.h>
#include <basegfx/color/bcolor.hxx>
#include <basegfx/color/bcolormodifier.hxx>
......
sw/inc/pch/precompiled_vbaswobj.hxx
Dosyayı görüntüle @ 6fe89253
......@@ -176,9 +176,6 @@
#include <IMark.hxx>
#include <IShellCursorSupplier.hxx>
#include <SwGetPoolIdFromName.hxx>
#include <basebmp/basebmpdllapi.h>
#include <basebmp/bitmapdevice.hxx>
#include <basebmp/scanlineformats.hxx>
#include <basegfx/basegfxdllapi.h>
#include <basegfx/color/bcolor.hxx>
#include <basegfx/color/bcolormodifier.hxx>
......
vcl/Library_vclplug_gtk3.mk
Dosyayı görüntüle @ 6fe89253
......@@ -63,7 +63,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\
sot \
ucbhelper \
basegfx \
basebmp \
comphelper \
cppuhelper \
i18nlangtag \
......
vcl/android/androidinst.cxx
Dosyayı görüntüle @ 6fe89253
......@@ -18,7 +18,6 @@
#include <unx/gendata.hxx>
#include <osl/detail/android-bootstrap.h>
#include <rtl/strbuf.hxx>
#include <basebmp/scanlineformats.hxx>
#include <vcl/settings.hxx>
#define LOGTAG "LibreOffice/androidinst"
......
vcl/headless/svpvd.cxx
Dosyayı görüntüle @ 6fe89253
......@@ -25,12 +25,10 @@
#include "headless/svpgdi.hxx"
#include <basegfx/vector/b2ivector.hxx>
#include <basebmp/scanlineformats.hxx>
#include <cairo.h>
using namespace basegfx;
using namespace basebmp;
SvpSalVirtualDevice::~SvpSalVirtualDevice()
{
......@@ -52,11 +50,11 @@ void SvpSalVirtualDevice::ReleaseGraphics( SalGraphics* pGraphics )
bool SvpSalVirtualDevice::SetSize( long nNewDX, long nNewDY )
{
return SetSizeUsingBuffer(nNewDX, nNewDY, basebmp::RawMemorySharedArray());
return SetSizeUsingBuffer(nNewDX, nNewDY, boost::shared_array<sal_uInt8>());
}
bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, long nNewDY,
const basebmp::RawMemorySharedArray &pBuffer )
const boost::shared_array<sal_uInt8> &pBuffer )
{
B2IVector aDevSize( nNewDX, nNewDY );
if( aDevSize.getX() == 0 )
......
vcl/inc/cairotextrender.hxx
Dosyayı görüntüle @ 6fe89253
......@@ -21,7 +21,6 @@
#define INCLUDED_VCL_INC_UNX_CAIROTEXTRENDER_HXX
#include "textrender.hxx"
#include <basebmp/bitmapdevice.hxx>
#include <vcl/region.hxx>
#include <deque>
......
vcl/inc/headless/svpframe.hxx
Dosyayı görüntüle @ 6fe89253
......@@ -22,7 +22,6 @@
#include <vcl/sysdata.hxx>
#include <basegfx/range/b2ibox.hxx>
#include <basebmp/bitmapdevice.hxx>
#include <salframe.hxx>
......
vcl/inc/headless/svpvd.hxx
Dosyayı görüntüle @ 6fe89253
......@@ -47,7 +47,7 @@ public:
virtual bool SetSize( long nNewDX, long nNewDY ) override;
virtual bool SetSizeUsingBuffer( long nNewDX, long nNewDY,
const basebmp::RawMemorySharedArray &pBuffer
const boost::shared_array<sal_uInt8> &pBuffer
) override;
// SalGeometryProvider
......
vcl/inc/opengl/salbmp.hxx
Dosyayı görüntüle @ 6fe89253
......@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_INC_OPENGL_SALBMP_H
#define INCLUDED_VCL_INC_OPENGL_SALBMP_H
#include <basebmp/bitmapdevice.hxx>
#include <vcl/opengl/OpenGLContext.hxx>
#include "vcl/salbtype.hxx"
......@@ -30,6 +29,7 @@
#include <salbmp.hxx>
#include <deque>
#include <boost/shared_array.hpp>
struct BitmapBuffer;
class BitmapPalette;
......@@ -40,7 +40,7 @@ private:
OpenGLTexture maTexture;
bool mbDirtyTexture;
BitmapPalette maPalette;
basebmp::RawMemorySharedArray maUserBuffer;
boost::shared_array<sal_uInt8> maUserBuffer;
sal_uInt16 mnBits;
sal_uInt16 mnBytesPerRow;
int mnWidth;
......
vcl/inc/quartz/salbmp.h
Dosyayı görüntüle @ 6fe89253
......@@ -22,8 +22,6 @@
#include "tools/gen.hxx"
#include "basebmp/bitmapdevice.hxx"
#include "vcl/salbtype.hxx"
#include "quartz/salgdi.h"
......@@ -32,6 +30,8 @@
#include "salvd.hxx"
#include "salbmp.hxx"
#include <boost/shared_array.hpp>
// - SalBitmap -
struct BitmapBuffer;
......@@ -43,8 +43,8 @@ public:
CGContextRef mxGraphicContext;
mutable CGImageRef mxCachedImage;
BitmapPalette maPalette;
basebmp::RawMemorySharedArray maUserBuffer;
basebmp::RawMemorySharedArray maContextBuffer;
boost::shared_array<sal_uInt8> maUserBuffer;
boost::shared_array<sal_uInt8> maContextBuffer;
sal_uInt16 mnBits;
int mnWidth;
int mnHeight;
......
vcl/inc/salvd.hxx
Dosyayı görüntüle @ 6fe89253
......@@ -20,9 +20,9 @@
#ifndef INCLUDED_VCL_INC_SALVD_HXX
#define INCLUDED_VCL_INC_SALVD_HXX
#include <basebmp/bitmapdevice.hxx>
#include <vcl/dllapi.h>
#include <salgeom.hxx>
#include <boost/shared_array.hpp>
class SalGraphics;
......@@ -47,7 +47,7 @@ public:
// Set new size using a buffer at the given address
virtual bool SetSizeUsingBuffer( long nNewDX, long nNewDY,
const basebmp::RawMemorySharedArray & /* pBuffer */ )
const boost::shared_array<sal_uInt8> & /* pBuffer */ )
{
// Only the headless virtual device has an implementation that uses
// pBuffer (and bTopDown).
......
vcl/inc/textrender.hxx
Dosyayı görüntüle @ 6fe89253
......@@ -24,7 +24,6 @@
#include <vcl/salgtype.hxx>
#include <vcl/vclenum.hxx>
#include <vcl/metric.hxx>
#include <basebmp/bitmapdevice.hxx>
#include "salgdi.hxx"
#include "salglyphid.hxx"
#include "fontsubset.hxx"
......
vcl/inc/unx/glyphcache.hxx
Dosyayı görüntüle @ 6fe89253
......@@ -26,7 +26,6 @@
#include FT_FREETYPE_H
#include FT_GLYPH_H
#include <basebmp/bitmapdevice.hxx>
#include <com/sun/star/i18n/XBreakIterator.hpp>
#include <tools/gen.hxx>
#include <vcl/dllapi.h>
......
vcl/inc/unx/gtk/gtkframe.hxx
Dosyayı görüntüle @ 6fe89253
......@@ -39,8 +39,6 @@
#include "tools/link.hxx"
#include <basebmp/bitmapdevice.hxx>
#include <basebmp/scanlineformats.hxx>
#include <com/sun/star/awt/XTopWindow.hpp>
#include <list>
......
vcl/opengl/salbmp.cxx
Dosyayı görüntüle @ 6fe89253
......@@ -726,7 +726,7 @@ BitmapBuffer* OpenGLSalBitmap::AcquireBuffer( BitmapAccessMode nMode )
// maUserBuffer must be unique when we are doing the write access
if (nMode == BITMAP_WRITE_ACCESS && maUserBuffer && !maUserBuffer.unique())
{
basebmp::RawMemorySharedArray aBuffer(maUserBuffer);
boost::shared_array<sal_uInt8> aBuffer(maUserBuffer);
maUserBuffer.reset();
AllocateUserData();
......
vcl/quartz/salbmp.cxx
Dosyayı görüntüle @ 6fe89253
......@@ -22,8 +22,6 @@
#include <cstddef>
#include <limits>
#include <basebmp/scanlineformats.hxx>
#include <basebmp/color.hxx>
#include <basegfx/vector/b2ivector.hxx>
#include <tools/color.hxx>
#include <vcl/bitmap.hxx>
......
vcl/quartz/salgdi.cxx
Dosyayı görüntüle @ 6fe89253
......@@ -20,7 +20,6 @@
#include <sal/config.h>
#include <config_folders.h>
#include <basebmp/scanlineformats.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
......
vcl/quartz/salgdiutils.cxx
Dosyayı görüntüle @ 6fe89253
......@@ -19,8 +19,6 @@
#include <sal/config.h>
#include <basebmp/color.hxx>
#include <basebmp/scanlineformats.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/range/b2drectangle.hxx>
......
vcl/source/gdi/virdev.cxx
Dosyayı görüntüle @ 6fe89253
......@@ -289,7 +289,7 @@ void VirtualDevice::dispose()
}
bool VirtualDevice::InnerImplSetOutputSizePixel( const Size& rNewSize, bool bErase,
const basebmp::RawMemorySharedArray &pBuffer )
const boost::shared_array<sal_uInt8> &pBuffer )
{
SAL_INFO( "vcl.gdi",
"VirtualDevice::InnerImplSetOutputSizePixel( " << rNewSize.Width() << ", "
......@@ -395,7 +395,7 @@ void VirtualDevice::ImplFillOpaqueRectangle( const Rectangle& rRect )
}
bool VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, bool bErase,
const basebmp::RawMemorySharedArray &pBuffer )
const boost::shared_array<sal_uInt8> &pBuffer )
{
if( InnerImplSetOutputSizePixel(rNewSize, bErase, pBuffer) )
{
......@@ -411,7 +411,7 @@ bool VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, bool bErase,
{
mpAlphaVDev = VclPtr<VirtualDevice>::Create(*this, meAlphaFormat);
mpAlphaVDev->InnerImplSetOutputSizePixel(rNewSize, bErase,
basebmp::RawMemorySharedArray());
boost::shared_array<sal_uInt8>());
}
// TODO: copy full outdev state to new one, here. Also needed in outdev2.cxx:DrawOutDev
......@@ -444,12 +444,12 @@ void VirtualDevice::EnableRTL( bool bEnable )
bool VirtualDevice::SetOutputSizePixel( const Size& rNewSize, bool bErase )
{
return ImplSetOutputSizePixel(rNewSize, bErase, basebmp::RawMemorySharedArray());
return ImplSetOutputSizePixel(rNewSize, bErase, boost::shared_array<sal_uInt8>());
}
bool VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(
const Size& rNewSize, const Fraction& rScale, const Point& rNewOffset,
const basebmp::RawMemorySharedArray &pBuffer )
const boost::shared_array<sal_uInt8> &pBuffer )
{
if (pBuffer) {
MapMode mm = GetMapMode();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment