diff --git a/samples/android/native-activity/.cproject b/samples/android/native-activity/.cproject
index 09687f3ac0..44aadfe9af 100644
--- a/samples/android/native-activity/.cproject
+++ b/samples/android/native-activity/.cproject
@@ -1,75 +1,61 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/android/native-activity/.project b/samples/android/native-activity/.project
index cf0823c0b3..c20be83f60 100644
--- a/samples/android/native-activity/.project
+++ b/samples/android/native-activity/.project
@@ -5,6 +5,64 @@
+
+ org.eclipse.cdt.managedbuilder.core.genmakebuilder
+ auto,full,incremental,
+
+
+ ?name?
+
+
+
+ org.eclipse.cdt.make.core.append_environment
+ true
+
+
+ org.eclipse.cdt.make.core.autoBuildTarget
+
+
+
+ org.eclipse.cdt.make.core.buildArguments
+
+
+
+ org.eclipse.cdt.make.core.buildCommand
+ "${NDKROOT}/ndk-build.cmd"
+
+
+ org.eclipse.cdt.make.core.cleanBuildTarget
+ clean
+
+
+ org.eclipse.cdt.make.core.contents
+ org.eclipse.cdt.make.core.activeConfigSettings
+
+
+ org.eclipse.cdt.make.core.enableAutoBuild
+ true
+
+
+ org.eclipse.cdt.make.core.enableCleanBuild
+ false
+
+
+ org.eclipse.cdt.make.core.enableFullBuild
+ true
+
+
+ org.eclipse.cdt.make.core.fullBuildTarget
+
+
+
+ org.eclipse.cdt.make.core.stopOnError
+ true
+
+
+ org.eclipse.cdt.make.core.useDefaultBuildCmd
+ false
+
+
+
com.android.ide.eclipse.adt.ResourceManagerBuilder
@@ -25,9 +83,19 @@
+
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder
+ full,incremental,
+
+
+
com.android.ide.eclipse.adt.AndroidNature
org.eclipse.jdt.core.javanature
+ org.eclipse.cdt.core.cnature
+ org.eclipse.cdt.core.ccnature
+ org.eclipse.cdt.managedbuilder.core.managedBuildNature
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigNature
diff --git a/samples/android/native-activity/jni/native.cpp b/samples/android/native-activity/jni/native.cpp
index 66bc006db1..5cfb3a9611 100644
--- a/samples/android/native-activity/jni/native.cpp
+++ b/samples/android/native-activity/jni/native.cpp
@@ -9,7 +9,6 @@
#include
#include
#include
-#include
#include
#include
@@ -60,7 +59,7 @@ static cv::Size calc_optimal_camera_resolution(const char* supported, int width,
}
}
- idx++; // to skip coma symbol
+ idx++; // to skip comma symbol
} while(supported[idx-1] != '\0');
@@ -86,9 +85,9 @@ static void engine_draw_frame(Engine* engine, const cv::Mat& frame)
for (int yy = top_indent; yy < std::min(frame.rows+top_indent, buffer.height); yy++)
{
- unsigned char* line = (unsigned char*)pixels;
- memcpy(line+left_indent*4*sizeof(unsigned char), frame.ptr(yy),
- std::min(frame.cols, buffer.width)*4*sizeof(unsigned char));
+ unsigned char* line = (unsigned char*)pixels + left_indent*4*sizeof(unsigned char);
+ size_t line_size = std::min(frame.cols, buffer.width)*4*sizeof(unsigned char);
+ memcpy(line, frame.ptr(yy), line_size);
// go to next line
pixels = (int32_t*)pixels + buffer.stride;
}
@@ -139,7 +138,7 @@ static void engine_handle_cmd(android_app* app, int32_t cmd)
return;
}
- LOGI("Camera initialized at resoution %dx%d", camera_resolution.width, camera_resolution.height);
+ LOGI("Camera initialized at resolution %dx%d", camera_resolution.width, camera_resolution.height);
}
break;
case APP_CMD_TERM_WINDOW:
@@ -157,7 +156,8 @@ void android_main(android_app* app)
// Make sure glue isn't stripped.
app_dummy();
- memset(&engine, 0, sizeof(engine));
+ size_t engine_size = sizeof(engine); // for Eclipse CDT parser
+ memset((void*)&engine, 0, engine_size);
app->userData = &engine;
app->onAppCmd = engine_handle_cmd;
engine.app = app;