Jun 18, 2025 · Jun 18, 2025 · Jun 18, 2025 · Jun 19, 2025 · Jun 19, 2025 · Jun 18, 2025
diff --git a/extern/agg24-svn/include/agg_image_filters.h b/extern/agg24-svn/include/agg_image_filters.h
 #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"

            double r = filter.radius();
            realloc_lut(r);
            unsigned i;
 #ifndef MPL_FIX_IMAGE_FILTER_LUT_BUGS
            unsigned pivot = diameter() << (image_subpixel_shift - 1);
            for(i = 0; i < pivot; i++)
            {
            }
            unsigned end = (diameter() << image_subpixel_shift) - 1;
            m_weight_array[0] = m_weight_array[end];
 #else
            unsigned pivot = (diameter() << (image_subpixel_shift - 1)) - 1;
            for(i = 0; i <= pivot + 1; i++)
            {
                double x = double(i) / double(image_subpixel_scale);
                double y = filter.calc_weight(x);
                int16 value = iround(y * image_filter_scale);
                m_weight_array[pivot + i] = value;
                if(i <= pivot) m_weight_array[pivot - i] = value;
            }
 #endif
            if(normalization)
            {
                normalize();
diff --git a/extern/agg24-svn/src/agg_image_filters.cpp b/extern/agg24-svn/src/agg_image_filters.cpp
            }
        }

 #ifndef MPL_FIX_IMAGE_FILTER_LUT_BUGS
        unsigned pivot = m_diameter << (image_subpixel_shift - 1);

        for(i = 0; i < pivot; i++)
        }
        unsigned end = (diameter() << image_subpixel_shift) - 1;
        m_weight_array[0] = m_weight_array[end];
 #endif
    }


diff --git a/lib/matplotlib/tests/baseline_images/test_axes/fill_units.png b/lib/matplotlib/tests/baseline_images/test_axes/fill_units.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_002.png b/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_002.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_003.png b/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_003.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_004.png b/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_004.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_005.png b/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_005.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/pcolor_datetime_axis.png b/lib/matplotlib/tests/baseline_images/test_axes/pcolor_datetime_axis.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/pcolormesh_datetime_axis.png b/lib/matplotlib/tests/baseline_images/test_axes/pcolormesh_datetime_axis.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/pie_rotatelabels_true.png b/lib/matplotlib/tests/baseline_images/test_axes/pie_rotatelabels_true.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/test_stairs_datetime.png b/lib/matplotlib/tests/baseline_images/test_axes/test_stairs_datetime.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/use_colorizer_keyword.png b/lib/matplotlib/tests/baseline_images/test_axes/use_colorizer_keyword.png
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_keeping_xlabel.png b/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_keeping_xlabel.png
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/double_cbar.png b/lib/matplotlib/tests/baseline_images/test_colorbar/double_cbar.png
diff --git a/lib/matplotlib/tests/baseline_images/test_colors/light_source_shading_topo.png b/lib/matplotlib/tests/baseline_images/test_colors/light_source_shading_topo.png
diff --git a/lib/matplotlib/tests/baseline_images/test_contour/contour_datetime_axis.png b/lib/matplotlib/tests/baseline_images/test_contour/contour_datetime_axis.png
diff --git a/...matplotlib/tests/baseline_images/test_contour/contour_disconnected_segments.png b/...matplotlib/tests/baseline_images/test_contour/contour_disconnected_segments.png
diff --git a/...matplotlib/tests/baseline_images/test_dates/DateFormatter_fractionalSeconds.png b/...matplotlib/tests/baseline_images/test_dates/DateFormatter_fractionalSeconds.png
diff --git a/lib/matplotlib/tests/baseline_images/test_dates/RRuleLocator_bounds.png b/lib/matplotlib/tests/baseline_images/test_dates/RRuleLocator_bounds.png
diff --git a/lib/matplotlib/tests/baseline_images/test_dates/date_axvline.png b/lib/matplotlib/tests/baseline_images/test_dates/date_axvline.png
diff --git a/lib/matplotlib/tests/baseline_images/test_dates/date_axvspan.png b/lib/matplotlib/tests/baseline_images/test_dates/date_axvspan.png
diff --git a/lib/matplotlib/tests/baseline_images/test_figure/figure_align_labels.png b/lib/matplotlib/tests/baseline_images/test_figure/figure_align_labels.png
diff --git a/...atplotlib/tests/baseline_images/test_figure/figure_align_titles_constrained.png b/...atplotlib/tests/baseline_images/test_figure/figure_align_titles_constrained.png
diff --git a/lib/matplotlib/tests/baseline_images/test_figure/figure_align_titles_tight.png b/lib/matplotlib/tests/baseline_images/test_figure/figure_align_titles_tight.png
diff --git a/lib/matplotlib/tests/baseline_images/test_figure/figure_suptitle.png b/lib/matplotlib/tests/baseline_images/test_figure/figure_suptitle.png
diff --git a/lib/matplotlib/tests/baseline_images/test_figure/test_subfigure_double.png b/lib/matplotlib/tests/baseline_images/test_figure/test_subfigure_double.png
diff --git a/lib/matplotlib/tests/baseline_images/test_image/downsampling.png b/lib/matplotlib/tests/baseline_images/test_image/downsampling.png
diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_composite_alpha.pdf b/lib/matplotlib/tests/baseline_images/test_image/image_composite_alpha.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_composite_alpha.png b/lib/matplotlib/tests/baseline_images/test_image/image_composite_alpha.png
diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_composite_alpha.svg b/lib/matplotlib/tests/baseline_images/test_image/image_composite_alpha.svg
diff --git a/lib/matplotlib/tests/baseline_images/test_image/imshow_masked_interpolation.pdf b/lib/matplotlib/tests/baseline_images/test_image/imshow_masked_interpolation.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_image/imshow_masked_interpolation.png b/lib/matplotlib/tests/baseline_images/test_image/imshow_masked_interpolation.png
diff --git a/lib/matplotlib/tests/baseline_images/test_image/imshow_masked_interpolation.svg b/lib/matplotlib/tests/baseline_images/test_image/imshow_masked_interpolation.svg
diff --git a/lib/matplotlib/tests/baseline_images/test_image/interp_alpha.png b/lib/matplotlib/tests/baseline_images/test_image/interp_alpha.png
diff --git a/lib/matplotlib/tests/baseline_images/test_image/log_scale_image.pdf b/lib/matplotlib/tests/baseline_images/test_image/log_scale_image.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_image/log_scale_image.png b/lib/matplotlib/tests/baseline_images/test_image/log_scale_image.png
diff --git a/lib/matplotlib/tests/baseline_images/test_image/log_scale_image.svg b/lib/matplotlib/tests/baseline_images/test_image/log_scale_image.svg
diff --git a/lib/matplotlib/tests/baseline_images/test_image/rgba_antialias.png b/lib/matplotlib/tests/baseline_images/test_image/rgba_antialias.png
diff --git a/lib/matplotlib/tests/baseline_images/test_image/upsampling.png b/lib/matplotlib/tests/baseline_images/test_image/upsampling.png
diff --git a/...lib/tests/baseline_images/test_multivariate_colormaps/bivariate_cmap_shapes.png b/...lib/tests/baseline_images/test_multivariate_colormaps/bivariate_cmap_shapes.png
diff --git a/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect1.pdf b/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect1.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect1.png b/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect1.png
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,6 +20,8 @@
		#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"

