Skip to content

Commit

Permalink
png: Replaced libpng with lodepng.
Browse files Browse the repository at this point in the history
This was explicitly done to remove code that was possibly still licensed
under the LGPL in our own libpng glue code, but also lodepng is significantly
less bulky that libpng without any apparent loss in functionality. Now it's
just a single C file that is #included from IMG_png.c, and unless SDL_image
is built without PNG support at all, is always available at runtime. The
shared libraries, the big source trees: gone. zlib and miniz are also removed,
as they were only there to support libpng. lodepng provides its own internal
compression code.

Saving and loading are both supported, as are paletted images, etc. This has
been run through an initial test suite of PNG images, but needs more complete
testing (and likely minor updates to some of the project files).
  • Loading branch information
icculus committed Nov 1, 2019
1 parent 81b971d commit d3d2b96
Show file tree
Hide file tree
Showing 776 changed files with 595 additions and 261,442 deletions.
6 changes: 0 additions & 6 deletions CMakeLists.txt
Expand Up @@ -29,13 +29,7 @@ if (SUPPORT_JPG)
endif()

if (SUPPORT_PNG)
# missing libpng.vers
set(HAVE_LD_VERSION_SCRIPT OFF CACHE BOOL "" FORCE)
target_compile_definitions(SDL2_image PRIVATE -DLOAD_PNG)

add_subdirectory(external/libpng-1.6.37)
include_directories(external/libpng-1.6.37)
target_link_libraries(SDL2_image PRIVATE png)
endif()

if (SUPPORT_WEBP)
Expand Down
797 changes: 232 additions & 565 deletions IMG_png.c

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion Makefile.am
Expand Up @@ -28,7 +28,6 @@ libSDL2_image_la_SOURCES = \
IMG_webp.c \
IMG_WIC.c \
$(IMAGEIO_SOURCE) \
miniz.h \
nanosvg.h \
nanosvgrast.h

Expand Down
170 changes: 56 additions & 114 deletions Makefile.in
@@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.16 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@

# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.

# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
Expand Down Expand Up @@ -115,7 +115,6 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES = SDL2_image.spec SDL2_image.pc
CONFIG_CLEAN_VPATH_FILES =
PROGRAMS = $(noinst_PROGRAMS)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
Expand Down Expand Up @@ -150,7 +149,7 @@ am__DEPENDENCIES_1 =
am__libSDL2_image_la_SOURCES_DIST = IMG.c IMG_bmp.c IMG_gif.c \
IMG_jpg.c IMG_lbm.c IMG_pcx.c IMG_png.c IMG_pnm.c IMG_svg.c \
IMG_tga.c IMG_tif.c IMG_xcf.c IMG_xpm.c IMG_xv.c IMG_webp.c \
IMG_WIC.c IMG_ImageIO.m miniz.h nanosvg.h nanosvgrast.h
IMG_WIC.c IMG_ImageIO.m nanosvg.h nanosvgrast.h
@USE_IMAGEIO_TRUE@am__objects_1 = IMG_ImageIO.lo
am_libSDL2_image_la_OBJECTS = IMG.lo IMG_bmp.lo IMG_gif.lo IMG_jpg.lo \
IMG_lbm.lo IMG_pcx.lo IMG_png.lo IMG_pnm.lo IMG_svg.lo \
Expand All @@ -164,6 +163,7 @@ am__v_lt_1 =
libSDL2_image_la_LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(OBJCLD) $(AM_OBJCFLAGS) \
$(OBJCFLAGS) $(libSDL2_image_la_LDFLAGS) $(LDFLAGS) -o $@
PROGRAMS = $(noinst_PROGRAMS)
showanim_SOURCES = showanim.c
showanim_OBJECTS = showanim.$(OBJEXT)
showanim_DEPENDENCIES = libSDL2_image.la
Expand All @@ -184,17 +184,7 @@ am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__maybe_remake_depfiles = depfiles
am__depfiles_remade = ./$(DEPDIR)/IMG.Plo ./$(DEPDIR)/IMG_ImageIO.Plo \
./$(DEPDIR)/IMG_WIC.Plo ./$(DEPDIR)/IMG_bmp.Plo \
./$(DEPDIR)/IMG_gif.Plo ./$(DEPDIR)/IMG_jpg.Plo \
./$(DEPDIR)/IMG_lbm.Plo ./$(DEPDIR)/IMG_pcx.Plo \
./$(DEPDIR)/IMG_png.Plo ./$(DEPDIR)/IMG_pnm.Plo \
./$(DEPDIR)/IMG_svg.Plo ./$(DEPDIR)/IMG_tga.Plo \
./$(DEPDIR)/IMG_tif.Plo ./$(DEPDIR)/IMG_webp.Plo \
./$(DEPDIR)/IMG_xcf.Plo ./$(DEPDIR)/IMG_xpm.Plo \
./$(DEPDIR)/IMG_xv.Plo ./$(DEPDIR)/showanim.Po \
./$(DEPDIR)/showimage.Po
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
Expand Down Expand Up @@ -264,8 +254,8 @@ CTAGS = ctags
CSCOPE = cscope
AM_RECURSIVE_TARGETS = cscope
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/SDL2_image.pc.in \
$(srcdir)/SDL2_image.spec.in ar-lib compile config.guess \
config.sub depcomp install-sh ltmain.sh missing
$(srcdir)/SDL2_image.spec.in compile config.guess config.sub \
depcomp install-sh ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
Expand Down Expand Up @@ -321,8 +311,6 @@ INTERFACE_AGE = @INTERFACE_AGE@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
LIBPNG_LIBS = @LIBPNG_LIBS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@
Expand Down Expand Up @@ -445,7 +433,6 @@ libSDL2_image_la_SOURCES = \
IMG_webp.c \
IMG_WIC.c \
$(IMAGEIO_SOURCE) \
miniz.h \
nanosvg.h \
nanosvgrast.h

