Merge to XFA: Speculative fix for breakage in pdfum DEPS roll
authorTom Sepez <tsepez@chromium.org>
Mon, 16 Mar 2015 21:58:06 +0000 (14:58 -0700)
committerTom Sepez <tsepez@chromium.org>
Mon, 16 Mar 2015 21:58:06 +0000 (14:58 -0700)
Original Review URL: https://codereview.chromium.org/1011803003
TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1015543002

samples/image_diff.cc
samples/image_diff_png.cc

index 3f82b66..c7560e1 100644 (file)
@@ -9,11 +9,11 @@
 // what the run-webkit-tests script expects.
 
 #include <assert.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <algorithm>
-#include <cstdint>
 #include <iostream>
 #include <map>
 #include <string>
index 2ccc3e5..8dd597f 100644 (file)
@@ -219,9 +219,6 @@ void DecodeInfoCallback(png_struct* png_ptr, png_info* info_ptr) {
         state->row_converter = &ConvertRGBtoBGRA;
         state->output_channels = 4;
         break;
-      default:
-        NOTREACHED();
-        break;
     }
   } else if (channels == 4) {
     switch (state->output_format) {
@@ -237,9 +234,6 @@ void DecodeInfoCallback(png_struct* png_ptr, png_info* info_ptr) {
         state->row_converter = &ConvertBetweenBGRAandRGBA;
         state->output_channels = 4;
         break;
-      default:
-        NOTREACHED();
-        break;
     }
   } else {
     NOTREACHED();
@@ -568,10 +562,6 @@ bool EncodeWithCompressionLevel(const unsigned char* input, ColorFormat format,
         converter = ConvertBetweenBGRAandRGBA;
       }
       break;
-
-    default:
-      NOTREACHED();
-      return false;
   }
 
   // Row stride should be at least as long as the length of the data.