summaryrefslogtreecommitdiff
path: root/agg/inc/agg_span_interpolator_persp.h
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:15:40 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:15:40 +0200
commit63a1d1f544cc305fd85f3eff88d239707eb0887b (patch)
tree31e94776ad9267cb5261384a82cfc24dd6ebc58a /agg/inc/agg_span_interpolator_persp.h
parent5c5915bb0ffbfa975ffac67e6ebf8c8ca75876a2 (diff)
recreated tag OOO_BUILD_3_2_98_1 which had these commits:
commit 72351eac8e48c77a85526da9211579a668989db0 (tag: refs/tags/OOO_BUILD_3_2_98_1) Author: Petr Mladek <pmladek@walk.suse.cz> Date: Wed Sep 15 19:03:27 2010 +0200 Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1) commit ff7279bcea6a84b78d0f2857afc65bdfdf74d292 Author: Fridrich Štrba <fridrich.strba@bluewin.ch> Date: Tue Sep 14 17:27:58 2010 +0200 Moving languagetool out of the wront repository languagetool/JLanguageTool-1.0.0.patch | 137 -------------------------------- languagetool/makefile.mk | 67 ---------------- languagetool/prj/build.lst | 3 - languagetool/prj/d.lst | 1 - 4 files changed, 0 insertions(+), 208 deletions(-) commit ebd25dfc045728e12fa638b298471381ad15719a Author: Fridrich Štrba <fridrich.strba@bluewin.ch> Date: Tue Sep 14 17:16:24 2010 +0200 languagetool-makefile-mk.diff: makefile for languagetool languagetool/makefile.mk | 67 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) commit fe841a0e61050b7f20d3d38de14bec34aa42190c Author: Fridrich Štrba <fridrich.strba@bluewin.ch> Date: Tue Sep 14 17:13:53 2010 +0200 languagetool-jlanguagetool-1-0-0-patch.diff: build patch for languagetool languagetool/JLanguageTool-1.0.0.patch | 137 ++++++++++++++++++++++++++++++++ 1 files changed, 137 insertions(+), 0 deletions(-) commit d1c6a5a8d097d3ac87c39b7aa7274a3fe82de9c2 Author: Fridrich Štrba <fridrich.strba@bluewin.ch> Date: Tue Sep 14 17:11:46 2010 +0200 languagetool-prj-d-lst.diff: languagetool deliver list languagetool/prj/d.lst | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit da8f435f9d194571819d53ed85e89ef1adbcb044 Author: Fridrich Štrba <fridrich.strba@bluewin.ch> Date: Tue Sep 14 17:09:23 2010 +0200 languagetool-prj-build-lst.diff: build list for languagetool module languagetool/prj/build.lst | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit ab036ed3fa31d5cbbf4d1a17180e8a7b053a642d Author: Tor Lillqvist <tlillqvist@novell.com> Date: Tue Sep 14 12:20:45 2010 +0200 build-fix-win32.diff: Fix Windows build on partitions without short names external/msvcp80/README_msvcX80.dll | 5 +++-- external/prj/d.lst | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) commit 51593e8e836ce5db60fc00682cefb1b87bd0f027 Author: Fridrich Štrba <fridrich.strba@bluewin.ch> Date: Tue Sep 14 11:41:58 2010 +0200 internal-mesa-headers-mesa.diff: Create mesa module for use with transogl. Mesa/inc/gl.h | 2252 +++++++++++++++ Mesa/inc/gl_mangle.h | 1568 +++++++++++ Mesa/inc/glext.h | 7271 +++++++++++++++++++++++++++++++++++++++++++++++++ Mesa/inc/glu.h | 348 +++ Mesa/inc/glu_mangle.h | 86 + Mesa/inc/glx.h | 500 ++++ Mesa/inc/glx_mangle.h | 81 + Mesa/inc/glxext.h | 785 ++++++ Mesa/inc/vms_x_fix.h | 1224 +++++++++ Mesa/prj/build.lst | 3 + Mesa/prj/d.lst | 3 + 11 files changed, 14121 insertions(+), 0 deletions(-) commit 84b44afa238afc45065db0c87d94fdcda0b99489 Author: Fridrich Štrba <fridrich.strba@bluewin.ch> Date: Tue Sep 14 11:26:04 2010 +0200 libwpg.diff: WPG Import filter - create a libwpg module. libwpg/makefile.mk | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ libwpg/prj/build.lst | 3 ++ libwpg/prj/d.lst | 16 +++++++++++++ 3 files changed, 79 insertions(+), 0 deletions(-) commit c9802c9c9481ef47c8bb5225fb5be640ed4f4c87 Author: Fridrich Štrba <fridrich.strba@bluewin.ch> Date: Tue Sep 14 11:15:24 2010 +0200 libwps.diff: WPS Import filter - create a libwps module libwpd/makefile.mk | 2 +- libwps/libwps-0.1.1.diff | 93 ++++++++++++++++++++++++++++++++++++++++++++++ libwps/makefile.mk | 60 +++++++++++++++++++++++++++++ libwps/prj/build.lst | 3 + libwps/prj/d.lst | 6 +++ 5 files changed, 163 insertions(+), 1 deletions(-) commit 37676cddbfa10f29efea49aafd07acb40aa6b7d4 Author: Fridrich Štrba <fridrich.strba@bluewin.ch> Date: Tue Sep 14 10:34:20 2010 +0200 libwpd.diff: upload new libwpd libwpd/makefile.mk | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
Notes
Notes: split repo tag: libs-extern_OOO_BUILD_3_2_98_1
Diffstat (limited to 'agg/inc/agg_span_interpolator_persp.h')
-rwxr-xr-xagg/inc/agg_span_interpolator_persp.h60
1 files changed, 30 insertions, 30 deletions
diff --git a/agg/inc/agg_span_interpolator_persp.h b/agg/inc/agg_span_interpolator_persp.h
index 632a56449f28..0c01c2e30e09 100755
--- a/agg/inc/agg_span_interpolator_persp.h
+++ b/agg/inc/agg_span_interpolator_persp.h
@@ -2,8 +2,8 @@
// Anti-Grain Geometry - Version 2.3
// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
//
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all copies.
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
// This software is provided "as is" without express or implied
// warranty, and with no claim as to its suitability for any purpose.
//
@@ -24,7 +24,7 @@ namespace agg
//===========================================span_interpolator_persp_exact
- template<unsigned SubpixelShift = 8>
+ template<unsigned SubpixelShift = 8>
class span_interpolator_persp_exact
{
public:
@@ -41,24 +41,24 @@ namespace agg
//--------------------------------------------------------------------
// Arbitrary quadrangle transformations
- span_interpolator_persp_exact(const double* src, const double* dst)
+ span_interpolator_persp_exact(const double* src, const double* dst)
{
quad_to_quad(src, dst);
}
//--------------------------------------------------------------------
- // Direct transformations
- span_interpolator_persp_exact(double x1, double y1,
- double x2, double y2,
+ // Direct transformations
+ span_interpolator_persp_exact(double x1, double y1,
+ double x2, double y2,
const double* quad)
{
rect_to_quad(x1, y1, x2, y2, quad);
}
//--------------------------------------------------------------------
- // Reverse transformations
- span_interpolator_persp_exact(const double* quad,
- double x1, double y1,
+ // Reverse transformations
+ span_interpolator_persp_exact(const double* quad,
+ double x1, double y1,
double x2, double y2)
{
quad_to_rect(quad, x1, y1, x2, y2);
@@ -74,7 +74,7 @@ namespace agg
//--------------------------------------------------------------------
// Set the direct transformations, i.e., rectangle -> quadrangle
- void rect_to_quad(double x1, double y1, double x2, double y2,
+ void rect_to_quad(double x1, double y1, double x2, double y2,
const double* quad)
{
double src[8];
@@ -88,7 +88,7 @@ namespace agg
//--------------------------------------------------------------------
// Set the reverse transformations, i.e., quadrangle -> rectangle
- void quad_to_rect(const double* quad,
+ void quad_to_rect(const double* quad,
double x1, double y1, double x2, double y2)
{
double dst[8];
@@ -152,11 +152,11 @@ namespace agg
//----------------------------------------------------------------
void resynchronize(double xe, double ye, unsigned len)
{
- // Assume x1,y1 are equal to the ones at the previous end point
+ // Assume x1,y1 are equal to the ones at the previous end point
int sx1 = m_scale_x.y();
int sy1 = m_scale_y.y();
- // Calculate transformed coordinates at x2,y2
+ // Calculate transformed coordinates at x2,y2
double xt = xe;
double yt = ye;
m_trans_dir.transform(&xt, &yt);
@@ -215,7 +215,7 @@ namespace agg
{
m_trans_dir.transform(x, y);
}
-
+
private:
trans_type m_trans_dir;
trans_type m_trans_inv;
@@ -235,7 +235,7 @@ namespace agg
//============================================span_interpolator_persp_lerp
- template<unsigned SubpixelShift = 8>
+ template<unsigned SubpixelShift = 8>
class span_interpolator_persp_lerp
{
public:
@@ -251,24 +251,24 @@ namespace agg
//--------------------------------------------------------------------
// Arbitrary quadrangle transformations
- span_interpolator_persp_lerp(const double* src, const double* dst)
+ span_interpolator_persp_lerp(const double* src, const double* dst)
{
quad_to_quad(src, dst);
}
//--------------------------------------------------------------------
- // Direct transformations
- span_interpolator_persp_lerp(double x1, double y1,
- double x2, double y2,
+ // Direct transformations
+ span_interpolator_persp_lerp(double x1, double y1,
+ double x2, double y2,
const double* quad)
{
rect_to_quad(x1, y1, x2, y2, quad);
}
//--------------------------------------------------------------------
- // Reverse transformations
- span_interpolator_persp_lerp(const double* quad,
- double x1, double y1,
+ // Reverse transformations
+ span_interpolator_persp_lerp(const double* quad,
+ double x1, double y1,
double x2, double y2)
{
quad_to_rect(quad, x1, y1, x2, y2);
@@ -284,7 +284,7 @@ namespace agg
//--------------------------------------------------------------------
// Set the direct transformations, i.e., rectangle -> quadrangle
- void rect_to_quad(double x1, double y1, double x2, double y2,
+ void rect_to_quad(double x1, double y1, double x2, double y2,
const double* quad)
{
double src[8];
@@ -298,7 +298,7 @@ namespace agg
//--------------------------------------------------------------------
// Set the reverse transformations, i.e., quadrangle -> rectangle
- void quad_to_rect(const double* quad,
+ void quad_to_rect(const double* quad,
double x1, double y1, double x2, double y2)
{
double dst[8];
@@ -316,7 +316,7 @@ namespace agg
//----------------------------------------------------------------
void begin(double x, double y, unsigned len)
{
- // Calculate transformed coordinates at x1,y1
+ // Calculate transformed coordinates at x1,y1
double xt = x;
double yt = y;
m_trans_dir.transform(&xt, &yt);
@@ -343,7 +343,7 @@ namespace agg
dy -= y;
int sy1 = int(subpixel_size/sqrt(dx*dx + dy*dy)) >> subpixel_shift;
- // Calculate transformed coordinates at x2,y2
+ // Calculate transformed coordinates at x2,y2
x += len;
xt = x;
yt = y;
@@ -378,13 +378,13 @@ namespace agg
//----------------------------------------------------------------
void resynchronize(double xe, double ye, unsigned len)
{
- // Assume x1,y1 are equal to the ones at the previous end point
+ // Assume x1,y1 are equal to the ones at the previous end point
int x1 = m_coord_x.y();
int y1 = m_coord_y.y();
int sx1 = m_scale_x.y();
int sy1 = m_scale_y.y();
- // Calculate transformed coordinates at x2,y2
+ // Calculate transformed coordinates at x2,y2
double xt = xe;
double yt = ye;
m_trans_dir.transform(&xt, &yt);
@@ -447,7 +447,7 @@ namespace agg
{
m_trans_dir.transform(x, y);
}
-
+
private:
trans_type m_trans_dir;
trans_type m_trans_inv;