Expand Down Expand Up @@ -508,8 +495,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;

$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
Expand All @@ -525,15 +512,6 @@ SDL2_image.spec: $(top_builddir)/config.status $(srcdir)/SDL2_image.spec.in
SDL2_image.pc: $(top_builddir)/config.status $(srcdir)/SDL2_image.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@

clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
echo " rm -f" $$list; \
rm -f $$list || exit $$?; \
test -n "$(EXEEXT)" || exit 0; \
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list

install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
Expand Down Expand Up @@ -572,6 +550,15 @@ clean-libLTLIBRARIES:
libSDL2_image.la: $(libSDL2_image_la_OBJECTS) $(libSDL2_image_la_DEPENDENCIES) $(EXTRA_libSDL2_image_la_DEPENDENCIES)
$(AM_V_OBJCLD)$(libSDL2_image_la_LINK) -rpath $(libdir) $(libSDL2_image_la_OBJECTS) $(libSDL2_image_la_LIBADD) $(LIBS)

clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
echo " rm -f" $$list; \
rm -f $$list || exit $$?; \
test -n "$(EXEEXT)" || exit 0; \
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list

showanim$(EXEEXT): $(showanim_OBJECTS) $(showanim_DEPENDENCIES) $(EXTRA_showanim_DEPENDENCIES)
@rm -f showanim$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(showanim_OBJECTS) $(showanim_LDADD) $(LIBS)
Expand All @@ -586,31 +573,25 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_ImageIO.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_WIC.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_bmp.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_gif.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_jpg.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_lbm.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_pcx.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_png.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_pnm.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_svg.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_tga.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_tif.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_webp.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_xcf.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_xpm.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_xv.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/showanim.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/showimage.Po@am__quote@ # am--include-marker

$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
@echo '# dummy' >$@-t && $(am__mv) $@-t $@

am--depfiles: $(am__depfiles_remade)
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_ImageIO.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_WIC.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_bmp.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_gif.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_jpg.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_lbm.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_pcx.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_png.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_pnm.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_svg.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_tga.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_tif.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_webp.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_xcf.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_xpm.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_xv.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/showanim.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/showimage.Po@am__quote@

.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
Expand Down Expand Up @@ -764,10 +745,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files

distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am

distdir-am: $(DISTFILES)
distdir: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
Expand Down Expand Up @@ -807,7 +785,7 @@ distdir-am: $(DISTFILES)
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__post_remove_distdir)

dist-bzip2: distdir
Expand All @@ -833,7 +811,7 @@ dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)

dist-zip: distdir
Expand All @@ -851,7 +829,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
Expand All @@ -861,7 +839,7 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
Expand Down Expand Up @@ -932,7 +910,7 @@ distcleancheck: distclean
exit 1; } >&2
check-am: all-am
check: check-am
all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(DATA) $(HEADERS)
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
installdirs:
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libSDL2_imageincludedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
Expand Down Expand Up @@ -974,25 +952,7 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \

distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -f ./$(DEPDIR)/IMG.Plo
-rm -f ./$(DEPDIR)/IMG_ImageIO.Plo
-rm -f ./$(DEPDIR)/IMG_WIC.Plo
-rm -f ./$(DEPDIR)/IMG_bmp.Plo
-rm -f ./$(DEPDIR)/IMG_gif.Plo
-rm -f ./$(DEPDIR)/IMG_jpg.Plo
-rm -f ./$(DEPDIR)/IMG_lbm.Plo
-rm -f ./$(DEPDIR)/IMG_pcx.Plo
-rm -f ./$(DEPDIR)/IMG_png.Plo
-rm -f ./$(DEPDIR)/IMG_pnm.Plo
-rm -f ./$(DEPDIR)/IMG_svg.Plo
-rm -f ./$(DEPDIR)/IMG_tga.Plo
-rm -f ./$(DEPDIR)/IMG_tif.Plo
-rm -f ./$(DEPDIR)/IMG_webp.Plo
-rm -f ./$(DEPDIR)/IMG_xcf.Plo
-rm -f ./$(DEPDIR)/IMG_xpm.Plo
-rm -f ./$(DEPDIR)/IMG_xv.Plo
-rm -f ./$(DEPDIR)/showanim.Po
-rm -f ./$(DEPDIR)/showimage.Po
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-libtool distclean-tags
Expand Down Expand Up @@ -1041,25 +1001,7 @@ installcheck-am:
maintainer-clean: maintainer-clean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
-rm -f ./$(DEPDIR)/IMG.Plo
-rm -f ./$(DEPDIR)/IMG_ImageIO.Plo
-rm -f ./$(DEPDIR)/IMG_WIC.Plo
-rm -f ./$(DEPDIR)/IMG_bmp.Plo
-rm -f ./$(DEPDIR)/IMG_gif.Plo
-rm -f ./$(DEPDIR)/IMG_jpg.Plo
-rm -f ./$(DEPDIR)/IMG_lbm.Plo
-rm -f ./$(DEPDIR)/IMG_pcx.Plo
-rm -f ./$(DEPDIR)/IMG_png.Plo
-rm -f ./$(DEPDIR)/IMG_pnm.Plo
-rm -f ./$(DEPDIR)/IMG_svg.Plo
-rm -f ./$(DEPDIR)/IMG_tga.Plo
-rm -f ./$(DEPDIR)/IMG_tif.Plo
-rm -f ./$(DEPDIR)/IMG_webp.Plo
-rm -f ./$(DEPDIR)/IMG_xcf.Plo
-rm -f ./$(DEPDIR)/IMG_xpm.Plo
-rm -f ./$(DEPDIR)/IMG_xv.Plo
-rm -f ./$(DEPDIR)/showanim.Po
-rm -f ./$(DEPDIR)/showimage.Po
-rm -rf ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic

Expand All @@ -1081,17 +1023,17 @@ uninstall-am: uninstall-libLTLIBRARIES \

.MAKE: install-am install-strip

.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles am--refresh check \
check-am clean clean-cscope clean-generic clean-libLTLIBRARIES \
clean-libtool clean-noinstPROGRAMS cscope cscopelist-am ctags \
ctags-am dist dist-all dist-bzip2 dist-gzip dist-lzip \
dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-libLTLIBRARIES \
.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \
clean-cscope clean-generic clean-libLTLIBRARIES clean-libtool \
clean-noinstPROGRAMS cscope cscopelist-am ctags ctags-am dist \
dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
dist-xz dist-zip distcheck distclean distclean-compile \
distclean-generic distclean-libtool distclean-tags \
distcleancheck distdir distuninstallcheck dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-libLTLIBRARIES \
install-libSDL2_imageincludeHEADERS install-man install-pdf \
install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
Expand Down
2 changes: 0 additions & 2 deletions README.txt
Expand Up @@ -27,8 +27,6 @@ To create a surface from an XPM image included in C source, use:
An example program 'showimage' is included, with source in showimage.c

JPEG support requires the JPEG library: http://www.ijg.org/
PNG support requires the PNG library: http://www.libpng.org/pub/png/libpng.html
and the Zlib library: http://www.gzip.org/zlib/
TIFF support requires the TIFF library: ftp://ftp.sgi.com/graphics/tiff/

If you have these libraries installed in non-standard places, you can
Expand Down
1 change: 0 additions & 1 deletion SDL2_image.spec
Expand Up @@ -14,7 +14,6 @@ Prefix: %{_prefix}
Packager: Hakan Tandogan <hakan@iconsult.com>
#BuildRequires: SDL2-devel
#BuildRequires: libjpeg-devel
#BuildRequires: libpng-devel
#BuildRequires: libtiff-devel

%description
Expand Down
1 change: 0 additions & 1 deletion SDL2_image.spec.in
Expand Up @@ -14,7 +14,6 @@ Prefix: %{_prefix}
Packager: Hakan Tandogan <hakan@iconsult.com>
#BuildRequires: SDL2-devel
#BuildRequires: libjpeg-devel
#BuildRequires: libpng-devel
#BuildRequires: libtiff-devel

%description
Expand Down
1 change: 0 additions & 1 deletion VisualC-WinRT/WinRT80_VS2012/SDL_image-WinRT80.vcxproj
Expand Up @@ -45,7 +45,6 @@
<ClCompile Include="..\..\IMG_xxx.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\miniz.h" />
<ClInclude Include="..\SDL_image.h" />
</ItemGroup>
<ItemGroup>
Expand Down
Expand Up @@ -19,7 +19,6 @@
<ClCompile Include="..\..\IMG_svg.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\miniz.h" />
<ClInclude Include="..\SDL_image.h" />
</ItemGroup>
</Project>

0 comments on commit d3d2b96

Please sign in to comment.