Merge pull request google#54 from pornel/warnings

Warnings--
Hello71 · May 12, 2015 · f221cb1 · f221cb1
2 parents 5cebcf3 + 9f4b110
commit f221cb1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/src/zopfli/deflate.c b/src/zopfli/deflate.c
@@ -536,7 +536,7 @@ static void AddLZ77Block(const ZopfliOptions* options, int btype, int final,
   unsigned d_lengths[32];
   unsigned ll_symbols[288];
   unsigned d_symbols[32];
-  size_t detect_block_size = *outsize;
+  size_t detect_block_size;
   size_t compressed_size;
   size_t uncompressed_size = 0;
   size_t i;

diff --git a/src/zopflipng/lodepng/lodepng.cpp b/src/zopflipng/lodepng/lodepng.cpp
@@ -5165,16 +5165,8 @@ static void filterScanline(unsigned char* out, const unsigned char* scanline, co
       for(i = 0; i < length; i++) out[i] = scanline[i];
       break;
     case 1: /*Sub*/
-      if(prevline)
-      {
-        for(i = 0; i < bytewidth; i++) out[i] = scanline[i];
-        for(i = bytewidth; i < length; i++) out[i] = scanline[i] - scanline[i - bytewidth];
-      }
-      else
-      {
-        for(i = 0; i < bytewidth; i++) out[i] = scanline[i];
-        for(i = bytewidth; i < length; i++) out[i] = scanline[i] - scanline[i - bytewidth];
-      }
+      for(i = 0; i < bytewidth; i++) out[i] = scanline[i];
+      for(i = bytewidth; i < length; i++) out[i] = scanline[i] - scanline[i - bytewidth];
       break;
     case 2: /*Up*/
       if(prevline)

diff --git a/src/zopflipng/zopflipng_bin.cc b/src/zopflipng/zopflipng_bin.cc
@@ -151,7 +151,6 @@ int main(int argc, char *argv[]) {
   std::string prefix = "zopfli_";  // prefix for output filenames
 
   std::vector<std::string> files;
-  std::vector<char> options;
   for (int i = 1; i < argc; i++) {
     std::string arg = argv[i];
     if (arg[0] == '-' && arg.size() > 1 && arg[1] != '-') {
@@ -293,7 +292,7 @@ int main(int argc, char *argv[]) {
     error = ZopfliPNGOptimize(origpng, png_options, true, &resultpng);
 
     if (error) {
-      printf("Decoding error %i: %s\n", error, lodepng_error_text(error));
+      printf("Decoding error %u: %s\n", error, lodepng_error_text(error));
     }
 
     // Verify result, check that the result causes no decoding errors

diff --git a/src/zopflipng/zopflipng_lib.cc b/src/zopflipng/zopflipng_lib.cc
@@ -371,7 +371,7 @@ int ZopfliPNGOptimize(const std::vector<unsigned char>& origpng,
 
   if (error) {
     if (verbose) {
-      printf("Decoding error %i: %s\n", error, lodepng_error_text(error));
+      printf("Decoding error %u: %s\n", error, lodepng_error_text(error));
     }
     return error;
   }