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.cxx | |
| parent | ceec61fe9614b7fb631781c3f9d21894e084077b (diff) | |
| parent | a10646b1c87e6abc1651ae7160ddd2c7fd1753bc (diff) | |
merge with mainline
Diffstat (limited to 'src/Stitch.cxx')
| -rw-r--r-- | src/Stitch.cxx | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/src/Stitch.cxx b/src/Stitch.cxx index f8f77fb..f45bda4 100644 --- a/src/Stitch.cxx +++ b/src/Stitch.cxx @@ -1,21 +1,8 @@ -// -// Copyright 2006 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. #include <stdlib.h> #include <stdio.h> @@ -91,12 +78,12 @@ Stitch::set_output(const char *file, OutputImage *img) { int Stitch::resample(int w, int h, - double view_start, double view_end) { + double view_start, double view_end) { double step_view = (view_end - view_start) / w; uchar r, g, b; int y_off = h / 2; int merged_pixel_set; - double radius = (double) w / (view_end -view_start); + double radius = (double) w / (view_end -view_start); if (merged_image) { merged_image->init(w, h); |