diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-08-06 11:43:02 -0700 |
---|---|---|
committer | Sascha Haeberling <haeberling@google.com> | 2013-08-06 11:43:02 -0700 |
commit | 8e963a5a6016d246184ed65906f9d103e92b17e2 (patch) | |
tree | 02eb244ea4a20d9aa8e43916a40b876be8935d11 /jni_jpegstream/src/jerr_hook.cpp | |
parent | 4fc90b07dcf316c7ce6c5313af8202e84bc85603 (diff) | |
download | android_packages_apps_Snap-8e963a5a6016d246184ed65906f9d103e92b17e2.tar.gz android_packages_apps_Snap-8e963a5a6016d246184ed65906f9d103e92b17e2.tar.bz2 android_packages_apps_Snap-8e963a5a6016d246184ed65906f9d103e92b17e2.zip |
This removes all non-Camera stuff from Camera2.
Note: Camera2 is a clone of Gallery2 right now.
Note 2: I will bring .mk files back later.
Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc
Diffstat (limited to 'jni_jpegstream/src/jerr_hook.cpp')
-rw-r--r-- | jni_jpegstream/src/jerr_hook.cpp | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/jni_jpegstream/src/jerr_hook.cpp b/jni_jpegstream/src/jerr_hook.cpp deleted file mode 100644 index f8f864f78..000000000 --- a/jni_jpegstream/src/jerr_hook.cpp +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -#include "jerr_hook.h" -#include "jni_defines.h" - -/** - * Replaces libjpeg's error_exit function, returns control to - * the point - */ -void ErrExit(j_common_ptr cinfo) { - ErrManager* mgr = reinterpret_cast<ErrManager*>(cinfo->err); - (*cinfo->err->output_message) (cinfo); - // Returns control to error handling in jpeg_writer - longjmp(mgr->setjmp_buf, 1); -} - -/** - * Replaces libjpeg's output_message function, writes message - * to logcat's error log. - */ -void ErrOutput(j_common_ptr cinfo) { - ErrManager* mgr = reinterpret_cast<ErrManager*>(cinfo->err); - char buf[JMSG_LENGTH_MAX]; - (*cinfo->err->format_message) (cinfo, buf); - buf[JMSG_LENGTH_MAX - 1] = '\0'; // Force null terminator - // Output error message in ndk logcat. - LOGE("%s\n", buf); -} - -void SetupErrMgr(j_common_ptr cinfo, ErrManager* errMgr) { - jpeg_std_error(&(errMgr->mgr)); - errMgr->mgr.error_exit = ErrExit; - errMgr->mgr.output_message = ErrOutput; - cinfo->err = reinterpret_cast<struct jpeg_error_mgr*>(errMgr); -} - - |