Kaydet (Commit) 282c16a3 authored tarafından Markus Mohrhard's avatar Markus Mohrhard Kaydeden (comit) Markus Mohrhard

fix OpenGL canvas windows build

Change-Id: Ic6ed9c69003fa79a60310dc0b010ffc0ca868791
üst 1f4d9846
...@@ -44,6 +44,7 @@ $(eval $(call gb_Library_add_exception_objects,oglcanvas,\ ...@@ -44,6 +44,7 @@ $(eval $(call gb_Library_add_exception_objects,oglcanvas,\
$(eval $(call gb_Library_use_externals,oglcanvas,\ $(eval $(call gb_Library_use_externals,oglcanvas,\
boost_headers \ boost_headers \
glew \ glew \
mesa_headers \
)) ))
ifeq ($(strip $(OS)),MACOSX) ifeq ($(strip $(OS)),MACOSX)
......
...@@ -38,7 +38,7 @@ namespace oglcanvas ...@@ -38,7 +38,7 @@ namespace oglcanvas
maCanvasHelper = rSrc.maCanvasHelper; maCanvasHelper = rSrc.maCanvasHelper;
} }
void SAL_CALL CanvasBitmap::disposeThis() void CanvasBitmap::disposeThis()
{ {
mpDevice.clear(); mpDevice.clear();
......
...@@ -50,7 +50,7 @@ namespace oglcanvas ...@@ -50,7 +50,7 @@ namespace oglcanvas
rDeviceHelper ); rDeviceHelper );
} }
void SAL_CALL CanvasCustomSprite::disposeThis() void CanvasCustomSprite::disposeThis()
{ {
::osl::MutexGuard aGuard( m_aMutex ); ::osl::MutexGuard aGuard( m_aMutex );
......
...@@ -80,7 +80,7 @@ namespace oglcanvas ...@@ -80,7 +80,7 @@ namespace oglcanvas
maArguments.realloc(0); maArguments.realloc(0);
} }
void SAL_CALL SpriteCanvas::disposeThis() void SpriteCanvas::disposeThis()
{ {
::osl::MutexGuard aGuard( m_aMutex ); ::osl::MutexGuard aGuard( m_aMutex );
......
...@@ -90,6 +90,9 @@ namespace oglcanvas ...@@ -90,6 +90,9 @@ namespace oglcanvas
mnRectangularMultiColorGradientProgram(0) mnRectangularMultiColorGradientProgram(0)
{} {}
SpriteDeviceHelper::~SpriteDeviceHelper()
{}
void SpriteDeviceHelper::init( Window& rWindow, void SpriteDeviceHelper::init( Window& rWindow,
SpriteCanvas& rSpriteCanvas, SpriteCanvas& rSpriteCanvas,
const awt::Rectangle& rViewArea ) const awt::Rectangle& rViewArea )
......
...@@ -41,6 +41,7 @@ namespace oglcanvas ...@@ -41,6 +41,7 @@ namespace oglcanvas
{ {
public: public:
SpriteDeviceHelper(); SpriteDeviceHelper();
~SpriteDeviceHelper();
void init( Window& rWindow, void init( Window& rWindow,
SpriteCanvas& rSpriteCanvas, SpriteCanvas& rSpriteCanvas,
......
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