Commit 0af736a3 authored by Cristy's avatar Cristy

Remove compiler warning

parent 637b4694
......@@ -291,7 +291,7 @@ libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
# Format C API documentation
html:
html-local:
# copy static file
for dir in $(DOCDIRSMANUAL) ; do \
$(MKDIR_P) $(top_builddir)/$$dir ;\
......
......@@ -2004,7 +2004,7 @@ AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/config
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
......@@ -2525,10 +2525,9 @@ am__remove_distdir = \
|| { sleep 5 && rm -rf "$(distdir)"; }; \
else :; fi
am__post_remove_distdir = $(am__remove_distdir)
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).tar.lz \
$(distdir).tar.xz $(distdir).zip
DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
DIST_TARGETS = dist-lzip dist-xz dist-bzip2 dist-gzip dist-zip
DIST_TARGETS = dist-gzip
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
......@@ -2844,6 +2843,10 @@ UINTPTR_T = @UINTPTR_T@
UMEM_LIBS = @UMEM_LIBS@
UniconvertorDelegate = @UniconvertorDelegate@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
WARN_CXXFLAGS = @WARN_CXXFLAGS@
WARN_LDFLAGS = @WARN_LDFLAGS@
WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@
WEBP_LIBS = @WEBP_LIBS@
WMFDecodeDelegate = @WMFDecodeDelegate@
WMF_CFLAGS = @WMF_CFLAGS@
......@@ -11115,12 +11118,15 @@ distdir: $(DISTFILES)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
$(am__post_remove_distdir)
dist-lzip: distdir
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
$(am__post_remove_distdir)
dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__post_remove_distdir)
......@@ -11138,6 +11144,7 @@ dist-shar: distdir
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
-rm -f $(distdir).zip
zip -rq $(distdir).zip $(distdir)
......@@ -11319,7 +11326,9 @@ dvi: dvi-am
dvi-am:
html-am:
html: html-am
html-am: html-local
info: info-am
......@@ -11405,25 +11414,25 @@ uninstall-man: uninstall-man1
dist-zip distcheck distclean distclean-compile \
distclean-generic distclean-hdr distclean-libtool \
distclean-local distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-binPROGRAMS install-binSCRIPTS \
install-codersLTLIBRARIES install-configlibDATA \
install-configshareDATA install-configsharearchDATA \
install-data install-data-am install-data-local \
install-docDATA install-dvi install-dvi-am install-exec \
install-exec-am install-exec-local install-filtersLTLIBRARIES \
install-html install-html-am install-includeHEADERS \
install-info install-info-am install-libLTLIBRARIES \
install-magickincHEADERS install-magickincarchHEADERS \
install-magickppincHEADERS install-magickpptopincHEADERS \
install-man install-man1 install-pdf install-pdf-am \
install-pkgconfigDATA install-ps install-ps-am install-strip \
install-wandincHEADERS installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
maintainer-clean-local mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
recheck tags tags-am uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-binSCRIPTS \
distuninstallcheck dvi dvi-am html html-am html-local info \
info-am install install-am install-binPROGRAMS \
install-binSCRIPTS install-codersLTLIBRARIES \
install-configlibDATA install-configshareDATA \
install-configsharearchDATA install-data install-data-am \
install-data-local install-docDATA install-dvi install-dvi-am \
install-exec install-exec-am install-exec-local \
install-filtersLTLIBRARIES install-html install-html-am \
install-includeHEADERS install-info install-info-am \
install-libLTLIBRARIES install-magickincHEADERS \
install-magickincarchHEADERS install-magickppincHEADERS \
install-magickpptopincHEADERS install-man install-man1 \
install-pdf install-pdf-am install-pkgconfigDATA install-ps \
install-ps-am install-strip install-wandincHEADERS \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic maintainer-clean-local mostlyclean \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am recheck tags tags-am uninstall \
uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \
uninstall-codersLTLIBRARIES uninstall-configlibDATA \
uninstall-configshareDATA uninstall-configsharearchDATA \
uninstall-docDATA uninstall-filtersLTLIBRARIES \
......@@ -11614,7 +11623,7 @@ libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
# Format C API documentation
html:
html-local:
# copy static file
for dir in $(DOCDIRSMANUAL) ; do \
$(MKDIR_P) $(top_builddir)/$$dir ;\
This diff is collapsed.
This diff is collapsed.
......@@ -36,7 +36,11 @@ m4_define([magick_tar_name],[ImageMagick])
# ==============================================================================
# Initalize Automake
# ==============================================================================
AC_INIT([ImageMagick],[magick_version],[http://www.imagemagick.org],[magick_tar_name])
AC_INIT([ImageMagick],
[magick_version],
[https://github.com/ImageMagick/ImageMagick/issues],
[magick_tar_name],
[http://www.imagemagick.org])
AC_CONFIG_SRCDIR([magick/MagickCore.h])
AC_CONFIG_AUX_DIR([config])
AC_REQUIRE_AUX_FILE([tap-driver.sh])
......@@ -45,8 +49,8 @@ AC_CONFIG_HEADERS([config/config.h])
AX_PREFIX_CONFIG_H([magick/magick-baseconfig.h],[MagickCore])
AC_CANONICAL_SYSTEM
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([1.12 nostdinc color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-lzip dist-xz dist-zip tar-ustar])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
AM_INIT_AUTOMAKE([foreign color-tests -Wall -Wno-portability subdir-objects])
AM_SILENT_RULES([yes])
#
# Save initial user-tunable values
......@@ -294,7 +298,7 @@ AC_PROG_AWK
AM_WITH_DMALLOC
AX_C___ATTRIBUTE__
AX_GCC_ARCHFLAG([yes])
PKG_PROG_PKG_CONFIG
PKG_PROG_PKG_CONFIG([0.20])
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
......@@ -302,6 +306,7 @@ AC_CANONICAL_HOST
AC_CHECK_SIZEOF([size_t])
AX_COMPILER_VENDOR
AX_COMPILER_FLAGS
# The AX_CFLAGS_WARN_ALL macro doesn't currently work for sunpro
# compiler.
if test "$ax_cv_c_compiler_vendor" != "sun"; then
......
......@@ -1012,9 +1012,9 @@ static size_t ComplexTextLayout(const Image *image,const DrawInfo *draw_info,
i;
size_t
count;
extent;
count=0;
extent=0;
rq=raqm_create();
if (rq == (raqm_t *) NULL)
goto cleanup;
......@@ -1055,19 +1055,19 @@ static size_t ComplexTextLayout(const Image *image,const DrawInfo *draw_info,
}
if (raqm_layout(rq) == 0)
goto cleanup;
glyphs=raqm_get_glyphs(rq,&count);
glyphs=raqm_get_glyphs(rq,&extent);
if (glyphs == (raqm_glyph_t *) NULL)
{
count=0;
extent=0;
goto cleanup;
}
*grapheme=(GraphemeInfo *) AcquireQuantumMemory(count,sizeof(**grapheme));
*grapheme=(GraphemeInfo *) AcquireQuantumMemory(extent,sizeof(**grapheme));
if (*grapheme == (GraphemeInfo *) NULL)
{
count=0;
extent=0;
goto cleanup;
}
for (i=0; i < (ssize_t) count; i++)
for (i=0; i < (ssize_t) extent; i++)
{
(*grapheme)[i].index=glyphs[i].index;
(*grapheme)[i].x_offset=glyphs[i].x_offset;
......@@ -1078,7 +1078,7 @@ static size_t ComplexTextLayout(const Image *image,const DrawInfo *draw_info,
cleanup:
raqm_destroy(rq);
return(count);
return(extent);
#else
const char
*p;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment