libwebp.jar: build w/Java 1.6 for Android compat

broken since:
 a5c297c swig/java: reduce wrapper function code duplication

this was a part of v0.3.1, but not v0.3.0.

Change-Id: I001d4bd0a7a1aa1b2d267bc63bc1d8226bff00c1
(cherry picked from commit de899516c7)

ChangeLog

@@ -1,3 +1,7 @@
+7288950 Regression fix for alpha channels using color cache:
+2e377b5 wicdec: silence a format warning
+ad9e42a muxedit: silence some uninitialized warnings
+825e73b update ChangeLog
 abf6f69 update NEWS
 5a92c1a bump version to 0.3.1
 67bc353 Revert "add WebPBlendAlpha() function to blend colors against background"

examples/wicdec.c

@@ -128,7 +128,7 @@ static HRESULT ExtractICCP(IWICImagingFactory* const factory,
                                                &size));
           if (SUCCEEDED(hr) && size != iccp->size) {
             fprintf(stderr, "Warning! ICC profile size (%u) != expected (%u)\n",
-                    size, iccp->size);
+                    size, (uint32_t)iccp->size);
             iccp->size = size;
           }
           break;

src/dec/idec.c

@@ -606,6 +606,10 @@ void WebPIDelete(WebPIDecoder* idec) {
   if (idec == NULL) return;
   if (idec->dec_ != NULL) {
     if (!idec->is_lossless_) {
+      if (idec->state_ == STATE_VP8_DATA) {
+        // Synchronize the thread, clean-up and check for errors.
+        VP8ExitCritical(idec->dec_, &idec->io_);
+      }
       VP8Delete(idec->dec_);
     } else {
       VP8LDelete(idec->dec_);

src/dec/vp8l.c

@@ -1142,11 +1142,12 @@ int VP8LDecodeAlphaImageStream(int width, int height, const uint8_t* const data,
   dec->action_ = READ_HDR;
   if (!DecodeImageStream(width, height, 1, dec, NULL)) goto Err;
 
-  // Special case: if alpha data contains only the color indexing transform
-  // (a frequent case), we will use DecodeAlphaData() method that only needs
-  // allocation of 1 byte per pixel (alpha channel).
+  // Special case: if alpha data uses only the color indexing transform and
+  // doesn't use color cache (a frequent case), we will use DecodeAlphaData()
+  // method that only needs allocation of 1 byte per pixel (alpha channel).
   if (dec->next_transform_ == 1 &&
-      dec->transforms_[0].type_ == COLOR_INDEXING_TRANSFORM) {
+      dec->transforms_[0].type_ == COLOR_INDEXING_TRANSFORM &&
+      dec->hdr_.color_cache_size_ == 0) {
     bytes_per_pixel = sizeof(uint8_t);
   }
 

src/mux/muxedit.c

@@ -477,7 +477,7 @@ static WebPMuxError GetImageCanvasWidthHeight(
     int64_t image_area = 0;
     // Aggregate the bounding box for animation frames & fragmented images.
     for (; wpi != NULL; wpi = wpi->next_) {
-      int x_offset, y_offset, duration, w, h;
+      int x_offset = 0, y_offset = 0, duration = 0, w = 0, h = 0;
       const WebPMuxError err = GetImageInfo(wpi, &x_offset, &y_offset,
                                             &duration, &w, &h);
       const int max_x_pos = x_offset + w;