* reorder includes

GerHobbelt · Jan 10, 2023 · 04e0a85 · 04e0a85
1 parent 89fa0c1
commit 04e0a85
Show file tree

Hide file tree

Showing 31 changed files with 23 additions and 41 deletions.
diff --git a/agg-src/include/agg_arc.h b/agg-src/include/agg_arc.h
@@ -20,7 +20,6 @@
 #ifndef AGG_ARC_INCLUDED
 #define AGG_ARC_INCLUDED
 
-#include "agg_basics.h"
 
 namespace agg
 {

diff --git a/agg-src/include/agg_array.h b/agg-src/include/agg_array.h
@@ -15,9 +15,9 @@
 #ifndef AGG_ARRAY_INCLUDED
 #define AGG_ARRAY_INCLUDED
 
+#include "agg_basics.h"
 #include <cstddef>
 #include <cstring>
-#include "agg_basics.h"
 
 namespace agg
 {

diff --git a/agg-src/include/agg_arrowhead.h b/agg-src/include/agg_arrowhead.h
@@ -19,7 +19,6 @@
 #ifndef AGG_ARROWHEAD_INCLUDED
 #define AGG_ARROWHEAD_INCLUDED
 
-#include "agg_basics.h"
 
 namespace agg
 {

diff --git a/agg-src/include/agg_basics.h b/agg-src/include/agg_basics.h
@@ -17,7 +17,6 @@
 #define AGG_BASICS_INCLUDED
 
 #include <cmath>
-#include "agg_config.h"
 
 //---------------------------------------------------------AGG_CUSTOM_ALLOCATOR
 #ifdef AGG_CUSTOM_ALLOCATOR

diff --git a/agg-src/include/agg_bezier_arc.h b/agg-src/include/agg_bezier_arc.h
@@ -21,7 +21,7 @@
 #ifndef AGG_BEZIER_ARC_INCLUDED
 #define AGG_BEZIER_ARC_INCLUDED
 
-#include "agg_conv_transform.h"
+#include "agg_basics.h"
 
 namespace agg
 {

diff --git a/agg-src/include/agg_conv_stroke.h b/agg-src/include/agg_conv_stroke.h
@@ -19,7 +19,6 @@
 #ifndef AGG_CONV_STROKE_INCLUDED
 #define AGG_CONV_STROKE_INCLUDED
 
-#include "agg_basics.h"
 #include "agg_vcgen_stroke.h"
 #include "agg_conv_adaptor_vcgen.h"
 

diff --git a/agg-src/include/agg_dda_line.h b/agg-src/include/agg_dda_line.h
@@ -21,7 +21,6 @@
 #define AGG_DDA_LINE_INCLUDED
 
 #include <cstdlib>
-#include "agg_basics.h"
 
 namespace agg
 {

diff --git a/agg-src/include/agg_ellipse_bresenham.h b/agg-src/include/agg_ellipse_bresenham.h
@@ -21,8 +21,6 @@
 #define AGG_ELLIPSE_BRESENHAM_INCLUDED
 
 
-#include "agg_basics.h"
-
 
 namespace agg
 {

diff --git a/agg-src/include/agg_line_aa_basics.h b/agg-src/include/agg_line_aa_basics.h
@@ -15,8 +15,8 @@
 #ifndef AGG_LINE_AA_BASICS_INCLUDED
 #define AGG_LINE_AA_BASICS_INCLUDED
 
-#include <cstdlib>
 #include "agg_basics.h"
+#include <cstdlib>
 
 namespace agg
 {

diff --git a/agg-src/include/agg_math.h b/agg-src/include/agg_math.h
@@ -19,8 +19,8 @@
 #ifndef AGG_MATH_INCLUDED
 #define AGG_MATH_INCLUDED
 
-#include <cmath>
 #include "agg_basics.h"
+#include <cmath>
 
 namespace agg
 {

diff --git a/agg-src/include/agg_renderer_outline_aa.h b/agg-src/include/agg_renderer_outline_aa.h
@@ -15,15 +15,13 @@
 #ifndef AGG_RENDERER_OUTLINE_AA_INCLUDED
 #define AGG_RENDERER_OUTLINE_AA_INCLUDED
 
-#include <cstdlib>
 #include "agg_array.h"
 #include "agg_math.h"
 #include "agg_line_aa_basics.h"
 #include "agg_dda_line.h"
 #include "agg_ellipse_bresenham.h"
-#include "agg_renderer_base.h"
-#include "agg_gamma_functions.h"
 #include "agg_clip_liang_barsky.h"
+#include <cstdlib>
 
 namespace agg
 {

diff --git a/agg-src/include/agg_rounded_rect.h b/agg-src/include/agg_rounded_rect.h
@@ -20,7 +20,6 @@
 #ifndef AGG_ROUNDED_RECT_INCLUDED
 #define AGG_ROUNDED_RECT_INCLUDED
 
-#include "agg_basics.h"
 #include "agg_arc.h"
 
 namespace agg

diff --git a/agg-src/include/agg_shorten_path.h b/agg-src/include/agg_shorten_path.h
@@ -16,8 +16,6 @@
 #ifndef AGG_SHORTEN_PATH_INCLUDED
 #define AGG_SHORTEN_PATH_INCLUDED
 
-#include "agg_basics.h"
-#include "agg_vertex_sequence.h"
 
 namespace agg
 {

diff --git a/agg-src/include/agg_trans_affine.h b/agg-src/include/agg_trans_affine.h
@@ -20,7 +20,6 @@
 #define AGG_TRANS_AFFINE_INCLUDED
 
 #include <cmath>
-#include "agg_basics.h"
 
 namespace agg
 {

diff --git a/agg-src/include/agg_vcgen_dash.h b/agg-src/include/agg_vcgen_dash.h
@@ -19,7 +19,6 @@
 #ifndef AGG_VCGEN_DASH_INCLUDED
 #define AGG_VCGEN_DASH_INCLUDED
 
-#include "agg_basics.h"
 #include "agg_vertex_sequence.h"
 
 namespace agg

diff --git a/agg-src/include/agg_vcgen_markers_term.h b/agg-src/include/agg_vcgen_markers_term.h
@@ -16,9 +16,8 @@
 #ifndef AGG_VCGEN_MARKERS_TERM_INCLUDED
 #define AGG_VCGEN_MARKERS_TERM_INCLUDED
 
-#include "agg_basics.h"
-#include "agg_vertex_sequence.h"
 
+#include "agg_array.h"
 namespace agg
 {
 

diff --git a/agg-src/include/agg_vcgen_smooth_poly1.h b/agg-src/include/agg_vcgen_smooth_poly1.h
@@ -16,7 +16,6 @@
 #ifndef AGG_VCGEN_SMOOTH_POLY1_INCLUDED
 #define AGG_VCGEN_SMOOTH_POLY1_INCLUDED
 
-#include "agg_basics.h"
 #include "agg_vertex_sequence.h"
 
 

diff --git a/agg-src/include/agg_vertex_sequence.h b/agg-src/include/agg_vertex_sequence.h
@@ -19,7 +19,6 @@
 #ifndef AGG_VERTEX_SEQUENCE_INCLUDED
 #define AGG_VERTEX_SEQUENCE_INCLUDED
 
-#include "agg_basics.h"
 #include "agg_array.h"
 #include "agg_math.h"
 

diff --git a/agg-src/src/agg_arc.cpp b/agg-src/src/agg_arc.cpp
@@ -17,9 +17,10 @@
 //
 //----------------------------------------------------------------------------
 
-#include <cmath>
-#include "agg_arc.h"
 
+#include "agg_arc.h"
+#include "agg_basics.h"
+#include <cmath>
 
 namespace agg
 {

diff --git a/agg-src/src/agg_arrowhead.cpp b/agg-src/src/agg_arrowhead.cpp
@@ -18,6 +18,7 @@
 //----------------------------------------------------------------------------
 
 #include "agg_arrowhead.h"
+#include "agg_basics.h"
 
 namespace agg
 {

diff --git a/agg-src/src/agg_bezier_arc.cpp b/agg-src/src/agg_bezier_arc.cpp
@@ -19,9 +19,9 @@
 //----------------------------------------------------------------------------
 
 
-#include <cmath>
 #include "agg_bezier_arc.h"
-
+#include "agg_trans_affine.h"
+#include <cmath>
 
 namespace agg
 {

diff --git a/agg-src/src/agg_curves.cpp b/agg-src/src/agg_curves.cpp
@@ -13,9 +13,9 @@
 //          http://www.antigrain.com
 //----------------------------------------------------------------------------
 
-#include <cmath>
 #include "agg_curves.h"
 #include "agg_math.h"
+#include <cmath>
 
 namespace agg
 {

diff --git a/agg-src/src/agg_gsv_text.cpp b/agg-src/src/agg_gsv_text.cpp
@@ -16,12 +16,10 @@
 // Class gsv_text
 //
 //----------------------------------------------------------------------------
-#include <cstring>
-#include <cstdio>
 #include "agg_gsv_text.h"
 #include "agg_bounding_rect.h"
-
-
+#include <cstring>
+#include <cstdio>
 
 namespace agg
 {

diff --git a/agg-src/src/agg_line_aa_basics.cpp b/agg-src/src/agg_line_aa_basics.cpp
@@ -13,8 +13,8 @@
 //          http://www.antigrain.com
 //----------------------------------------------------------------------------
 
-#include <cmath>
 #include "agg_line_aa_basics.h"
+#include <cmath>
 
 namespace agg
 {

diff --git a/agg-src/src/agg_rounded_rect.cpp b/agg-src/src/agg_rounded_rect.cpp
@@ -17,9 +17,10 @@
 //
 //----------------------------------------------------------------------------
 
-#include <cmath>
-#include "agg_rounded_rect.h"
 
+#include "agg_rounded_rect.h"
+#include "agg_basics.h"
+#include <cmath>
 
 namespace agg
 {

diff --git a/agg-src/src/agg_trans_affine.cpp b/agg-src/src/agg_trans_affine.cpp
@@ -17,7 +17,7 @@
 //
 //----------------------------------------------------------------------------
 #include "agg_trans_affine.h"
-
+#include "agg_basics.h"
 
 
 namespace agg

diff --git a/agg-src/src/agg_trans_double_path.cpp b/agg-src/src/agg_trans_double_path.cpp
@@ -13,7 +13,6 @@
 //          http://www.antigrain.com
 //----------------------------------------------------------------------------
 
-#include "agg_math.h"
 #include "agg_trans_double_path.h"
 
 namespace agg

diff --git a/agg-src/src/agg_trans_single_path.cpp b/agg-src/src/agg_trans_single_path.cpp
@@ -13,7 +13,6 @@
 //          http://www.antigrain.com
 //----------------------------------------------------------------------------
 
-#include "agg_math.h"
 #include "agg_vertex_sequence.h"
 #include "agg_trans_single_path.h"
 

diff --git a/agg-src/src/agg_trans_warp_magnifier.cpp b/agg-src/src/agg_trans_warp_magnifier.cpp
@@ -13,8 +13,8 @@
 //          http://www.antigrain.com
 //----------------------------------------------------------------------------
 
-#include <cmath>
 #include "agg_trans_warp_magnifier.h"
+#include <cmath>
 
 namespace agg
 {

diff --git a/agg-src/src/agg_vcgen_dash.cpp b/agg-src/src/agg_vcgen_dash.cpp
@@ -17,9 +17,9 @@
 //
 //----------------------------------------------------------------------------
 
-#include <cmath>
 #include "agg_vcgen_dash.h"
 #include "agg_shorten_path.h"
+#include <cmath>
 
 namespace agg
 {

diff --git a/agg-src/src/agg_vpgen_segmentator.cpp b/agg-src/src/agg_vpgen_segmentator.cpp
@@ -13,8 +13,8 @@
 //          http://www.antigrain.com
 //----------------------------------------------------------------------------
 
-#include <cmath>
 #include "agg_vpgen_segmentator.h"
+#include <cmath>
 
 namespace agg
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,8 +21,6 @@ @@
     #define AGG_ELLIPSE_BRESENHAM_INCLUDED
-    #include "agg_basics.h"
     namespace agg
     {
@@ Expand Down @@