From 614c7b50f729766b6ec34c771e83c502feed1b6b Mon Sep 17 00:00:00 2001 From: Constantin Kaplinsky Date: Wed, 26 Dec 2007 18:17:09 +0000 Subject: [PATCH] Moved XPixelBuffer class into a separate file. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@2381 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- unix/x0vncserver/XPixelBuffer.h | 51 ++++++++++++++++++++++++++++++++ unix/x0vncserver/x0vncserver.cxx | 22 +------------- 2 files changed, 52 insertions(+), 21 deletions(-) create mode 100644 unix/x0vncserver/XPixelBuffer.h diff --git a/unix/x0vncserver/XPixelBuffer.h b/unix/x0vncserver/XPixelBuffer.h new file mode 100644 index 00000000..44377df7 --- /dev/null +++ b/unix/x0vncserver/XPixelBuffer.h @@ -0,0 +1,51 @@ +/* Copyright (C) 2007 Constantin Kaplinsky. All Rights Reserved. + * + * This is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +// +// XPixelBuffer.h +// + +#ifndef __XPIXELBUFFER_H__ +#define __XPIXELBUFFER_H__ + +#include + +using namespace rfb; + +// +// XPixelBuffer is a modification of FullFramePixelBuffer that does +// not always return buffer width in getStride(). +// + +class XPixelBuffer : public FullFramePixelBuffer +{ +public: + XPixelBuffer(const PixelFormat& pf, int width, int height, + rdr::U8* data_, ColourMap* cm, int stride_) : + FullFramePixelBuffer(pf, width, height, data_, cm), stride(stride_) + { + } + + virtual int getStride() const { return stride; } + +protected: + int stride; +}; + +#endif // __XPIXELBUFFER_H__ + diff --git a/unix/x0vncserver/x0vncserver.cxx b/unix/x0vncserver/x0vncserver.cxx index 78e1cc05..da0874f4 100644 --- a/unix/x0vncserver/x0vncserver.cxx +++ b/unix/x0vncserver/x0vncserver.cxx @@ -46,6 +46,7 @@ #include #include +#include #include #include @@ -133,27 +134,6 @@ private: }; -// -// XPixelBuffer is a modification of FullFramePixelBuffer that does -// not always return buffer width in getStride(). -// - -class XPixelBuffer : public FullFramePixelBuffer -{ -public: - XPixelBuffer(const PixelFormat& pf, int width, int height, - rdr::U8* data_, ColourMap* cm, int stride_) : - FullFramePixelBuffer(pf, width, height, data_, cm), stride(stride_) - { - } - - virtual int getStride() const { return stride; } - -protected: - int stride; -}; - - class XDesktop : public SDesktop, public ColourMap { public: -- 2.39.5