Add SkEncodedFormat, used by SkCodec.

tools/skpdiff/SkDiffContext.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkImageDecoder.h"
 #include "SkOSFile.h"
@@ skipping 145 matching lines @@
                 && !diffData.fResult.poiAlphaMask.empty()
                 && !newRecord->fCommonName.isEmpty()) {
 
             newRecord->fAlphaMaskPath = SkOSPath::Join(fAlphaMaskDir.c_str(),
                                                        newRecord->fCommonName.c_str());
 
             // compute the image diff and output it
             SkBitmap copy;
             diffData.fResult.poiAlphaMask.copyTo(&copy, kN32_SkColorType);
             SkImageEncoder::EncodeFile(newRecord->fAlphaMaskPath.c_str(), copy,
-                                       SkImageEncoder::kPNG_Type, 100);
+                                       kPNG_SkEncodedFormat, 100);
 
             // cleanup the existing bitmap to free up resources;
             diffData.fResult.poiAlphaMask.reset();
 
             bitmapsToCreate.alphaMask = false;
         }
 
         if (bitmapsToCreate.rgbDiff
                 && SkImageDiffer::RESULT_CORRECT != diffData.fResult.result
                 && !diffData.fResult.rgbDiffBitmap.empty()
                 && !newRecord->fCommonName.isEmpty()) {
             // TODO(djsollen): Rather than taking the max r/g/b diffs that come back from
             // a particular differ and storing them as toplevel fields within
             // newRecord, we should extend outputRecords() to report optional
             // fields for each differ (not just "result" and "pointsOfInterest").
             // See http://skbug.com/2712 ('allow skpdiff to report different sets
             // of result fields for different comparison algorithms')
             newRecord->fMaxRedDiff = diffData.fResult.maxRedDiff;
             newRecord->fMaxGreenDiff = diffData.fResult.maxGreenDiff;
             newRecord->fMaxBlueDiff = diffData.fResult.maxBlueDiff;
 
             newRecord->fRgbDiffPath = SkOSPath::Join(fRgbDiffDir.c_str(),
                                                      newRecord->fCommonName.c_str());
             SkImageEncoder::EncodeFile(newRecord->fRgbDiffPath.c_str(),
                                        diffData.fResult.rgbDiffBitmap,
-                                       SkImageEncoder::kPNG_Type, 100);
+                                       kPNG_SkEncodedFormat, 100);
             diffData.fResult.rgbDiffBitmap.reset();
             bitmapsToCreate.rgbDiff = false;
         }
 
         if (bitmapsToCreate.whiteDiff
                 && SkImageDiffer::RESULT_CORRECT != diffData.fResult.result
                 && !diffData.fResult.whiteDiffBitmap.empty()
                 && !newRecord->fCommonName.isEmpty()) {
             newRecord->fWhiteDiffPath = SkOSPath::Join(fWhiteDiffDir.c_str(),
                                                        newRecord->fCommonName.c_str());
             SkImageEncoder::EncodeFile(newRecord->fWhiteDiffPath.c_str(),
                                        diffData.fResult.whiteDiffBitmap,
-                                       SkImageEncoder::kPNG_Type, 100);
+                                       kPNG_SkEncodedFormat, 100);
             diffData.fResult.whiteDiffBitmap.reset();
             bitmapsToCreate.whiteDiff = false;
         }
     }
 }
 
 class SkThreadedDiff : public SkRunnable {
 public:
     SkThreadedDiff() : fDiffContext(NULL) { }
 
@@ skipping 236 matching lines @@
         for (int i = 0; i < cntColumns; i++) {
             SkString str;
             str.printf(", %f", values[i]);
             stream.writeText(str.c_str());
         }
         stream.writeText("\n");
 
         currentRecord = iter2.next();
     }
 }