diff options
author | Johannes Hofmann <Johannes.Hofmann@gmx.de> | 2006-11-26 17:22:42 +0100 |
---|---|---|
committer | Johannes Hofmann <Johannes.Hofmann@gmx.de> | 2006-11-26 17:22:42 +0100 |
commit | 2aaf6d31566df56d30ee492418562e04732c8059 (patch) | |
tree | 3062dd55798ec76edb095c4f83abecd27c7da328 /src/Stitch.H | |
parent | ceec61fe9614b7fb631781c3f9d21894e084077b (diff) | |
parent | a10646b1c87e6abc1651ae7160ddd2c7fd1753bc (diff) |
merge with mainline
Diffstat (limited to 'src/Stitch.H')
-rw-r--r-- | src/Stitch.H | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/src/Stitch.H b/src/Stitch.H index 0bb6d48..49dd6b8 100644 --- a/src/Stitch.H +++ b/src/Stitch.H @@ -1,21 +1,8 @@ -// -// Copyright 2005 by Johannes Hofmann // -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -// USA. +// Copyright 2006 Johannes Hofmann <Johannes.Hofmann@gmx.de> // +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #ifndef STITCH_H #define STITCH_H @@ -25,19 +12,19 @@ #define MAX_PICS 256 - + class Stitch { private: GipfelWidget *gipf[MAX_PICS]; OutputImage *single_images[MAX_PICS]; OutputImage *merged_image; - + public: Stitch(); ~Stitch(); - + int load_image(char *file); OutputImage * set_output(OutputImage *img); |