Expand DownExpand Up		@@ -53,6 +55,7 @@ namespace agg
		double r = filter.radius();
		realloc_lut(r);
		unsigned i;
		#ifndef MPL_FIX_IMAGE_FILTER_LUT_BUGS
		unsigned pivot = diameter() << (image_subpixel_shift - 1);
		for(i = 0; i < pivot; i++)
		{
Expand All		@@ -63,6 +66,17 @@ namespace agg
		}
		unsigned end = (diameter() << image_subpixel_shift) - 1;
		m_weight_array[0] = m_weight_array[end];
Copy link ContributorAuthor ayshihJun 18, 2025• edited Loading Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. This line is one of the bugs.`0` and`end` are different distances from`pivot`, so the corresponding weights typically should not be the same. Copy link Contributor anntzerJun 18, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Please put the new version under a macro guard, as was done in#28122, so that we keep a track of what's the original Agg and what we changed on top of it. Copy link ContributorAuthor ayshihJun 18, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Makes sense, done Copy link ContributorAuthor ayshihJun 18, 2025• edited Loading Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. It turns out that I can't add a preprocessor definition in`_image_resample.h` a la#28122. There is buggy code in`agg_image_filters.cpp` that needs to be skipped, but since it is a CPP file rather than a H file, it gets compiled separately with no awareness of`_image_resample.h`. I have put the preprocessor definition (`MPL_FIX_IMAGE_FILTER_LUT_BUGS`) here at the top of`agg_image_filters.h`, which is lower level than would be nice, but at least still makes it clear what is custom code.
		#else
		unsigned pivot = (diameter() << (image_subpixel_shift - 1)) - 1;
		for(i = 0; i <= pivot + 1; i++)
		{
		double x = double(i) / double(image_subpixel_scale);
		double y = filter.calc_weight(x);
		int16 value = iround(y * image_filter_scale);
		m_weight_array[pivot + i] = value;
		if(i <= pivot) m_weight_array[pivot - i] = value;
		}
		#endif
		if(normalization)
		{
		normalize();
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -88,6 +88,7 @@ namespace agg
		}
		}

		#ifndef MPL_FIX_IMAGE_FILTER_LUT_BUGS
Copy link ContributorAuthor ayshihJun 18, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. The following code block is removed because it not only has the same bugs as the code in`agg_image_filters.h`, but also it shouldn't even exist because it modifies the weight array after it has been normalized, thus potentially destroying the normalization.
		unsigned pivot = m_diameter << (image_subpixel_shift - 1);

		for(i = 0; i < pivot; i++)
Expand All		@@ -96,6 +97,7 @@ namespace agg
		}
		unsigned end = (diameter() << image_subpixel_shift) - 1;
		m_weight_array[0] = m_weight_array[end];
		#endif
		}


Expand Down