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 
am: 5f01dcc5f3

Change-Id: I8ba569669290b4d964a38823652bb3cadb0518e4
This commit is contained in:
Shuzhen Wang
2019-04-23 22:11:37 -07:00
committed by android-build-merger
parent e572e48b16 5f01dcc5f3
commit 6e9a902720
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 int preCorrW, const int preCorrH, const int xMin, const int yMin) {
undistort(x, y, distortion, cx, cy, f);
int xMax = xMin + preCorrW - 1;
int yMax = yMin + preCorrH - 1;
if (x < xMin || y < yMin || x > xMax || y > yMax) {
// xMin and yMin are inclusive, and xMax and yMax are exclusive.
int xMax = xMin + preCorrW;
int yMax = yMin + preCorrH;
if (x < xMin || y < yMin || x >= xMax || y >= yMax) {
return false;
}
return true;
@@ -1976,7 +1977,6 @@ static sp<TiffWriter> DngCreator_setup(JNIEnv* env, jobject thiz, uint32_t image
if (entry3.count == 5) {
gotDistortion = true;
// Scale the distortion coefficients to create a zoom in warpped image so that all
// pixels are drawn within input image.
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);
}
float m_x = std::fmaxf(preWidth-1 - cx, cx);
float m_y = std::fmaxf(preHeight-1 - cy, cy);
float m_x = std::fmaxf(preWidth - cx, cx);
float m_y = std::fmaxf(preHeight - cy, cy);
float m_sq = m_x*m_x + m_y*m_y;
float m = sqrtf(m_sq); // distance to farthest corner from optical center
float f_sq = f * f;