summaryrefslogtreecommitdiffstats
path: root/jni
diff options
context:
space:
mode:
Diffstat (limited to 'jni')
-rwxr-xr-xjni/Android.mk4
-rw-r--r--jni/feature_mos/src/mosaic/Log.h2
-rw-r--r--jni/feature_stab/src/dbreg/dbstabsmooth.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/jni/Android.mk b/jni/Android.mk
index b052c09..91b3184 100755
--- 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 cf6f14b..52bc1d4 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 dffff8a..2bb5d2e 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;