Move macro-guard definition to meson.build

ayshih · ayshih · commit e2f1a5fb1e6f · 2026-01-08T10:46:53.000-05:00
diff --git a/extern/agg24-svn/include/agg_image_filters.h b/extern/agg24-svn/include/agg_image_filters.h
@@ -20,8 +20,6 @@
 #ifndef AGG_IMAGE_FILTERS_INCLUDED
 #define AGG_IMAGE_FILTERS_INCLUDED
 
-#define MPL_FIX_IMAGE_FILTER_LUT_BUGS
-
 #include "agg_array.h"
 #include "agg_math.h"
 
@@ -55,7 +53,7 @@ namespace agg
             double r = filter.radius();
             realloc_lut(r);
             unsigned i;
-#ifndef MPL_FIX_IMAGE_FILTER_LUT_BUGS
+#ifndef MPL_FIX_AGG_IMAGE_FILTER_LUT_BUGS
             unsigned pivot = diameter() << (image_subpixel_shift - 1);
             for(i = 0; i < pivot; i++)
             {
diff --git a/extern/agg24-svn/src/agg_image_filters.cpp b/extern/agg24-svn/src/agg_image_filters.cpp
@@ -88,7 +88,7 @@ namespace agg
             }
         }
 
-#ifndef MPL_FIX_IMAGE_FILTER_LUT_BUGS
+#ifndef MPL_FIX_AGG_IMAGE_FILTER_LUT_BUGS
         unsigned pivot = m_diameter << (image_subpixel_shift - 1);
 
         for(i = 0; i < pivot; i++)
diff --git a/meson.build b/meson.build
@@ -31,6 +31,9 @@ project(
   ],
 )
 
+# Enable bug fixes in Agg
+add_project_arguments('-DMPL_FIX_AGG_IMAGE_FILTER_LUT_BUGS', language : 'cpp')
+
 cc = meson.get_compiler('c')
 cpp = meson.get_compiler('cpp')
 

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ namespace agg`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`
`91`		`-#ifndef MPL_FIX_IMAGE_FILTER_LUT_BUGS`
	`91`	`+#ifndef MPL_FIX_AGG_IMAGE_FILTER_LUT_BUGS`
`92`	`92`	`unsigned pivot = m_diameter << (image_subpixel_shift - 1);`
`93`	`93`
`94`	`94`	`for(i = 0; i < pivot; i++)`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,9 @@ project(`
`31`	`31`	`],`
`32`	`32`	`)`
`33`	`33`
	`34`	`+# Enable bug fixes in Agg`
	`35`	`+add_project_arguments('-DMPL_FIX_AGG_IMAGE_FILTER_LUT_BUGS', language : 'cpp')`
	`36`	`+`
`34`	`37`	`cc = meson.get_compiler('c')`
`35`	`38`	`cpp = meson.get_compiler('cpp')`
`36`	`39`