From: cristy Date: Sat, 18 Jan 2014 18:34:33 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~2829 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=037761a59cfe95cf5ce147a7f5def261631cde6b;p=imagemagick --- diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c index ccb3d98c8..19108a48c 100644 --- a/MagickCore/enhance.c +++ b/MagickCore/enhance.c @@ -888,6 +888,9 @@ MagickExport MagickBooleanType ContrastImage(Image *image, green, red; + red=0.0; + green=0.0; + blue=0.0; Contrast(sign,&red,&green,&blue); image->colormap[i].red=(MagickRealType) red; image->colormap[i].green=(MagickRealType) green; diff --git a/MagickCore/version.h b/MagickCore/version.h index 75ecf5628..3a5ab4ccf 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -51,7 +51,7 @@ extern "C" { #define MagickReleaseDate "2014-01-18" #define MagickChangeDate "20120427" #define MagickAuthoritativeURL "http://www.imagemagick.org" -#define MagickFeatures "DPC HDRI OpenMP" +#define MagickFeatures "DPC HDRI" #define MagickDelegates "bzlib djvu mpeg fftw fpx fontconfig freetype jng jpeg lcms lzma openexr pango png ps tiff webp x xml zlib" #define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-7/index.html" #if (MAGICKCORE_QUANTUM_DEPTH == 8) diff --git a/MagickWand/operation.c b/MagickWand/operation.c index 7943436a0..1e2a0f03d 100644 --- a/MagickWand/operation.c +++ b/MagickWand/operation.c @@ -75,14 +75,6 @@ (void) FormatLocaleFile(stderr, "Geometry = 0x%04X : %lg x %lg %+lg %+lg\n", \ flags, info.rho, info.sigma, info.xi, info.psi ) -/* - Constant declaration. -*/ -const char - BackgroundColor[] = "#ffffff", /* white */ - BorderColor[] = "#dfdfdf", /* gray */ - MatteColor[] = "#bdbdbd"; /* gray */ - /* ** Function to report on the progress of image operations */ diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index f5b1b7eea..05c47d680 100644 --- a/PerlMagick/Makefile.PL +++ b/PerlMagick/Makefile.PL @@ -163,7 +163,7 @@ foreach my $delegate (@tested_delegates) { # defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile my $INC_magick = '-I../ -I.. -pthread -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libdrm -I/usr/include/libpng16 -I/usr/include/freetype2 -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"'; my $LIBS_magick = '-L../MagickCore/.libs -lMagickCore-7.Q16HDRI -lperl -lm'; -my $CCFLAGS_magick = "$Config{'ccflags'} -pthread -I/usr/include/OpenEXR -I/usr/include/libdrm -I/usr/include/freetype2 -fopenmp -g -O2 -Wall -fexceptions -pthread -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16"; +my $CCFLAGS_magick = "$Config{'ccflags'} -pthread -I/usr/include/OpenEXR -I/usr/include/libdrm -I/usr/include/freetype2 -g -O2 -Wall -fexceptions -pthread -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16"; my $LDFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-7.Q16HDRI $Config{'ldflags'} "; my $LDDLFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-7.Q16HDRI $Config{'lddlflags'} "; @@ -206,7 +206,7 @@ WriteMakefile 'INC' => $INC_magick, # C compiler - #'CC' => 'gcc -std=gnu99 -std=gnu99', + #'CC' => '/usr/libexec/clang-analyzer/scan-build/ccc-analyzer -std=gnu99 -std=gnu99', # C pre-processor flags (e.g. -I & -D options) # 'CPPFLAGS' => "$Config{'cppflags'} -pthread -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libdrm -I/usr/include/libpng16 -I/usr/include/freetype2 -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -I/usr/include/libxml2", @@ -215,7 +215,7 @@ WriteMakefile 'CCFLAGS' => $CCFLAGS_magick, # Linker - #'LD' => $Config{'ld'} == $Config{'cc'} ? 'gcc -std=gnu99 -std=gnu99' : $Config{'ld'}, + #'LD' => $Config{'ld'} == $Config{'cc'} ? '/usr/libexec/clang-analyzer/scan-build/ccc-analyzer -std=gnu99 -std=gnu99' : $Config{'ld'}, # Linker flags for building an executable 'LDFLAGS' => $LDFLAGS_magick, @@ -236,9 +236,9 @@ WriteMakefile # 'OPTIMIZE' => '', # Use same compiler as ImageMagick - 'PERLMAINCC' => 'g++ -fopenmp', + 'PERLMAINCC' => '/usr/libexec/clang-analyzer/scan-build/c++-analyzer ', 'AR' => 'ar', - 'LD' => 'g++', + 'LD' => '/usr/libexec/clang-analyzer/scan-build/c++-analyzer', # Set Perl installation prefix to ImageMagick installation prefix # 'PREFIX' => '/usr/local', diff --git a/PerlMagick/check.sh b/PerlMagick/check.sh index 4edd1f613..f008437ad 100755 --- a/PerlMagick/check.sh +++ b/PerlMagick/check.sh @@ -42,10 +42,10 @@ fi if test -x PerlMagick -a -f Makefile.aperl ; then # Static build test incantation - ${MAKE} -f Makefile.aperl CC='gcc -std=gnu99 -std=gnu99' TEST_VERBOSE=1 test + ${MAKE} -f Makefile.aperl CC='/usr/libexec/clang-analyzer/scan-build/ccc-analyzer -std=gnu99 -std=gnu99' TEST_VERBOSE=1 test elif test -f Makefile -a -f Magick.o; then # Shared build test incantation - ${MAKE} CC='gcc -std=gnu99 -std=gnu99' TEST_VERBOSE=1 test + ${MAKE} CC='/usr/libexec/clang-analyzer/scan-build/ccc-analyzer -std=gnu99 -std=gnu99' TEST_VERBOSE=1 test else echo 'PerlMagick has not been built!' exit 1 diff --git a/coders/png.c b/coders/png.c index e27f0a706..def1d61a6 100644 --- a/coders/png.c +++ b/coders/png.c @@ -2467,11 +2467,11 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, const char *property; + property=(const char *) NULL; ResetImagePropertyIterator(image); - while (property != (const char *) NULL) { - GetImageProperty(image,property,exception); + (void) GetImageProperty(image,property,exception); if (LocaleNCompare(property,"png:swap-bytes",14) != 0) png_set_swap(ping);