Merge pull request #9 from Zardshard/inline

ghaerr · web-flow · commit c4f36b443214 · 2023-08-21T09:51:12.000-06:00
Fix multiple definitions linker error
diff --git a/agg-src/include/agg_trans_perspective.h b/agg-src/include/agg_trans_perspective.h
@@ -502,7 +502,7 @@ namespace agg
     }
 
     //------------------------------------------------------------------------
-    const trans_perspective& 
+    inline const trans_perspective&
     trans_perspective::multiply_inv(const trans_perspective& m)
     {
         trans_perspective t = m;
@@ -511,7 +511,7 @@ namespace agg
     }
 
     //------------------------------------------------------------------------
-    const trans_perspective&
+    inline const trans_perspective&
     trans_perspective::multiply_inv(const trans_affine& m)
     {
         trans_affine t = m;
@@ -520,7 +520,7 @@ namespace agg
     }
 
     //------------------------------------------------------------------------
-    const trans_perspective&
+    inline const trans_perspective&
     trans_perspective::premultiply_inv(const trans_perspective& m)
     {
         trans_perspective t = m;
@@ -529,7 +529,7 @@ namespace agg
     }
 
     //------------------------------------------------------------------------
-    const trans_perspective&
+    inline const trans_perspective&
     trans_perspective::premultiply_inv(const trans_affine& m)
     {
         trans_perspective t(m);
@@ -697,14 +697,14 @@ namespace agg
     }
 
     //------------------------------------------------------------------------
-    void trans_perspective::translation(double* dx, double* dy) const
+    inline void trans_perspective::translation(double* dx, double* dy) const
     {
         *dx = tx;
         *dy = ty;
     }
 
     //------------------------------------------------------------------------
-    void trans_perspective::scaling(double* x, double* y) const
+    inline void trans_perspective::scaling(double* x, double* y) const
     {
         double x1 = 0.0;
         double y1 = 0.0;
@@ -719,7 +719,7 @@ namespace agg
     }
 
     //------------------------------------------------------------------------
-    void trans_perspective::scaling_abs(double* x, double* y) const
+    inline void trans_perspective::scaling_abs(double* x, double* y) const
     {
         *x = std::sqrt(sx  * sx  + shx * shx);
         *y = std::sqrt(shy * shy + sy  * sy);

Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,7 @@ namespace agg`
`502`	`502`	`}`
`503`	`503`
`504`	`504`	`//------------------------------------------------------------------------`
`505`		`- const trans_perspective&`
	`505`	`+ inline const trans_perspective&`
`506`	`506`	`trans_perspective::multiply_inv(const trans_perspective& m)`
`507`	`507`	`{`
`508`	`508`	`trans_perspective t = m;`
`@@ -511,7 +511,7 @@ namespace agg`
`511`	`511`	`}`
`512`	`512`
`513`	`513`	`//------------------------------------------------------------------------`
`514`		`- const trans_perspective&`
	`514`	`+ inline const trans_perspective&`
`515`	`515`	`trans_perspective::multiply_inv(const trans_affine& m)`
`516`	`516`	`{`
`517`	`517`	`trans_affine t = m;`
`@@ -520,7 +520,7 @@ namespace agg`
`520`	`520`	`}`
`521`	`521`
`522`	`522`	`//------------------------------------------------------------------------`
`523`		`- const trans_perspective&`
	`523`	`+ inline const trans_perspective&`
`524`	`524`	`trans_perspective::premultiply_inv(const trans_perspective& m)`
`525`	`525`	`{`
`526`	`526`	`trans_perspective t = m;`
`@@ -529,7 +529,7 @@ namespace agg`
`529`	`529`	`}`
`530`	`530`
`531`	`531`	`//------------------------------------------------------------------------`
`532`		`- const trans_perspective&`
	`532`	`+ inline const trans_perspective&`
`533`	`533`	`trans_perspective::premultiply_inv(const trans_affine& m)`
`534`	`534`	`{`
`535`	`535`	`trans_perspective t(m);`
`@@ -697,14 +697,14 @@ namespace agg`
`697`	`697`	`}`
`698`	`698`
`699`	`699`	`//------------------------------------------------------------------------`
`700`		`- void trans_perspective::translation(double* dx, double* dy) const`
	`700`	`+ inline void trans_perspective::translation(double* dx, double* dy) const`
`701`	`701`	`{`
`702`	`702`	`*dx = tx;`
`703`	`703`	`*dy = ty;`
`704`	`704`	`}`
`705`	`705`
`706`	`706`	`//------------------------------------------------------------------------`
`707`		`- void trans_perspective::scaling(double* x, double* y) const`
	`707`	`+ inline void trans_perspective::scaling(double* x, double* y) const`
`708`	`708`	`{`
`709`	`709`	`double x1 = 0.0;`
`710`	`710`	`double y1 = 0.0;`
`@@ -719,7 +719,7 @@ namespace agg`
`719`	`719`	`}`
`720`	`720`
`721`	`721`	`//------------------------------------------------------------------------`
`722`		`- void trans_perspective::scaling_abs(double* x, double* y) const`
	`722`	`+ inline void trans_perspective::scaling_abs(double* x, double* y) const`
`723`	`723`	`{`
`724`	`724`	`x = std::sqrt(sx sx + shx * shx);`
`725`	`725`	`y = std::sqrt(shy shy + sy * sy);`