diff options
Diffstat (limited to 'jni/feature_mos/src')
-rw-r--r-- | jni/feature_mos/src/mosaic/AlignFeatures.cpp | 2 | ||||
-rw-r--r-- | jni/feature_mos/src/mosaic/AlignFeatures.h | 2 | ||||
-rw-r--r-- | jni/feature_mos/src/mosaic/Blend.cpp | 4 | ||||
-rw-r--r-- | jni/feature_mos/src/mosaic/Blend.h | 4 | ||||
-rw-r--r-- | jni/feature_mos/src/mosaic/ImageUtils.cpp | 2 | ||||
-rw-r--r-- | jni/feature_mos/src/mosaic/ImageUtils.h | 2 |
6 files changed, 12 insertions, 4 deletions
diff --git a/jni/feature_mos/src/mosaic/AlignFeatures.cpp b/jni/feature_mos/src/mosaic/AlignFeatures.cpp index aeabf8f97..9d7ce7f14 100644 --- a/jni/feature_mos/src/mosaic/AlignFeatures.cpp +++ b/jni/feature_mos/src/mosaic/AlignFeatures.cpp @@ -30,6 +30,8 @@ #define LOG_TAG "AlignFeatures" +const double Align::DEFAULT_MAX_DISPARITY=0.1;//0.4; + Align::Align() { width = height = 0; diff --git a/jni/feature_mos/src/mosaic/AlignFeatures.h b/jni/feature_mos/src/mosaic/AlignFeatures.h index 19f39051d..68894ff3d 100644 --- a/jni/feature_mos/src/mosaic/AlignFeatures.h +++ b/jni/feature_mos/src/mosaic/AlignFeatures.h @@ -44,7 +44,7 @@ public: ///// Settings for feature-based alignment // Number of features to use from corner detection static const int DEFAULT_NR_CORNERS=750; - static const double DEFAULT_MAX_DISPARITY=0.1;//0.4; + static const double DEFAULT_MAX_DISPARITY; // Type of homography to model static const int DEFAULT_MOTION_MODEL=DB_HOMOGRAPHY_TYPE_R_T; // static const int DEFAULT_MOTION_MODEL=DB_HOMOGRAPHY_TYPE_PROJECTIVE; diff --git a/jni/feature_mos/src/mosaic/Blend.cpp b/jni/feature_mos/src/mosaic/Blend.cpp index fce89c6e1..8e8ca6749 100644 --- a/jni/feature_mos/src/mosaic/Blend.cpp +++ b/jni/feature_mos/src/mosaic/Blend.cpp @@ -29,6 +29,10 @@ #include "Log.h" #define LOG_TAG "BLEND" +const float Blend::LIMIT_SIZE_MULTIPLIER = 5.0f * 2.0f; + +const float Blend::LIMIT_HEIGHT_MULTIPLIER = 2.5f; + Blend::Blend() { m_wb.blendingType = BLEND_TYPE_NONE; diff --git a/jni/feature_mos/src/mosaic/Blend.h b/jni/feature_mos/src/mosaic/Blend.h index 2c7ee5c5f..175eacd4a 100644 --- a/jni/feature_mos/src/mosaic/Blend.h +++ b/jni/feature_mos/src/mosaic/Blend.h @@ -119,8 +119,8 @@ protected: void CropFinalMosaic(YUVinfo &imgMos, MosaicRect &cropping_rect); private: - static const float LIMIT_SIZE_MULTIPLIER = 5.0f * 2.0f; - static const float LIMIT_HEIGHT_MULTIPLIER = 2.5f; + static const float LIMIT_SIZE_MULTIPLIER; + static const float LIMIT_HEIGHT_MULTIPLIER; int MosaicSizeCheck(float sizeMultiplier, float heightMultiplier); void RoundingCroppingSizeToMultipleOf8(MosaicRect& rect); }; diff --git a/jni/feature_mos/src/mosaic/ImageUtils.cpp b/jni/feature_mos/src/mosaic/ImageUtils.cpp index 6d0aac0c1..82c2673cd 100644 --- a/jni/feature_mos/src/mosaic/ImageUtils.cpp +++ b/jni/feature_mos/src/mosaic/ImageUtils.cpp @@ -25,6 +25,8 @@ #include "ImageUtils.h" +const ImageType ImageUtils::IMAGE_TYPE_NOIMAGE = 0; + void ImageUtils::rgba2yvu(ImageType out, ImageType in, int width, int height) { int r,g,b, a; diff --git a/jni/feature_mos/src/mosaic/ImageUtils.h b/jni/feature_mos/src/mosaic/ImageUtils.h index 92965ca81..9c6066815 100644 --- a/jni/feature_mos/src/mosaic/ImageUtils.h +++ b/jni/feature_mos/src/mosaic/ImageUtils.h @@ -47,7 +47,7 @@ public: /** * Definition of an empty image. */ - static const int IMAGE_TYPE_NOIMAGE = 0; + static const ImageType IMAGE_TYPE_NOIMAGE; /** * Convert image from BGR (interlaced) to YVU (non-interlaced) |