Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bad pixel out-of-bounds filter" into pi-dev

Browse Source 
am: c3a7ab321b

Change-Id: I3f1658f81c6735c79511f8544ebdc6212f82a96b
This commit is contained in:
Sam Hasinoff
2018-04-23 13:32:11 -07:00
committed by android-build-merger
parent 0e309f0b97 c3a7ab321b
commit e98cc4ad37
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/android_hardware_camera2_DngCreator.cpp
View File

@@ -1723,13 +1723,13 @@ static sp<TiffWriter> DngCreator_setup(JNIEnv* env, jobject thiz, uint32_t image
// Adjust the bad pixel coordinates to be relative to the origin of the active area DNG tag
std::vector<uint32_t> v;
for (size_t i = 0; i < entry3.count; i+=2) {
for (size_t i = 0; i < entry3.count; i += 2) {
int32_t x = entry3.data.i32[i];
int32_t y = entry3.data.i32[i + 1];
x -= static_cast<int32_t>(xmin);
y -= static_cast<int32_t>(ymin);
if (x < 0 || y < 0 || static_cast<uint32_t>(x) >= width ||
static_cast<uint32_t>(y) >= width) {
static_cast<uint32_t>(y) >= height) {
continue;
}
v.push_back(x);