987625 - image/decoders/nsPNGDecoder.cpp:327:20: error: use of undeclared identifier 'MOZ_PNG_MAX_DIMENSION' (--with-system-png)

Status: RESOLVED FIXED

(Core :: Graphics: ImageLib, defect)

Description

[Jan Beich]

image/decoders/nsPNGDecoder.cpp:327:20: error:
      use of undeclared identifier 'MOZ_PNG_MAX_DIMENSION'
      if ((width > MOZ_PNG_MAX_DIMENSION) || (height > MOZ_PNG_MAX_DIMENSION)) {
                   ^
image/decoders/nsPNGDecoder.cpp:327:56: error:
      use of undeclared identifier 'MOZ_PNG_MAX_DIMENSION'
      if ((width > MOZ_PNG_MAX_DIMENSION) || (height > MOZ_PNG_MAX_DIMENSION)) {
                                                       ^
image/decoders/nsPNGDecoder.cpp:509:15: error:
      use of undeclared identifier 'MOZ_PNG_MAX_DIMENSION'
  if (width > MOZ_PNG_MAX_DIMENSION || height > MOZ_PNG_MAX_DIMENSION)
              ^
image/decoders/nsPNGDecoder.cpp:509:49: error:
      use of undeclared identifier 'MOZ_PNG_MAX_DIMENSION'
  if (width > MOZ_PNG_MAX_DIMENSION || height > MOZ_PNG_MAX_DIMENSION)
                                                ^
4 errors generated.
gmake[1]: *** [nsPNGDecoder.o] Error 1

Comment 1

[Ryan VanderMeulen [:RyanVM]]

Dammit, guess I should have removed it from mozpngconf.h instead.

Comment 2

[Glenn Randers-Pehrson]

(In reply to Ryan VanderMeulen [:RyanVM UTC-4] from comment #1)
> Dammit, guess I should have removed it from mozpngconf.h instead.

Correct, it should have been changed to 32767 in nsPNGDecoder.cpp and
removed from mozpngconf.h (or probably better, protected with #ifndef
in either or both places).

Comment 3

[Glenn Randers-Pehrson]

I think this happens only on builds using the system library instead of the in-tree library.

Comment 4

[Ryan VanderMeulen [:RyanVM]]

Correct. nsPNGDecoder.cpp includes png.h which includes mozpngconf.h.

Comment 5

[Glenn Randers-Pehrson]

Attachment: v00 conditionally define MOZ_PNG_MAX_DIMENSION

Comment 6

[Jan Beich]

Comment on attachment 8396359 [details] [diff] [review]
v00 conditionally define MOZ_PNG_MAX_DIMENSION

My build --with-system-png succeeded with the patch. I'm actually using 1.5.18 (with MOZPNG hack) as 1.6.x breaks too many FreeBSD ports.

Comment 7

[Glenn Randers-Pehrson]

Based on the feedback and my own test with the in-tree libpng, I would suspect that this does not need a try-server test.
Let's do one anyhow.  I have not been able to test with the system library because of some unrelated problem with freetype on my home machine.

Comment 8

[Ryan VanderMeulen [:RyanVM]]

Sorry for the wait.
https://tbpl.mozilla.org/?tree=Try&rev=21fee4746826

Comment 9

[Glenn Randers-Pehrson]

Comment on attachment 8396359 [details] [diff] [review]
v00 conditionally define MOZ_PNG_MAX_DIMENSION

Try server was 100% green.  r?

Comment 10

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/2af9c4e02952

Comment 11

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/2af9c4e02952

Comment 12

[Firefox Commit Bot]

The following changeset is now in Firefox Nightly:

> 2af9c4e02952 Bug 987625 - Conditionally define MOZ_PNG_MAX_DIMENSION. r=jrmuizel

Nightly Build Information:

        ID: 20140402030201
 Changeset: 4941a2ac0786109b08856738019b016a6c5a66a6
   Version: 31.0a1
      TBPL: https://tbpl.mozilla.org/?rev=4941a2ac0786
       URL: https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2014/04/2014-04-02-03-02-01-mozilla-central

Download Links:

>         Linux x86: https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2014/04/2014-04-02-03-02-01-mozilla-central/firefox-31.0a1.en-US.linux-i686.tar.bz2
>      Linux x86_64: https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2014/04/2014-04-02-03-02-01-mozilla-central/firefox-31.0a1.en-US.linux-x86_64.tar.bz2
> Linux x86_64 ASAN: https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2014/04/2014-04-02-03-02-01-mozilla-central/firefox-31.0a1.en-US.linux-x86_64-asan.tar.bz2
>               Mac: https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2014/04/2014-04-02-03-02-01-mozilla-central/firefox-31.0a1.en-US.mac.dmg
>             Win32: https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2014/04/2014-04-02-03-02-01-mozilla-central/firefox-31.0a1.en-US.win32.installer.exe
>             Win64: https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2014/04/2014-04-02-03-02-01-mozilla-central/firefox-31.0a1.en-US.win64-x86_64.installer.exe

Previous Nightly Build Information:

        ID: 20140401030203
 Changeset: 1417d180a1d8665b1a91b897d1cc4cc31e7980d4
   Version: 31.0a1
      TBPL: https://tbpl.mozilla.org/?rev=1417d180a1d8
       URL: https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2014/04/2014-04-01-03-02-03-mozilla-central