cosmetics & warnings

- remove some unused functions
- move global arrays from data to read only section
- explicitly cast malloc returns; not specifically necessary, but helps
  show intent
- miscellaneous formatting

Change-Id: Ib15fe5b37fe6c29c369ad928bdc3a7290cd13c84

src/enc/analysis.c

@@ -35,7 +35,7 @@ static void SmoothSegmentMap(VP8Encoder* const enc) {
   const int w = enc->mb_w_;
   const int h = enc->mb_h_;
   const int majority_cnt_3_x_3_grid = 5;
-  uint8_t* tmp = (uint8_t*)malloc(w * h * sizeof(uint8_t));
+  uint8_t* const tmp = (uint8_t*)malloc(w * h * sizeof(uint8_t));
 
   if (tmp == NULL) return;
   for (y = 1; y < h - 1; ++y) {

src/enc/picture.c

@@ -332,7 +332,7 @@ int WebPPictureRescale(WebPPicture* const pic, int width, int height) {
   tmp.height = height;
   if (!WebPPictureAlloc(&tmp)) return 0;
 
-  work = malloc(2 * width * sizeof(int32_t));
+  work = (int32_t*)malloc(2 * width * sizeof(int32_t));
   if (work == NULL) {
     WebPPictureFree(&tmp);
     return 0;
@@ -697,12 +697,12 @@ int WebPPictureDistortion(const WebPPicture* const pic1,
   for (c = 0; c <= 4; ++c) {
     if (type == 1) {
       const double v = VP8SSIMGet(&stats[c]);
-      result[c] = (v < 1.) ? -10.0 * log10(1. - v)
-                           : kMinDistortion_dB;
+      result[c] = (float)((v < 1.) ? -10.0 * log10(1. - v)
+                                   : kMinDistortion_dB);
     } else {
       const double v = VP8SSIMGetSquaredError(&stats[c]);
-      result[c] = (v > 0.) ? -4.3429448 * log(v / (255 * 255.))
-                           : kMinDistortion_dB;
+      result[c] = (float)((v > 0.) ? -4.3429448 * log(v / (255 * 255.))
+                                   : kMinDistortion_dB);
     }
     // Accumulate forward
     if (c < 4) VP8SSIMAddStats(&stats[c], &stats[4]);

src/enc/vp8enci.h

@@ -323,7 +323,7 @@ void VP8IteratorResetCosts(VP8EncIterator* const it);
 
 typedef struct VP8Tokens VP8Tokens;
 struct VP8Tokens {
-  uint16_t tokens_[MAX_NUM_TOKEN]; // bit#15: bit, bits 0..14: slot
+  uint16_t tokens_[MAX_NUM_TOKEN];  // bit#15: bit, bits 0..14: slot
   int left_;
   VP8Tokens* next_;
 };
@@ -346,13 +346,13 @@ int VP8EmitTokens(const VP8TBuffer* const b, VP8BitWriter* const bw,
 static WEBP_INLINE int VP8AddToken(VP8TBuffer* const b,
                                    int bit, int proba_idx) {
   if (b->left_ > 0 || VP8TBufferNewPage(b)) {
-    const int slot = --b->left_;  
+    const int slot = --b->left_;
     b->tokens_[slot] = (bit << 15) | proba_idx;
   }
   return bit;
 }
 
-#endif
+#endif  // USE_TOKEN_BUFFER
 
 //------------------------------------------------------------------------------
 // VP8Encoder
@@ -501,7 +501,9 @@ void VP8EncDeleteLayer(VP8Encoder* enc);         // reclaim memory
   // in filter.c
 
 // SSIM utils
-typedef struct { double w, xm, ym, xxm, xym, yym; } DistoStats;
+typedef struct {
+  double w, xm, ym, xxm, xym, yym;
+} DistoStats;
 void VP8SSIMAddStats(const DistoStats* const src, DistoStats* const dst);
 void VP8SSIMAccumulatePlane(const uint8_t* src1, int stride1,
                             const uint8_t* src2, int stride2,