From 0e0e71c75eaf0c9af5b8f64a8045abc0c3ca08d5 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 10 Jan 2025 02:06:26 -0500 Subject: [PATCH 1/2] Remove unused pixfmt_pre_type --- src/_image_resample.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/_image_resample.h b/src/_image_resample.h index 19dc05b32e2a..7e6c32c6bf64 100644 --- a/src/_image_resample.h +++ b/src/_image_resample.h @@ -519,17 +519,6 @@ struct type_mapping agg::pixfmt_alpha_blend_gray, agg::pixfmt_alpha_blend_rgba >; - using pixfmt_pre_type = std::conditional_t< - is_grayscale_v, - pixfmt_type, - agg::pixfmt_alpha_blend_rgba< - std::conditional_t< - std::is_same_v, - fixed_blender_rgba_pre, - agg::blender_rgba_pre - >, - agg::rendering_buffer> - >; template using span_gen_affine_type = std::conditional_t< is_grayscale_v, agg::span_image_resample_gray_affine, From 2aca299ff929b7562b0faf10cef710ec87e19f8c Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 10 Jan 2025 04:33:33 -0500 Subject: [PATCH 2/2] Remove unused fixed_blender_rgba_pre --- src/agg_workaround.h | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/src/agg_workaround.h b/src/agg_workaround.h index 476219519280..a167be97e171 100644 --- a/src/agg_workaround.h +++ b/src/agg_workaround.h @@ -8,46 +8,6 @@ blending of RGBA32 pixels does not preserve enough precision */ -template -struct fixed_blender_rgba_pre : agg::conv_rgba_pre -{ - typedef ColorT color_type; - typedef Order order_type; - typedef typename color_type::value_type value_type; - typedef typename color_type::calc_type calc_type; - typedef typename color_type::long_type long_type; - enum base_scale_e - { - base_shift = color_type::base_shift, - base_mask = color_type::base_mask - }; - - //-------------------------------------------------------------------- - static AGG_INLINE void blend_pix(value_type* p, - value_type cr, value_type cg, value_type cb, - value_type alpha, agg::cover_type cover) - { - blend_pix(p, - color_type::mult_cover(cr, cover), - color_type::mult_cover(cg, cover), - color_type::mult_cover(cb, cover), - color_type::mult_cover(alpha, cover)); - } - - //-------------------------------------------------------------------- - static AGG_INLINE void blend_pix(value_type* p, - value_type cr, value_type cg, value_type cb, - value_type alpha) - { - alpha = base_mask - alpha; - p[Order::R] = (value_type)(((p[Order::R] * alpha) >> base_shift) + cr); - p[Order::G] = (value_type)(((p[Order::G] * alpha) >> base_shift) + cg); - p[Order::B] = (value_type)(((p[Order::B] * alpha) >> base_shift) + cb); - p[Order::A] = (value_type)(base_mask - ((alpha * (base_mask - p[Order::A])) >> base_shift)); - } -}; - - template struct fixed_blender_rgba_plain : agg::conv_rgba_plain {