Use the default resync_to_restart in jpeg.

src/images/SkJpegUtility.cpp

 /*
  * Copyright 2010 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkJpegUtility.h"
 
@@ skipping 72 matching lines @@
             bytesToSkip -= bytes;
         }
         src->next_input_byte = (const JOCTET*)src->fBuffer;
         src->bytes_in_buffer = 0;
     } else {
         src->next_input_byte += num_bytes;
         src->bytes_in_buffer -= num_bytes;
     }
 }
 
-static boolean sk_resync_to_restart(j_decompress_ptr cinfo, int desired) {
-    skjpeg_source_mgr*  src = (skjpeg_source_mgr*)cinfo->src;
-
-    // what is the desired param for???
-
-    if (!src->fStream->rewind()) {
-        SkDebugf("xxxxxxxxxxxxxx failure to rewind\n");
-        cinfo->err->error_exit((j_common_ptr)cinfo);
-        return FALSE;
-    }
-    src->next_input_byte = (const JOCTET*)src->fBuffer;
-    src->bytes_in_buffer = 0;
-    return TRUE;
-}
-
 static void sk_term_source(j_decompress_ptr /*cinfo*/) {}
 
 
 ///////////////////////////////////////////////////////////////////////////////
 
 skjpeg_source_mgr::skjpeg_source_mgr(SkStream* stream, SkImageDecoder* decoder)
     : fStream(SkRef(stream))
     , fDecoder(decoder) {
 
     init_source = sk_init_source;
     fill_input_buffer = sk_fill_input_buffer;
     skip_input_data = sk_skip_input_data;
-    resync_to_restart = sk_resync_to_restart;
+    resync_to_restart = jpeg_resync_to_restart;
     term_source = sk_term_source;
 #ifdef SK_BUILD_FOR_ANDROID
     seek_input_data = sk_seek_input_data;
 #endif
 //    SkDebugf("**************** use memorybase %p %d\n", fMemoryBase, fMemoryBaseSize);
 }
 
 skjpeg_source_mgr::~skjpeg_source_mgr() {
     SkSafeUnref(fStream);
 }
@@ skipping 45 matching lines @@
 void skjpeg_error_exit(j_common_ptr cinfo) {
     skjpeg_error_mgr* error = (skjpeg_error_mgr*)cinfo->err;
 
     (*error->output_message) (cinfo);
 
     /* Let the memory manager delete any temp files before we die */
     jpeg_destroy(cinfo);
 
     longjmp(error->fJmpBuf, -1);
 }