Commit 6232847c authored by pavlov%pavlov.net's avatar pavlov%pavlov.net
Browse files

adding support for image encoding. bug 245684. patches from Brett Wilson... 

adding support for image encoding.  bug 245684.  patches from Brett Wilson <brettw@gmail.com>.  r=me, sr=vlad
parent a475440a

allmakefiles.sh

+2 −0
Original line number Diff line number Diff line
@@ -1174,6 +1174,8 @@ embedding/components/profilesharingsetup/src/Makefile 
        modules/libpr0n/decoders/icon/win/Makefile

        modules/libpr0n/decoders/icon/gtk/Makefile

        modules/libpr0n/decoders/xbm/Makefile

        modules/libpr0n/encoders/Makefile

        modules/libpr0n/encoders/png/Makefile

"



    MAKEFILES_accessible="

config/autoconf.mk.in

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ MOZ_DEBUG_LDFLAGS=@MOZ_DEBUG_LDFLAGS@ 
MOZ_DBGRINFO_MODULES	= @MOZ_DBGRINFO_MODULES@

MOZ_EXTENSIONS  = @MOZ_EXTENSIONS@

MOZ_IMG_DECODERS= @MOZ_IMG_DECODERS@

MOZ_IMG_ENCODERS= @MOZ_IMG_ENCODERS@

MOZ_JSDEBUGGER  = @MOZ_JSDEBUGGER@

MOZ_PERF_METRICS = @MOZ_PERF_METRICS@

MOZ_LEAKY	= @MOZ_LEAKY@

configure.in

+30 −0
Original line number Diff line number Diff line
@@ -3955,6 +3955,7 @@ MOZ_DBGRINFO_MODULES= 
MOZ_ENABLE_LIBXUL=

MOZ_EXTENSIONS_ALL=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs auth sroaming xmlterm datetime finger cview layout-debug tasks sql xforms permissions schema-validation reporter"

MOZ_IMG_DECODERS_DEFAULT="png gif jpeg bmp xbm"

MOZ_IMG_ENCODERS_DEFAULT="png"

MOZ_IPCD=

MOZ_JSDEBUGGER=1

MOZ_JSLOADER=1
@@ -4058,6 +4059,7 @@ minimo) 
  MOZ_ENABLE_POSTSCRIPT=

  MOZ_EXTENSIONS_DEFAULT="xml-rpc xmlextras transformiix webservices spatialnavigation"

  MOZ_IMG_DECODERS="png,gif,jpeg"

  MOZ_IMG_ENCODERS=

  MOZ_INSTALLER=

  MOZ_JSDEBUGGER=

  MOZ_LDAP_XPCOM=
@@ -4884,8 +4886,35 @@ MOZ_ARG_ENABLE_STRING(image-decoders, 
done],

    MOZ_IMG_DECODERS="$MOZ_IMG_DECODERS_DEFAULT")



dnl Dupes are removed in the encoder section because it will also add decoders



dnl ========================================================

dnl Image encoders

dnl ========================================================

MOZ_ARG_ENABLE_STRING(image-encoders,

[  --enable-image-encoders[={mod1,mod2,default,all,none}]

                          Enable specific image encoders],

[ for option in `echo $enableval | sed 's/,/ /g'`; do

    if test "$option" = "yes" || test "$option" = "all"; then

        addencoder="$MOZ_IMG_ENCODERS_DEFAULT"

    elif test "$option" = "no" || test "$option" = "none"; then

        MOZ_IMG_ENCODERS=""

        addencoder=""

    elif test "$option" = "default"; then

        addencoder="$MOZ_IMG_ENCODERS_DEFAULT"

    elif test `echo "$option" | grep -c \^-` != 0; then

        option=`echo $option | sed 's/^-//'`

        addencoder=`echo "$MOZ_IMG_ENCODERS" | sed "s/ ${option}//"`

    else

        addencoder="$option"

    fi

    MOZ_IMG_ENCODERS="$MOZ_IMG_ENCODERS $addencoder"

done],

    MOZ_IMG_ENCODERS="$MOZ_IMG_ENCODERS_DEFAULT")



dnl Remove dupes

MOZ_IMG_DECODERS=`${PERL} ${srcdir}/build/unix/uniq.pl ${MOZ_IMG_DECODERS}`

MOZ_IMG_ENCODERS=`${PERL} ${srcdir}/build/unix/uniq.pl ${MOZ_IMG_ENCODERS}`



dnl ========================================================

dnl experimental ldap features
@@ -6609,6 +6638,7 @@ AC_SUBST(MOZ_DEBUG_LDFLAGS) 
AC_SUBST(MOZ_DBGRINFO_MODULES)

AC_SUBST(MOZ_EXTENSIONS)

AC_SUBST(MOZ_IMG_DECODERS)

AC_SUBST(MOZ_IMG_ENCODERS)

AC_SUBST(MOZ_JSDEBUGGER)

AC_SUBST(MOZ_OJI)

AC_SUBST(MOZ_NO_XPCOM_OBSOLETE)

modules/libimg/png/Makefile.in

+5 −0
Original line number Diff line number Diff line
@@ -64,6 +64,11 @@ FORCE_USE_PIC = 1 


include $(topsrcdir)/config/rules.mk



#ifeq (png,$(filter png,$(MOZ_IMG_ENCODERS)))

ifdef MOZ_IMG_ENCODERS

DEFINES		+= -DMOZ_PNG_WRITE

endif



ifeq ($(OS_ARCH),WINNT)

DEFINES		+= -DZLIB_DLL

ifdef BUILD_DEBUG_GC

modules/libimg/png/mozpngconf.h

+29 −0
Original line number Diff line number Diff line
@@ -70,7 +70,36 @@ 
#define PNG_NO_READ_OPT_PLTE

#define PNG_NO_MNG_FEATURES



#ifdef MOZ_PNG_WRITE

#define PNG_NO_WRITE_BACKGROUND

#define PNG_NO_WRITE_DITHER

#define PNG_NO_WRITE_INVERT

#define PNG_NO_WRITE_SHIFT

#define PNG_NO_WRITE_PACK

#define PNG_NO_WRITE_PACKSWAP

#define PNG_NO_WRITE_FILLER

#define PNG_NO_WRITE_SWAP_ALPHA

#define PNG_NO_WRITE_INVERT_ALPHA

#define PNG_NO_WRITE_RGB_TO_GRAY

#define PNG_NO_WRITE_USER_TRANSFORM

#define PNG_NO_WRITE_bKGD

#define PNG_NO_WRITE_cHRM

#define PNG_NO_WRITE_hIST

#define PNG_NO_WRITE_iCCP

#define PNG_NO_WRITE_pCAL

#define PNG_NO_WRITE_pHYs

#define PNG_NO_WRITE_sBIT

#define PNG_NO_WRITE_sCAL

#define PNG_NO_WRITE_sPLT

#define PNG_NO_WRITE_TEXT

#define PNG_NO_WRITE_tIME

#define PNG_NO_WRITE_UNKNOWN_CHUNKS

#define PNG_NO_WRITE_USER_CHUNKS

#define PNG_NO_WRITE_EMPTY_PLTE

#define PNG_NO_WRITE_OPT_PLTE

#else

#define PNG_NO_WRITE_SUPPORTED

#endif



#define PNG_NO_READ_STRIP_ALPHA

#define PNG_NO_USER_TRANSFORM_PTR