summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2016-08-31 15:52:58 +0900
committerTomaž Vajngerl <quikee@gmail.com>2016-08-31 11:13:38 +0000
commit6d361d86f72d33fac41847b80883c524580f4cf3 (patch)
treef2032c6c3f3151748744bf4adf43aa2abaa70f0c /vcl/inc
parent32fc5177f7c60b4a875a7b10af9a20240177e9f6 (diff)
opengl: remove unsused "bitmap ops" in GL backend
Change-Id: I188570d11349a5344753f3948daedf0e17806c6c Reviewed-on: https://gerrit.libreoffice.org/28536 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/opengl/bmpop.hxx35
-rw-r--r--vcl/inc/opengl/salbmp.hxx5
2 files changed, 1 insertions, 39 deletions
diff --git a/vcl/inc/opengl/bmpop.hxx b/vcl/inc/opengl/bmpop.hxx
deleted file mode 100644
index d19410b2f253..000000000000
--- a/vcl/inc/opengl/bmpop.hxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_VCL_INC_OPENGL_BMPOP_H
-#define INCLUDED_VCL_INC_OPENGL_BMPOP_H
-
-class OpenGLSalBitmapOp
-{
-public:
- OpenGLSalBitmapOp() {};
- virtual ~OpenGLSalBitmapOp() {};
-
- virtual bool Execute() = 0;
- virtual void GetSize( Size& rSize ) const = 0;
-};
-
-#endif // INCLUDED_VCL_INC_OPENGL_BMPOP_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index 771c4aa88413..59e1859240dc 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -23,7 +23,6 @@
#include <vcl/opengl/OpenGLContext.hxx>
#include <vcl/salbtype.hxx>
-#include "opengl/bmpop.hxx"
#include "opengl/texture.hxx"
#include <salbmp.hxx>
@@ -45,7 +44,6 @@ private:
sal_uInt16 mnBytesPerRow;
int mnWidth;
int mnHeight;
- std::deque< OpenGLSalBitmapOp* > maPendingOps;
virtual void updateChecksum() const override;
@@ -71,7 +69,7 @@ public:
Size GetSize() const override;
sal_uInt16 GetBitCount() const override;
- BitmapBuffer *AcquireBuffer( BitmapAccessMode nMode ) override;
+ BitmapBuffer* AcquireBuffer( BitmapAccessMode nMode ) override;
void ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) override;
bool GetSystemData( BitmapSystemData& rData ) override;
@@ -89,7 +87,6 @@ public:
private:
- void ExecuteOperations();
GLuint CreateTexture();
bool AllocateUserData();
bool ReadTexture();