fix trailing comma in outptu of SkDiffContext

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 139 matching lines @@
         const char* testFilename     = testEntries    [entryIndex].c_str();
 
         this->addDiff(baselineFilename, testFilename);
     }
 }
 
 void SkDiffContext::outputRecords(SkWStream& stream, bool useJSONP) {
     DiffRecord* currentRecord = fRecords;
     if (useJSONP) {
         stream.writeText("var SkPDiffRecords = {\n");
-    }
-    else
-    {
+    } else {
         stream.writeText("{\n");
     }
     stream.writeText("    \"records\": [\n");
     while (NULL != currentRecord) {
         stream.writeText("        {\n");
 
             stream.writeText("            \"baselinePath\": \"");
             stream.writeText(currentRecord->fBaselinePath.c_str());
             stream.writeText("\",\n");
 
@@ skipping 18 matching lines @@
                     for (int poiIndex = 0; poiIndex < data.fPointsOfInterest.count() &&
                                            poiIndex < kMaxPOI; poiIndex++) {
                         SkIPoint poi = data.fPointsOfInterest[poiIndex];
                         stream.writeText("                        [");
                         stream.writeDecAsText(poi.x());
                         stream.writeText(",");
                         stream.writeDecAsText(poi.y());
                         stream.writeText("]");
 
                         // JSON does not allow trailing commas
-                        if (poiIndex + 1 < data.fPointsOfInterest.count())
-                        {
+                        if (poiIndex + 1 < data.fPointsOfInterest.count() &&
+                            poiIndex + 1 < kMaxPOI) {
                             stream.writeText(",");
                         }
                         stream.writeText("\n");
                     }
                     stream.writeText("                    ]\n");
                 stream.writeText("                }");
 
                 // JSON does not allow trailing commas
-                if (diffIndex + 1 < currentRecord->fDiffs.count())
-                {
+                if (diffIndex + 1 < currentRecord->fDiffs.count()) {
                     stream.writeText(",");
                 }
                 stream.writeText("                \n");
             }
             stream.writeText("            ]\n");
 
         stream.writeText("        }");
 
         // JSON does not allow trailing commas
-        if (NULL != currentRecord->fNext)
-        {
+        if (NULL != currentRecord->fNext) {
             stream.writeText(",");
         }
         stream.writeText("\n");
         currentRecord = currentRecord->fNext;
     }
     stream.writeText("    ]\n");
     if (useJSONP) {
         stream.writeText("};\n");
-    }
-    else
-    {
+    } else {
         stream.writeText("}\n");
     }
 }
 
 void SkDiffContext::outputCsv(SkWStream& stream) {
     SkTDict<int> columns(2);
     int cntColumns = 0;
 
     stream.writeText("key");
 
@@ skipping 42 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 = currentRecord->fNext;
     }
 }