Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 12:35:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added ifdefs for MOZ_NATIVE_{JPEG,PNG,ZLIB}. Approved by pnunn%netscape.com.

Browse Source
This commit is contained in:
cls%seawood.org 1998-08-18 22:59:14 +00:00
parent d18d10db26
commit 9ec4fad8e8
4 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/Makefile
View File

@ -30,12 +30,15 @@ DIRS = \
rdf \
xml \
schedulr \
zlib \
li \
progress \
plugin \
$(NULL)
ifndef MOZ_NATIVE_ZLIB
DIRS += zlib
endif
ifndef MOZ_SECURITY
DIRS += security
endif

18
modules/libimg/Makefile
View File

@ -19,10 +19,24 @@ DEPTH = ../..
ifdef STANDALONE_IMAGE_LIB
DIRS = png public src
EXTRA_LIBS = libzlib.a libpng.a
else
DIRS = png classes public src
DIRS = classes public src
EXTRA_LIBS =
ifdef MOZ_NATIVE_PNG
EXTRA_LIBS += -lpng
else
DIRS += png
EXTRA_LIBS += libpng.a
endif
EXTRA_LIBS = libzlib.a libpng.a
ifdef MOZ_NATIVE_ZLIB
EXTRA_LIBS += -lz
else
EXTRA_LIBS += libzlib.a
endif
endif
include $(DEPTH)/config/rules.mk

25
modules/libimg/src/Makefile
View File

@ -74,11 +74,30 @@ CPPSRCS = color.cpp \
EXPORTS = PIMGCB.h PPSIMGCB.h
REQUIRES = jtools java zlib nspr dbm jpeg util img png layer js xpcom
REQUIRES = jtools java nspr dbm util img layer js xpcom
LOCAL_INCLUDES = -I../png -I. -I$(DEPTH)/dist/public/zlib
LOCAL_INCLUDES = -I.
EXTRA_LIBS =
EXTRA_LIBS = $(DIST)/lib/libzlib.a $(DIST)/lib/libpng.a
ifndef MOZ_NATIVE_JPEG
REQUIRES += jpeg
endif
ifdef MOZ_NATIVE_PNG
EXTRA_LIBS += -lpng
else
REQUIRES += png
LOCAL_INCLUDES += -I../png
EXTRA_LIBS += $(DIST)/lib/libpng.a
endif
ifdef MOZ_NATIVE_ZLIB
EXTRA_LIBS += -lz
else
REQUIRES += zlib
LOCAL_INCLUDES += -I$(DEPTH)/dist/public/zlib
EXTRA_LIBS += $(DIST)/lib/libzlib.a
endif
#
# Generate MIMGCB.c (and similar sources) here.

4
modules/libimg/src/ipng.cpp
View File

@ -42,14 +42,14 @@ extern void info_callback(png_structp png_ptr, png_infop info);
extern void il_create_alpha_mask( il_container *, int, int, int );
#if defined(PNG_LIBPNG_VER) && (PNG_LIBPNG_VER < 100)
extern png_structp png_create_read_struct(png_charp user_png_ver, png_voidp, png_error_ptr, png_error_ptr);
extern png_infop png_create_info_struct(png_structp png_ptr);
extern void png_destroy_read_struct(png_structpp, png_infopp, png_infopp);
extern void png_set_progressive_read_fn(png_structp, png_voidp, png_progressive_info_ptr, png_progressive_row_ptr, png_progressive_end_ptr);
extern void png_process_data(png_structp, png_infop, png_bytep, png_size_t);
#endif
/*-----------------------------*/
int