commit 228f2b8887ab63532cbe0b7b64e66c133f45d45a
author scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Sep 25 21:27:31 2013 +0000
committer scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Sep 25 21:27:31 2013 +0000
tree e1f64d6117afb465017fbacbe1bb0ab20a8a72b7
parent a93489986789bdf109064884bb940ced71110349

Print a better error message.

Use format_message to print the proper error message in JPEG decoder.

R=mtklein@google.com

Review URL: https://codereview.chromium.org/24461002

git-svn-id: http://skia.googlecode.com/svn/trunk@11459 2bbb7eff-a529-9590-31e7-b0007b416f81

src/images/SkImageDecoder_libjpeg.cpp

diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp
index d50e4eb..107441b 100644
--- a/src/images/SkImageDecoder_libjpeg.cpp
+++ b/src/images/SkImageDecoder_libjpeg.cpp
@@ -285,11 +285,12 @@
 // This guy exists just to aid in debugging, as it allows debuggers to just
 // set a break-point in one place to see all error exists.
 static bool return_false(const jpeg_decompress_struct& cinfo,
-                         const SkBitmap& bm, const char msg[]) {
+                         const SkBitmap& bm, const char caller[]) {
 #ifdef SK_DEBUG
+    char buffer[JMSG_LENGTH_MAX];
+    cinfo.err->format_message((const j_common_ptr)&cinfo, buffer);
     SkDebugf("libjpeg error %d <%s> from %s [%d %d]\n", cinfo.err->msg_code,
-             cinfo.err->jpeg_message_table[cinfo.err->msg_code], msg,
-             bm.width(), bm.height());
+             buffer, caller, bm.width(), bm.height());
 #endif
     return false;   // must always return false
 }