diff options
| author | Michael Bestas <mikeioannina@cyanogenmod.org> | 2016-01-09 05:23:08 +0200 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-11-02 12:22:28 -0700 |
| commit | c367479fc9c3357f3375751a6e9beada46dfb583 (patch) | |
| tree | fd622f8f0f38d5897bf01e575f03bb7d24ab1ca1 | |
| parent | 9a68e2a7671baa7d09a562221e1fb74e51a11fe4 (diff) | |
| download | android_packages_apps_Snap-c367479fc9c3357f3375751a6e9beada46dfb583.tar.gz android_packages_apps_Snap-c367479fc9c3357f3375751a6e9beada46dfb583.tar.bz2 android_packages_apps_Snap-c367479fc9c3357f3375751a6e9beada46dfb583.zip | |
Snap: Fix jni compiler warnings
Change-Id: I091a8928a9a0674c54759ff8b384259d8f16793e
| -rw-r--r-- | jni/Android.mk | 4 | ||||
| -rw-r--r-- | jni/feature_mos/src/mosaic/Log.h | 2 | ||||
| -rw-r--r-- | jni/feature_stab/src/dbreg/dbstabsmooth.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 81329a0a4..436ad2b10 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -9,7 +9,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/feature_mos/src \ $(LOCAL_PATH)/feature_mos/src/mosaic -LOCAL_CFLAGS := -O3 -DNDEBUG -fstrict-aliasing +LOCAL_CFLAGS := -O3 -DNDEBUG -fstrict-aliasing -Wno-unused-parameter LOCAL_SRC_FILES := \ feature_mos_jni.cpp \ @@ -58,7 +58,7 @@ LOCAL_SDK_VERSION := 9 LOCAL_MODULE := libjni_snaptinyplanet LOCAL_SRC_FILES := tinyplanet.cc -LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops +LOCAL_CFLAGS := -ffast-math -O3 -funroll-loops -Wno-unused-parameter LOCAL_ARM_MODE := arm include $(BUILD_SHARED_LIBRARY) diff --git a/jni/feature_mos/src/mosaic/Log.h b/jni/feature_mos/src/mosaic/Log.h index cf6f14b18..52bc1d4c6 100644 --- a/jni/feature_mos/src/mosaic/Log.h +++ b/jni/feature_mos/src/mosaic/Log.h @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef LOG_H_ +#ifndef LOG_H #define LOG_H #include <android/log.h> diff --git a/jni/feature_stab/src/dbreg/dbstabsmooth.cpp b/jni/feature_stab/src/dbreg/dbstabsmooth.cpp index dffff8ab1..2bb5d2e50 100644 --- a/jni/feature_stab/src/dbreg/dbstabsmooth.cpp +++ b/jni/feature_stab/src/dbreg/dbstabsmooth.cpp @@ -136,7 +136,7 @@ bool db_StabilizationSmoother::smoothMotionAdaptive(/*VP_BIMG *bimg,*/int hsize, smoothFactor = minSmoothFactor; // Find the amount of motion that must be compensated so that no "border" pixels are seen in the stable video - for (smoothFactor = smoothFactor; smoothFactor >= minSmoothFactor; smoothFactor -= 0.01) { + for (; smoothFactor >= minSmoothFactor; smoothFactor -= 0.01) { // Compute the smoothed motion if(!smoothMotion(inmot, &tmpMotion, smoothFactor)) break; |