581192 - build warnings: png_check_sig & png_set_dither redefined (in png.h & mozpngconf.h)

Status: RESOLVED FIXED

(Core :: Graphics: ImageLib, defect)

Description

[Daniel Holbert [:dholbert]]

For every file that includes png.h, we now spam 16 lines of build warnings like this:
{
> In file included from ../../../../mozilla/modules/libpr0n/build/../decoders/png/nsPNGDecoder.h:52,
>                  from ../../../../mozilla/modules/libpr0n/build/nsImageModule.cpp:74:
> ../../../dist/include/png.h:1563:1: warning: "png_check_sig" redefined
> In file included from ../../../dist/include/pngconf.h:25,
>                  from ../../../dist/include/png.h:401,
>                  from ../../../../mozilla/modules/libpr0n/build/../decoders/png/nsPNGDecoder.h:52,
>                  from ../../../../mozilla/modules/libpr0n/build/nsImageModule.cpp:74:
> ../../../dist/include/mozpngconf.h:167:1: warning: this is the location of the previous definition
> In file included from ../../../../mozilla/modules/libpr0n/build/../decoders/png/nsPNGDecoder.h:52,
>                  from ../../../../mozilla/modules/libpr0n/build/nsImageModule.cpp:74:
> ../../../dist/include/png.h:1791:1: warning: "png_set_dither" redefined
> In file included from ../../../dist/include/pngconf.h:25,
>                  from ../../../dist/include/png.h:401,
>                  from ../../../../mozilla/modules/libpr0n/build/../decoders/png/nsPNGDecoder.h:52,
>                  from ../../../../mozilla/modules/libpr0n/build/nsImageModule.cpp:74:
> ../../../dist/include/mozpngconf.h:364:1: warning: this is the location of the previous definition
}

Comment 1

[Glenn Randers-Pehrson]

Attachment: v00: sync mozpngconf.h with libpng-1.4.3

png_set_dither was renamed png_set_quantize, and png_check_sig became a macro.  This patch accounts for those changes.

Comment 2

[Daniel Holbert [:dholbert]]

Comment on attachment 459665 [details] [diff] [review]
v00: sync mozpngconf.h with libpng-1.4.3

looks good to me

Comment 3

[Joe Drew (not getting mail)]

We can't release without this; it'll break stuff anywhere we link both a system and an embedded libpng into the same binary.

Comment 4

[Daniel Holbert [:dholbert]]

Landed: http://hg.mozilla.org/mozilla-central/rev/9e8cdfcc09d2