Re: master 3de31e7: Fix compilation of image.c on MS-Windows

Re: master 3de31e7: Fix compilation of image.c on MS-Windows

[Lars Ingebrigtsen]

eliz@gnu.org (Eli Zaretskii) writes:

>     Fix compilation of image.c on MS-Windows
>
>     This is a followup to last change in image.c.
>     * src/image.c (rsvg_handle_get_intrinsic_dimensions): Define to
>     call fn_rsvg_handle_get_intrinsic_dimensions.
>     (svg_css_length_to_pixels): Compile only for librsvg >= 2.46.0, as
>     RsvgLength type was not defined before.

This leads to the following warnings on Debian bullseye, apparently:

image.c: In function ‘svg_css_length_to_pixels’:
image.c:9769:13: warning: this statement may fall through [-Wimplicit-fallthrough=]
 9769 |       value = dpi * value / 2.54;
      |       ~~~~~~^~~~~~~~~~~~~~~~~~~~
image.c:9770:5: note: here
 9770 |     case RSVG_UNIT_MM:
      |     ^~~~
image.c:9776:13: warning: this statement may fall through [-Wimplicit-fallthrough=]
 9776 |       value = dpi * value / 72;
      |       ~~~~~~^~~~~~~~~~~~~~~~~~
image.c:9777:5: note: here
 9777 |     case RSVG_UNIT_PC:
      |     ^~~~
image.c:9779:13: warning: this statement may fall through [-Wimplicit-fallthrough=]
 9779 |       value = dpi * value / 6;
      |       ~~~~~~^~~~~~~~~~~~~~~~~
image.c:9780:5: note: here
 9780 |     case RSVG_UNIT_IN:
      |     ^~~~


-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: master 3de31e7: Fix compilation of image.c on MS-Windows

[Eli Zaretskii]

> From: Lars Ingebrigtsen <larsi@gnus.org>
> Cc: Eli Zaretskii <eliz@gnu.org>
> Date: Mon, 09 Nov 2020 17:04:29 +0100
> 
> eliz@gnu.org (Eli Zaretskii) writes:
> 
> >     Fix compilation of image.c on MS-Windows
> >
> >     This is a followup to last change in image.c.
> >     * src/image.c (rsvg_handle_get_intrinsic_dimensions): Define to
> >     call fn_rsvg_handle_get_intrinsic_dimensions.
> >     (svg_css_length_to_pixels): Compile only for librsvg >= 2.46.0, as
> >     RsvgLength type was not defined before.
> 
> This leads to the following warnings on Debian bullseye, apparently:
> 
> image.c: In function ‘svg_css_length_to_pixels’:
> image.c:9769:13: warning: this statement may fall through [-Wimplicit-fallthrough=]

Surely, not my change led to this: I only made that code be
conditionally compiled.

Alan, can you take a look, please?  Di d you mean for the control flow
to fall-though in these places?

Re: master 3de31e7: Fix compilation of image.c on MS-Windows

[Alan Third]

On Mon, Nov 09, 2020 at 06:20:05PM +0200, Eli Zaretskii wrote:
> > From: Lars Ingebrigtsen <larsi@gnus.org>
> > Cc: Eli Zaretskii <eliz@gnu.org>
> > Date: Mon, 09 Nov 2020 17:04:29 +0100
> > 
> > eliz@gnu.org (Eli Zaretskii) writes:
> > 
> > >     Fix compilation of image.c on MS-Windows
> > >
> > >     This is a followup to last change in image.c.
> > >     * src/image.c (rsvg_handle_get_intrinsic_dimensions): Define to
> > >     call fn_rsvg_handle_get_intrinsic_dimensions.
> > >     (svg_css_length_to_pixels): Compile only for librsvg >= 2.46.0, as
> > >     RsvgLength type was not defined before.
> > 
> > This leads to the following warnings on Debian bullseye, apparently:
> > 
> > image.c: In function ‘svg_css_length_to_pixels’:
> > image.c:9769:13: warning: this statement may fall through [-Wimplicit-fallthrough=]
> 
> Surely, not my change led to this: I only made that code be
> conditionally compiled.
> 
> Alan, can you take a look, please?  Di d you mean for the control flow
> to fall-though in these places?

My mistake. I've pushed a fix.

Thanks.

-- 
Alan Third

Re: master 3de31e7: Fix compilation of image.c on MS-Windows

[Andy Moreton]

On Mon 09 Nov 2020, Eli Zaretskii wrote:

>> From: Lars Ingebrigtsen <larsi@gnus.org>
>> Cc: Eli Zaretskii <eliz@gnu.org>
>> Date: Mon, 09 Nov 2020 17:04:29 +0100
>> 
>> eliz@gnu.org (Eli Zaretskii) writes:
>> 
>> >     Fix compilation of image.c on MS-Windows
>> >
>> >     This is a followup to last change in image.c.
>> >     * src/image.c (rsvg_handle_get_intrinsic_dimensions): Define to
>> >     call fn_rsvg_handle_get_intrinsic_dimensions.
>> >     (svg_css_length_to_pixels): Compile only for librsvg >= 2.46.0, as
>> >     RsvgLength type was not defined before.
>> 
>> This leads to the following warnings on Debian bullseye, apparently:
>> 
>> image.c: In function ‘svg_css_length_to_pixels’:
>> image.c:9769:13: warning: this statement may fall through [-Wimplicit-fallthrough=]
>
> Surely, not my change led to this: I only made that code be
> conditionally compiled.

True, but your change does not compile on Windows. In image.c:

#  if LIBRSVG_CHECK_VERSION (2, 46, 0)
DEF_DLL_FN (void, rsvg_handle_get_intrinsic_dimensions,
            RsvgHandle *, gboolean *, RsvgLength *, gboolean *,
            RsvgLength *, gboolean *, RsvgRectangle *));

The 3rd argument should start with a left paren.

    AndyM

Re: master 3de31e7: Fix compilation of image.c on MS-Windows

[Eli Zaretskii]

> From: Andy Moreton <andrewjmoreton@gmail.com>
> Date: Mon, 09 Nov 2020 23:44:22 +0000
> 
> #  if LIBRSVG_CHECK_VERSION (2, 46, 0)
> DEF_DLL_FN (void, rsvg_handle_get_intrinsic_dimensions,
>             RsvgHandle *, gboolean *, RsvgLength *, gboolean *,
>             RsvgLength *, gboolean *, RsvgRectangle *));
> 
> The 3rd argument should start with a left paren.

Right, fixed.  Thanks.