diff options
author | jinwu <jinwu@codeaurora.org> | 2018-02-09 14:54:16 +0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-02-28 18:47:19 -0800 |
commit | 8045fd4cefcf34a83f791459730481f00b91091d (patch) | |
tree | 2b8acd16b3e84b08807a01f86adf72d68ed92dfd /jni/feature_mos/src/mosaic | |
parent | 16988fb8cc67b0768e11313e48043575ac67e545 (diff) | |
download | android_packages_apps_Snap-8045fd4cefcf34a83f791459730481f00b91091d.tar.gz android_packages_apps_Snap-8045fd4cefcf34a83f791459730481f00b91091d.tar.bz2 android_packages_apps_Snap-8045fd4cefcf34a83f791459730481f00b91091d.zip |
Fix compiling warnings
Change-Id: I4cb217a4283c5234e62f8b895b5aa662c04fb9a2
Diffstat (limited to 'jni/feature_mos/src/mosaic')
-rw-r--r-- | jni/feature_mos/src/mosaic/Blend.cpp | 21 | ||||
-rw-r--r-- | jni/feature_mos/src/mosaic/Delaunay.cpp | 2 | ||||
-rw-r--r-- | jni/feature_mos/src/mosaic/ImageUtils.cpp | 7 | ||||
-rw-r--r-- | jni/feature_mos/src/mosaic/Log.h | 2 | ||||
-rw-r--r-- | jni/feature_mos/src/mosaic/trsMatrix.cpp | 2 |
5 files changed, 11 insertions, 23 deletions
diff --git a/jni/feature_mos/src/mosaic/Blend.cpp b/jni/feature_mos/src/mosaic/Blend.cpp index 8e8ca6749..3672a878e 100644 --- a/jni/feature_mos/src/mosaic/Blend.cpp +++ b/jni/feature_mos/src/mosaic/Blend.cpp @@ -142,10 +142,7 @@ int Blend::runBlend(MosaicFrame **oframes, MosaicFrame **rframes, global_rect.lft = global_rect.bot = 2e30; // min values global_rect.rgt = global_rect.top = -2e30; // max values MosaicFrame *mb = NULL; - double halfwidth = width / 2.0; - double halfheight = height / 2.0; - - double z, x0, y0, x1, y1, x2, y2, x3, y3; + double x0, y0, x1, y1, x2, y2, x3, y3; // Corners of the left-most and right-most frames respectively in the // mosaic coordinate system. @@ -380,6 +377,9 @@ int Blend::DoMergeAndBlend(MosaicFrame **frames, int nsite, int width, int height, YUVinfo &imgMos, MosaicRect &rect, MosaicRect &cropping_rect, float &progress, bool &cancelComputation) { + (void)frames; + (void)width; + (void)height; m_pMosaicYPyr = NULL; m_pMosaicUPyr = NULL; m_pMosaicVPyr = NULL; @@ -655,9 +655,6 @@ int Blend::PerformFinalBlending(YUVinfo &imgMos, MosaicRect &cropping_rect) ImageType uimg; ImageType vimg; - int cx = (int)imgMos.Y.width/2; - int cy = (int)imgMos.Y.height/2; - // 2D boolean array that contains true wherever the mosaic image data is // invalid (i.e. in the gray border). bool **b = new bool*[imgMos.Y.height]; @@ -807,7 +804,7 @@ int Blend::PerformFinalBlending(YUVinfo &imgMos, MosaicRect &cropping_rect) delete b[j]; } - delete b; + delete[] b; return BLEND_RET_OK; } @@ -826,7 +823,6 @@ void Blend::ComputeMask(CSite *csite, BlendRect &vcrect, BlendRect &brect, Mosai { PyramidShort *dptr = m_pMosaicYPyr; - int nC = m_wb.nlevsC; int l = (int) ((vcrect.lft - rect.left)); int b = (int) ((vcrect.bot - rect.top)); int r = (int) ((vcrect.rgt - rect.left)); @@ -872,7 +868,6 @@ void Blend::ComputeMask(CSite *csite, BlendRect &vcrect, BlendRect &brect, Mosai continue; // scan the neighbors to see if this is a valid position - unsigned char mask = (unsigned char) 255; SEdgeVector *ce; int ecnt; for (ce = csite->getNeighbor(), ecnt = csite->getNumNeighbors(); ecnt--; ce++) @@ -894,6 +889,7 @@ void Blend::ComputeMask(CSite *csite, BlendRect &vcrect, BlendRect &brect, Mosai void Blend::ProcessPyramidForThisFrame(CSite *csite, BlendRect &vcrect, BlendRect &brect, MosaicRect &rect, YUVinfo &imgMos, double trs[3][3], int site_idx) { + (void)csite; // Put the Region of interest (for all levels) into m_pMosaicYPyr double inv_trs[3][3]; inv33d(trs, inv_trs); @@ -1221,8 +1217,6 @@ void Blend::SelectRelevantFrames(MosaicFrame **frames, int frames_size, MosaicFrame *last = frames[frames_size-1]; MosaicFrame *mb; - double fxpos = first->trs[0][2], fypos = first->trs[1][2]; - double midX = last->width / 2.0; double midY = last->height / 2.0; double z = ProjZ(first->trs, midX, midY, 1.0); @@ -1242,7 +1236,6 @@ void Blend::SelectRelevantFrames(MosaicFrame **frames, int frames_size, currY = ProjY(mb->trs, midX, midY, z, 1.0); double deltaX = currX - prevX; double deltaY = currY - prevY; - double center2centerDist = sqrt(deltaY * deltaY + deltaX * deltaX); if (fabs(deltaX) > STRIP_SEPARATION_THRESHOLD_PXLS || fabs(deltaY) > STRIP_SEPARATION_THRESHOLD_PXLS) @@ -1329,7 +1322,7 @@ void Blend::ComputeBlendParameters(MosaicFrame **frames, int frames_size, int is double dy = prevY - firstY; // If the mosaic was captured by sweeping horizontally - if (abs(lxpos - fxpos) > abs(lypos - fypos)) + if (fabs(lxpos - fxpos) > fabs(lypos - fypos)) { m_wb.horizontal = 1; // Calculate radius position to make ends exactly the same Y offset diff --git a/jni/feature_mos/src/mosaic/Delaunay.cpp b/jni/feature_mos/src/mosaic/Delaunay.cpp index 0ce09fc51..e8015dfd6 100644 --- a/jni/feature_mos/src/mosaic/Delaunay.cpp +++ b/jni/feature_mos/src/mosaic/Delaunay.cpp @@ -492,8 +492,6 @@ int CDelaunay::incircle(SitePointer a, SitePointer b, SitePointer c, SitePointer // TRUE iff A, B, C form a counterclockwise oriented triangle int CDelaunay::ccw(SitePointer a, SitePointer b, SitePointer c) { - int result; - double ax = sa[a].X(); double bx = sa[b].X(); double cx = sa[c].X(); diff --git a/jni/feature_mos/src/mosaic/ImageUtils.cpp b/jni/feature_mos/src/mosaic/ImageUtils.cpp index 82c2673cd..0173be44d 100644 --- a/jni/feature_mos/src/mosaic/ImageUtils.cpp +++ b/jni/feature_mos/src/mosaic/ImageUtils.cpp @@ -117,8 +117,7 @@ void ImageUtils::rgb2yvu(ImageType out, ImageType in, int width, int height) ImageType ImageUtils::rgb2gray(ImageType in, int width, int height) { - int r,g,b, nr, ng, nb, val; - ImageType gray = NULL; + int r,g,b; ImageType image = in; ImageType out = ImageUtils::allocateImage(width, height, 1); ImageType outCopy = out; @@ -147,8 +146,7 @@ ImageType ImageUtils::rgb2gray(ImageType in, int width, int height) ImageType ImageUtils::rgb2gray(ImageType out, ImageType in, int width, int height) { - int r,g,b, nr, ng, nb, val; - ImageType gray = out; + int r,g,b; ImageType image = in; ImageType outCopy = out; @@ -334,6 +332,7 @@ void ImageUtils::writeBinaryPPM(ImageType image, const char *filename, int width ImageType ImageUtils::allocateImage(int width, int height, int numChannels, short int border) { + (void)border; int overallocation = 256; return (ImageType) calloc(width*height*numChannels+overallocation, sizeof(ImageTypeBase)); } diff --git a/jni/feature_mos/src/mosaic/Log.h b/jni/feature_mos/src/mosaic/Log.h index cf6f14b18..2adfeda9c 100644 --- a/jni/feature_mos/src/mosaic/Log.h +++ b/jni/feature_mos/src/mosaic/Log.h @@ -14,7 +14,7 @@ * limitations under the License. */ #ifndef LOG_H_ -#define LOG_H +#define LOG_H_ #include <android/log.h> #define LOGV(...) __android_log_print(ANDROID_LOG_SILENT, LOG_TAG, __VA_ARGS__) diff --git a/jni/feature_mos/src/mosaic/trsMatrix.cpp b/jni/feature_mos/src/mosaic/trsMatrix.cpp index 5fc6a86b3..aa5aadc6b 100644 --- a/jni/feature_mos/src/mosaic/trsMatrix.cpp +++ b/jni/feature_mos/src/mosaic/trsMatrix.cpp @@ -40,8 +40,6 @@ void mult33d(double a[3][3], double b[3][3], double c[3][3]) // return: result if successful int normProjMat33d(double m[3][3]) { - double m22; - if(m[2][2] == 0.0) { return 0; |