(no commit message)

diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index ccb3d98c8dd6d7a59c1b1634a28964f177a59e2f..19108a48ce2445d8b3b16367b8630c2c930a4cf6 100644 (file)
--- 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 75ecf56282980d32187b9d81f6aec1c0067af530..3a5ab4ccff4240362c7b8d570d65f00c04ddcb0e 100644 (file)
--- 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 7943436a09b078b03425c0b0913c6316bbb80c3b..1e2a0f03d87e83ceccd940b3a508dbd85b09efad 100644 (file)
--- 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 )
 \f
-/*
-  Constant declaration.
-*/
-const char
-  BackgroundColor[] = "#ffffff",  /* white */
-  BorderColor[] = "#dfdfdf",  /* gray */
-  MatteColor[] = "#bdbdbd";  /* gray */
-\f
 /*
 ** Function to report on the progress of image operations
 */

diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL
index f5b1b7eea4c3eb0a04f37b00ed3d6968362f3939..05c47d6809cb2b6f4d84bf79b60ef3eabf888417 100644 (file)
--- 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 4edd1f6137b67db499160c410e6f1a046334c466..f008437ad1ab2b14bcf2bf984f5aa82cf2deb46c 100755 (executable)
--- 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 e27f0a706607df92ecb019a4ea775c6436c48a38..def1d61a6fd52ae3e59e829a6fba8b843d2821da 100644 (file)
--- 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);