fix bug causing a warning message in Acrobat (#1145)

* fix bug causing a warning message in Acrobat (#960) (#1144) * Correction in two PDFs
py-pdf · Apr 12, 2024 · b9126f8 · b9126f8
1 parent 356b6dd
commit b9126f8
Show file tree

Hide file tree

Showing 102 changed files with 2 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@ This can also be enabled programmatically with `warnings.simplefilter('default',
 
 ## [2.7.9] - Not released yet
 ### Added
+* fix bug causing a warning message in Acrobat
 * support for overriding paragraph direction on bidirectional text
 * new optional `li_prefix_color` parameter for [`FPDF.write_html()`](https://py-pdf.github.io/fpdf2/fpdf/fpdf.html#fpdf.fpdf.FPDF.write_html)
 * support for `start` & `type` attributes of `<ol>` tags, and `type` attribute of `<ul>` tags, when using [`FPDF.write_html()`](https://py-pdf.github.io/fpdf2/fpdf/fpdf.html#fpdf.fpdf.FPDF.write_html)

diff --git a/fpdf/drawing.py b/fpdf/drawing.py
@@ -1445,9 +1445,7 @@ def serialize(self):
                 result[key] = value
 
         # There is additional logic in GraphicsContext to ensure that this will work
-        if (self.stroke_dash_pattern is not self.INHERIT) and (
-            self.stroke_dash_pattern is not None
-        ):
+        if self.stroke_dash_pattern and self.stroke_dash_pattern is not self.INHERIT:
             result[PDFStyleKeys.STROKE_DASH_PATTERN.value] = [
                 self.stroke_dash_pattern,
                 self.stroke_dash_phase,

diff --git a/test/drawing/generated_pdf/test_blend_modes_blend_mode_color_.pdf b/test/drawing/generated_pdf/test_blend_modes_blend_mode_color_.pdf
diff --git a/test/drawing/generated_pdf/test_blend_modes_blend_mode_color_burn_.pdf b/test/drawing/generated_pdf/test_blend_modes_blend_mode_color_burn_.pdf
diff --git a/test/drawing/generated_pdf/test_blend_modes_blend_mode_color_dodge_.pdf b/test/drawing/generated_pdf/test_blend_modes_blend_mode_color_dodge_.pdf
diff --git a/test/drawing/generated_pdf/test_blend_modes_blend_mode_darken_.pdf b/test/drawing/generated_pdf/test_blend_modes_blend_mode_darken_.pdf
diff --git a/test/drawing/generated_pdf/test_blend_modes_blend_mode_difference_.pdf b/test/drawing/generated_pdf/test_blend_modes_blend_mode_difference_.pdf
diff --git a/test/drawing/generated_pdf/test_blend_modes_blend_mode_exclusion_.pdf b/test/drawing/generated_pdf/test_blend_modes_blend_mode_exclusion_.pdf
diff --git a/test/drawing/generated_pdf/test_blend_modes_blend_mode_hard_light_.pdf b/test/drawing/generated_pdf/test_blend_modes_blend_mode_hard_light_.pdf
diff --git a/test/drawing/generated_pdf/test_blend_modes_blend_mode_hue_.pdf b/test/drawing/generated_pdf/test_blend_modes_blend_mode_hue_.pdf
diff --git a/test/drawing/generated_pdf/test_blend_modes_blend_mode_lighten_.pdf b/test/drawing/generated_pdf/test_blend_modes_blend_mode_lighten_.pdf
diff --git a/test/drawing/generated_pdf/test_blend_modes_blend_mode_luminosity_.pdf b/test/drawing/generated_pdf/test_blend_modes_blend_mode_luminosity_.pdf
diff --git a/test/drawing/generated_pdf/test_blend_modes_blend_mode_multiply_.pdf b/test/drawing/generated_pdf/test_blend_modes_blend_mode_multiply_.pdf
diff --git a/test/drawing/generated_pdf/test_blend_modes_blend_mode_normal_.pdf b/test/drawing/generated_pdf/test_blend_modes_blend_mode_normal_.pdf
diff --git a/test/drawing/generated_pdf/test_blend_modes_blend_mode_overlay_.pdf b/test/drawing/generated_pdf/test_blend_modes_blend_mode_overlay_.pdf
diff --git a/test/drawing/generated_pdf/test_blend_modes_blend_mode_saturation_.pdf b/test/drawing/generated_pdf/test_blend_modes_blend_mode_saturation_.pdf
diff --git a/test/drawing/generated_pdf/test_blend_modes_blend_mode_screen_.pdf b/test/drawing/generated_pdf/test_blend_modes_blend_mode_screen_.pdf
diff --git a/test/drawing/generated_pdf/test_blend_modes_blend_mode_soft_light_.pdf b/test/drawing/generated_pdf/test_blend_modes_blend_mode_soft_light_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_0_stroke_width_.pdf b/test/drawing/generated_pdf/test_individual_attribute_0_stroke_width_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_2_stroke_width_.pdf b/test/drawing/generated_pdf/test_individual_attribute_2_stroke_width_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_50-50_stroke_dash_pattern_.pdf b/test/drawing/generated_pdf/test_individual_attribute_50-50_stroke_dash_pattern_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_RGBA_4_fill_color_.pdf b/test/drawing/generated_pdf/test_individual_attribute_RGBA_4_fill_color_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_RGBA_4_stroke_color_.pdf b/test/drawing/generated_pdf/test_individual_attribute_RGBA_4_stroke_color_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_RGBA_8_fill_color_.pdf b/test/drawing/generated_pdf/test_individual_attribute_RGBA_8_fill_color_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_RGBA_8_stroke_color_.pdf b/test/drawing/generated_pdf/test_individual_attribute_RGBA_8_stroke_color_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_RGB_3_fill_color_.pdf b/test/drawing/generated_pdf/test_individual_attribute_RGB_3_fill_color_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_RGB_3_stroke_color_.pdf b/test/drawing/generated_pdf/test_individual_attribute_RGB_3_stroke_color_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_RGB_6_fill_color_.pdf b/test/drawing/generated_pdf/test_individual_attribute_RGB_6_fill_color_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_RGB_6_stroke_color_.pdf b/test/drawing/generated_pdf/test_individual_attribute_RGB_6_stroke_color_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_auto_close_.pdf b/test/drawing/generated_pdf/test_individual_attribute_auto_close_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_bevel_stroke_join_.pdf b/test/drawing/generated_pdf/test_individual_attribute_bevel_stroke_join_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_butt_stroke_cap_.pdf b/test/drawing/generated_pdf/test_individual_attribute_butt_stroke_cap_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_complex_stroke_dash_pattern_.pdf b/test/drawing/generated_pdf/test_individual_attribute_complex_stroke_dash_pattern_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_half_fill_opacity_.pdf b/test/drawing/generated_pdf/test_individual_attribute_half_fill_opacity_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_half_stroke_opacity_.pdf b/test/drawing/generated_pdf/test_individual_attribute_half_stroke_opacity_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_intersection_rule_.pdf b/test/drawing/generated_pdf/test_individual_attribute_intersection_rule_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_miter_stroke_join_.pdf b/test/drawing/generated_pdf/test_individual_attribute_miter_stroke_join_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_no_fill_color_.pdf b/test/drawing/generated_pdf/test_individual_attribute_no_fill_color_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_no_fill_opacity_.pdf b/test/drawing/generated_pdf/test_individual_attribute_no_fill_opacity_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_no_stroke_color_.pdf b/test/drawing/generated_pdf/test_individual_attribute_no_stroke_color_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_no_stroke_opacity_.pdf b/test/drawing/generated_pdf/test_individual_attribute_no_stroke_opacity_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_no_stroke_width_.pdf b/test/drawing/generated_pdf/test_individual_attribute_no_stroke_width_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_numeric_stroke_dash_pattern_.pdf b/test/drawing/generated_pdf/test_individual_attribute_numeric_stroke_dash_pattern_.pdf
diff --git a/test/drawing/generated_pdf/test_individual_attribute_square_stroke_cap_.pdf b/test/drawing/generated_pdf/test_individual_attribute_square_stroke_cap_.pdf
diff --git a/test/drawing/generated_pdf/test_stroke_dash_phase.pdf b/test/drawing/generated_pdf/test_stroke_dash_phase.pdf
diff --git a/test/drawing/generated_pdf/test_stroke_miter_limit.pdf b/test/drawing/generated_pdf/test_stroke_miter_limit.pdf
diff --git a/test/image/image_x_align_center.pdf b/test/image/image_x_align_center.pdf
diff --git a/test/image/image_x_align_right.pdf b/test/image/image_x_align_right.pdf
diff --git a/test/image/svg_image.pdf b/test/image/svg_image.pdf
diff --git a/test/image/svg_image_alt_text_title.pdf b/test/image/svg_image_alt_text_title.pdf
diff --git a/test/image/svg_image_alt_text_two_pages.pdf b/test/image/svg_image_alt_text_two_pages.pdf
diff --git a/test/image/svg_image_fit_rect.pdf b/test/image/svg_image_fit_rect.pdf
diff --git a/test/image/svg_image_fixed_dimensions.pdf b/test/image/svg_image_fixed_dimensions.pdf
diff --git a/test/image/svg_image_from_bytesio.pdf b/test/image/svg_image_from_bytesio.pdf
diff --git a/test/image/svg_image_no_dimensions.pdf b/test/image/svg_image_no_dimensions.pdf
diff --git a/test/image/svg_image_no_viewbox.pdf b/test/image/svg_image_no_viewbox.pdf
diff --git a/test/image/svg_image_style_inherited_from_fpdf.pdf b/test/image/svg_image_style_inherited_from_fpdf.pdf
diff --git a/test/image/svg_image_with_custom_size.pdf b/test/image/svg_image_with_custom_size.pdf
diff --git a/test/image/svg_image_with_custom_size_and_no_viewbox.pdf b/test/image/svg_image_with_custom_size_and_no_viewbox.pdf
diff --git a/test/image/svg_image_with_custom_width.pdf b/test/image/svg_image_with_custom_width.pdf
diff --git a/test/image/svg_image_with_custom_width_and_no_dimensions.pdf b/test/image/svg_image_with_custom_width_and_no_dimensions.pdf
diff --git a/test/image/svg_image_with_custom_width_and_no_viewbox.pdf b/test/image/svg_image_with_custom_width_and_no_viewbox.pdf
diff --git a/test/image/svg_image_with_no_dimensions_and_custom_width.pdf b/test/image/svg_image_with_no_dimensions_and_custom_width.pdf
diff --git a/test/svg/generated_pdf/Ghostscript_colorcircle.pdf b/test/svg/generated_pdf/Ghostscript_colorcircle.pdf
diff --git a/test/svg/generated_pdf/Ghostscript_escher.pdf b/test/svg/generated_pdf/Ghostscript_escher.pdf
diff --git a/test/svg/generated_pdf/SVG_logo.pdf b/test/svg/generated_pdf/SVG_logo.pdf
diff --git a/test/svg/generated_pdf/SVG_logo_notransparency.pdf b/test/svg/generated_pdf/SVG_logo_notransparency.pdf
diff --git a/test/svg/generated_pdf/arcs01-offset.pdf b/test/svg/generated_pdf/arcs01-offset.pdf
diff --git a/test/svg/generated_pdf/arcs01.pdf b/test/svg/generated_pdf/arcs01.pdf
diff --git a/test/svg/generated_pdf/arcs02.pdf b/test/svg/generated_pdf/arcs02.pdf
diff --git a/test/svg/generated_pdf/circle01.pdf b/test/svg/generated_pdf/circle01.pdf
diff --git a/test/svg/generated_pdf/clip_path.pdf b/test/svg/generated_pdf/clip_path.pdf
diff --git a/test/svg/generated_pdf/cubic01.pdf b/test/svg/generated_pdf/cubic01.pdf
diff --git a/test/svg/generated_pdf/cubic02.pdf b/test/svg/generated_pdf/cubic02.pdf
diff --git a/test/svg/generated_pdf/ellipse01.pdf b/test/svg/generated_pdf/ellipse01.pdf
diff --git a/test/svg/generated_pdf/embedded-raster-images.pdf b/test/svg/generated_pdf/embedded-raster-images.pdf
diff --git a/test/svg/generated_pdf/issue-1076.pdf b/test/svg/generated_pdf/issue-1076.pdf
diff --git a/test/svg/generated_pdf/issue_358.pdf b/test/svg/generated_pdf/issue_358.pdf
diff --git a/test/svg/generated_pdf/issue_358b.pdf b/test/svg/generated_pdf/issue_358b.pdf
diff --git a/test/svg/generated_pdf/line01.pdf b/test/svg/generated_pdf/line01.pdf
diff --git a/test/svg/generated_pdf/polygon01.pdf b/test/svg/generated_pdf/polygon01.pdf
diff --git a/test/svg/generated_pdf/polyline01.pdf b/test/svg/generated_pdf/polyline01.pdf
diff --git a/test/svg/generated_pdf/quad01.pdf b/test/svg/generated_pdf/quad01.pdf
diff --git a/test/svg/generated_pdf/rect01.pdf b/test/svg/generated_pdf/rect01.pdf
diff --git a/test/svg/generated_pdf/rect02.pdf b/test/svg/generated_pdf/rect02.pdf
diff --git a/test/svg/generated_pdf/rgb-color-issue-480.pdf b/test/svg/generated_pdf/rgb-color-issue-480.pdf
diff --git a/test/svg/generated_pdf/search.pdf b/test/svg/generated_pdf/search.pdf
diff --git a/test/svg/generated_pdf/shapes_def_test.pdf b/test/svg/generated_pdf/shapes_def_test.pdf
diff --git a/test/svg/generated_pdf/simple_rect.pdf b/test/svg/generated_pdf/simple_rect.pdf
diff --git a/test/svg/generated_pdf/svg_rendering_image_over_page_break.pdf b/test/svg/generated_pdf/svg_rendering_image_over_page_break.pdf
diff --git a/test/svg/generated_pdf/transforms/matrix.pdf b/test/svg/generated_pdf/transforms/matrix.pdf
diff --git a/test/svg/generated_pdf/transforms/multi.pdf b/test/svg/generated_pdf/transforms/multi.pdf
diff --git a/test/svg/generated_pdf/transforms/rotate.pdf b/test/svg/generated_pdf/transforms/rotate.pdf
diff --git a/test/svg/generated_pdf/transforms/scale.pdf b/test/svg/generated_pdf/transforms/scale.pdf
diff --git a/test/svg/generated_pdf/transforms/skew.pdf b/test/svg/generated_pdf/transforms/skew.pdf
diff --git a/test/svg/generated_pdf/transforms/translate.pdf b/test/svg/generated_pdf/transforms/translate.pdf
diff --git a/test/svg/generated_pdf/triangle01.pdf b/test/svg/generated_pdf/triangle01.pdf
diff --git a/test/svg/generated_pdf/use-image-def.pdf b/test/svg/generated_pdf/use-image-def.pdf
diff --git a/test/svg/generated_pdf/use-xlink-href.pdf b/test/svg/generated_pdf/use-xlink-href.pdf
diff --git a/test/svg/generated_pdf/viewbox.pdf b/test/svg/generated_pdf/viewbox.pdf
diff --git a/test/text_region/tcols_3cols.pdf b/test/text_region/tcols_3cols.pdf
diff --git a/test/text_region/tcols_images.pdf b/test/text_region/tcols_images.pdf