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

Merge "DngCreator: Assume square pixel centered at (x+0.5, y+0.5)" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-24 04:50:43 +00:00
committed by Android (Google) Code Review
parent f8c904958b 461f3cf303
commit 5f01dcc5f3
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/jni/android_hardware_camera2_DngCreator.cpp
View File

@@ -1010,9 +1010,10 @@ static inline bool unDistortWithinPreCorrArray(
const float cx, const float cy, const float f, const float cx, const float cy, const float f,
const int preCorrW, const int preCorrH, const int xMin, const int yMin) { const int preCorrW, const int preCorrH, const int xMin, const int yMin) {
undistort(x, y, distortion, cx, cy, f); undistort(x, y, distortion, cx, cy, f);
int xMax = xMin + preCorrW - 1; // xMin and yMin are inclusive, and xMax and yMax are exclusive.
int yMax = yMin + preCorrH - 1; int xMax = xMin + preCorrW;
if (x < xMin || y < yMin || x > xMax || y > yMax) { int yMax = yMin + preCorrH;
if (x < xMin || y < yMin || x >= xMax || y >= yMax) {
return false; return false;
} }
return true; return true;
@@ -1976,7 +1977,6 @@ static sp<TiffWriter> DngCreator_setup(JNIEnv* env, jobject thiz, uint32_t image
if (entry3.count == 5) { if (entry3.count == 5) {
gotDistortion = true; gotDistortion = true;
// Scale the distortion coefficients to create a zoom in warpped image so that all // Scale the distortion coefficients to create a zoom in warpped image so that all
// pixels are drawn within input image. // pixels are drawn within input image.
for (size_t i = 0; i < entry3.count; i++) { for (size_t i = 0; i < entry3.count; i++) {
@@ -1995,8 +1995,8 @@ static sp<TiffWriter> DngCreator_setup(JNIEnv* env, jobject thiz, uint32_t image
preXMin, preYMin); preXMin, preYMin);
} }
float m_x = std::fmaxf(preWidth-1 - cx, cx); float m_x = std::fmaxf(preWidth - cx, cx);
float m_y = std::fmaxf(preHeight-1 - cy, cy); float m_y = std::fmaxf(preHeight - cy, cy);
float m_sq = m_x*m_x + m_y*m_y; float m_sq = m_x*m_x + m_y*m_y;
float m = sqrtf(m_sq); // distance to farthest corner from optical center float m = sqrtf(m_sq); // distance to farthest corner from optical center
float f_sq = f * f; float f_sq = f * f;