482120 - makefile for bundled libpng has a decoder file with the encoder files

Status: RESOLVED FIXED

(Core :: Graphics: ImageLib, defect)

Description

[Zeev Tarantov]

User-Agent:       Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2a1pre) Gecko/20090306 Minefield/3.2a1pre
Build Identifier: 

... which prevents the png decoder from building without the png encoder.

Reproducible: Always

Steps to Reproduce:
1. try to build with --enable-image-encoders not containing png
2. observe build failure
3. profit!
Actual Results:  
../decoders/png/libimgpng_s.a(nsPNGDecoder.o): In function `PNGGetColorProfile(png_struct_def*, png_info_struct
*, int, unsigned int*, unsigned int*)':
/home/wolf/mozilla/src/modules/libpr0n/decoders/png/nsPNGDecoder.cpp:444: undefined reference to `MOZ_PNG_set_gray_to_rgb'
/home/wolf/mozilla/src/modules/libpr0n/decoders/png/nsPNGDecoder.cpp:425: undefined reference to `MOZ_PNG_set_gray_to_rgb'
/home/wolf/mozilla/src/modules/libpr0n/decoders/png/nsPNGDecoder.cpp:481: undefined reference to `MOZ_PNG_set_gray_to_rgb'
../decoders/png/libimgpng_s.a(nsPNGDecoder.o): In function `info_callback(png_struct_def*, png_info_struct*)':
/home/wolf/mozilla/src/modules/libpr0n/decoders/png/nsPNGDecoder.cpp:532: undefined reference to `MOZ_PNG_set_expand'
/home/wolf/mozilla/src/modules/libpr0n/decoders/png/nsPNGDecoder.cpp:589: undefined reference to `MOZ_PNG_set_gray_to_rgb'
/home/wolf/mozilla/src/modules/libpr0n/decoders/png/nsPNGDecoder.cpp:392: undefined reference to `MOZ_PNG_set_gamma'
/home/wolf/mozilla/src/modules/libpr0n/decoders/png/nsPNGDecoder.cpp:553: undefined reference to `MOZ_PNG_set_expand'
/home/wolf/mozilla/src/modules/libpr0n/decoders/png/nsPNGDecoder.cpp:529: undefined reference to `MOZ_PNG_set_expand'
/home/wolf/mozilla/src/modules/libpr0n/decoders/png/nsPNGDecoder.cpp:557: undefined reference to `MOZ_PNG_set_strip_16'
/home/wolf/mozilla/src/modules/libpr0n/decoders/png/nsPNGDecoder.cpp:395: undefined reference to `MOZ_PNG_set_gamma'


Expected Results:  
build success.

diff -r b0df372b9192 modules/libimg/png/Makefile.in
--- a/modules/libimg/png/Makefile.in	Sat Mar 07 13:40:08 2009 -0800
+++ b/modules/libimg/png/Makefile.in	Sun Mar 08 14:12:27 2009 +0200
@@ -74,6 +74,7 @@
 		pngpread.c \
 		pngread.c \
 		pngrio.c \
+		pngrtran.c \
 		pngrutil.c \
 		$(NULL)
 
@@ -86,7 +87,6 @@
 		pngwio.c \
 		pngwrite.c \
 		pngwtran.c \
-		pngrtran.c \
 		pngwutil.c \
 		$(NULL)

Comment 1

[Zeev Tarantov]

Attachment: move source file from encoder to decoder

Comment 2

[Glenn Randers-Pehrson]

This bug was apparently introduced by check-in of a patch from bug #386585 in November 2007.  I've verified that it prevents building a read-only PNG codec as Zeev reported and that Zeev's patch fixes the problem.  As far as I can tell, the bug exists in all 1.9.x branches.

Comment 3

[Justin Wood (:Callek)]

(In reply to comment #1)
> Created an attachment (id=367476) [details]
> what the message says

Pushed as: http://hg.mozilla.org/mozilla-central/rev/ab685c3e46eb