Skip to content

Commit 8442d59

Browse files
vkocheryzhkinvkocheryzhkin
committed
fix load dir
1 parent cf3db1e commit 8442d59

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

‎visionSamples/FaceTracker/app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ android {
99
storePassword 'test123321'
1010
}
1111
}
12-
compileSdkVersion 27
12+
compileSdkVersion 23
1313
buildToolsVersion '27.0.3'
1414
defaultConfig {
1515
applicationId "com.google.android.gms.samples.vision.face.facetracker"
16-
minSdkVersion 19
17-
targetSdkVersion 27
16+
minSdkVersion 15
17+
targetSdkVersion 23
1818
versionCode 1
1919
versionName "1.0"
2020
externalNativeBuild {
@@ -80,8 +80,8 @@ dependencies {
8080
androidTestImplementation 'com.android.support.test:rules:1.0.2'
8181
androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
8282
implementation fileTree(include: ['*.jar'], dir: 'libs')
83-
implementation 'com.android.support:support-v4:27.1.1'
84-
implementation 'com.android.support:design:27.1.1'
83+
implementation 'com.android.support:support-v4:23.4.0'
84+
implementation 'com.android.support:design:23.4.0'
8585
implementation 'com.google.android.gms:play-services-vision:9.4.0+'
8686
implementation 'com.shamanland:xdroid-toaster:0.2.4'
8787
}

‎visionSamples/FaceTracker/app/src/main/cpp/native-lib.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -82,30 +82,30 @@ Java_com_google_android_gms_samples_vision_face_facetracker_FaceTrackerActivity_
8282
{
8383

8484
LOGI("load resource");
85-
FILE *file1 = fopen("/storage/emulated/0/Movies/shape_predictor_5_face_landmarks.dat", "r+");
86-
FILE *file2 = fopen("/storage/emulated/0/Movies/dlib_face_recognition_resnet_model_v1.dat",
85+
FILE *file1 = fopen("/storage/emulated/0/Download/shape_predictor_5_face_landmarks.dat", "r+");
86+
FILE *file2 = fopen("/storage/emulated/0/Download/dlib_face_recognition_resnet_model_v1.dat",
8787
"r+");
8888
//FILE *file3 = fopen("/storage/emulated/0/Movies/faces_linear.svm", "r+");
8989

9090
if (file1 != NULL && file2 != NULL ) {
9191
fclose(file1);
9292
fclose(file2);
9393
//fclose(file3);
94-
dlib::deserialize("/storage/emulated/0/Movies/shape_predictor_5_face_landmarks.dat")
94+
dlib::deserialize("/storage/emulated/0/Download/shape_predictor_5_face_landmarks.dat")
9595
>> sp;
96-
dlib::deserialize("/storage/emulated/0/Movies/shape_predictor_5_face_landmarks.dat")
96+
dlib::deserialize("/storage/emulated/0/Download/shape_predictor_5_face_landmarks.dat")
9797
>> sp1;
98-
dlib::deserialize("/storage/emulated/0/Movies/dlib_face_recognition_resnet_model_v1.dat")
98+
dlib::deserialize("/storage/emulated/0/Download/dlib_face_recognition_resnet_model_v1.dat")
9999
>> net;
100-
dlib::deserialize("/storage/emulated/0/Movies/dlib_face_recognition_resnet_model_v1.dat")
100+
dlib::deserialize("/storage/emulated/0/Download/dlib_face_recognition_resnet_model_v1.dat")
101101
>> net1;
102102
//dlib::deserialize("/storage/emulated/0/Download/faces_linear.svm") >> df;
103103

104104
DIR *d;
105105
char *p1,*p2;
106106
int ret;
107107
struct dirent *dir;
108-
d = opendir("/storage/emulated/0/Movies");
108+
d = opendir("/storage/emulated/0/Download");
109109
if (d)
110110
{
111111
// LOGI("Loading feature vectors using *.vec", p1); AL: p1 not initialized
@@ -121,7 +121,7 @@ Java_com_google_android_gms_samples_vision_face_facetracker_FaceTrackerActivity_
121121
std::string name = std::string(p1);
122122
std::string file = name + ".vec";
123123
matrix<float, 0, 1> face_vector;
124-
dlib::deserialize("/storage/emulated/0/Movies/" + file) >> face_vector;
124+
dlib::deserialize("/storage/emulated/0/Download/" + file) >> face_vector;
125125
known_faces.insert({name, face_vector});
126126
}
127127
}
@@ -141,23 +141,23 @@ JNIEXPORT jint JNICALL
141141
Java_dlib_android_FaceRecognizer_loadResourcesPart1(JNIEnv *env, jobject instance) {
142142

143143
LOGI("load resource part1");
144-
FILE *file1 = fopen("/storage/emulated/0/Movies/shape_predictor_5_face_landmarks.dat", "r+");
145-
FILE *file2 = fopen("/storage/emulated/0/Movies/dlib_face_recognition_resnet_model_v1.dat",
144+
FILE *file1 = fopen("/storage/emulated/0/Download/shape_predictor_5_face_landmarks.dat", "r+");
145+
FILE *file2 = fopen("/storage/emulated/0/Download/dlib_face_recognition_resnet_model_v1.dat",
146146
"r+");
147147

148148
if (file1 != NULL && file2 != NULL ) {
149149
fclose(file1);
150150
fclose(file2);
151-
dlib::deserialize("/storage/emulated/0/Movies/shape_predictor_5_face_landmarks.dat")
151+
dlib::deserialize("/storage/emulated/0/Download/shape_predictor_5_face_landmarks.dat")
152152
>> sp;
153-
dlib::deserialize("/storage/emulated/0/Movies/dlib_face_recognition_resnet_model_v1.dat")
153+
dlib::deserialize("/storage/emulated/0/Download/dlib_face_recognition_resnet_model_v1.dat")
154154
>> net;
155155

156156
DIR *d;
157157
char *p1,*p2;
158158
int ret;
159159
struct dirent *dir;
160-
d = opendir("/storage/emulated/0/Movies");
160+
d = opendir("/storage/emulated/0/Download");
161161
if (d)
162162
{
163163
// LOGI("Loading feature vectors using *.vec", p1); AL: p1 not initialized
@@ -173,7 +173,7 @@ Java_dlib_android_FaceRecognizer_loadResourcesPart1(JNIEnv *env, jobject instanc
173173
std::string name = std::string(p1);
174174
std::string file = name + ".vec";
175175
matrix<float, 0, 1> face_vector;
176-
dlib::deserialize("/storage/emulated/0/Movies/" + file) >> face_vector;
176+
dlib::deserialize("/storage/emulated/0/Download/" + file) >> face_vector;
177177
known_faces.insert({name, face_vector});
178178
}
179179
}
@@ -192,16 +192,16 @@ JNIEXPORT jint JNICALL
192192
Java_dlib_android_FaceRecognizer_loadResourcesPart2(JNIEnv *env, jobject instance) {
193193

194194
LOGI("load resource part2");
195-
FILE *file1 = fopen("/storage/emulated/0/Movies/shape_predictor_5_face_landmarks.dat", "r+");
196-
FILE *file2 = fopen("/storage/emulated/0/Movies/dlib_face_recognition_resnet_model_v1.dat",
195+
FILE *file1 = fopen("/storage/emulated/0/Download/shape_predictor_5_face_landmarks.dat", "r+");
196+
FILE *file2 = fopen("/storage/emulated/0/Download/dlib_face_recognition_resnet_model_v1.dat",
197197
"r+");
198198

199199
if (file1 != NULL && file2 != NULL ) {
200200
fclose(file1);
201201
fclose(file2);
202-
dlib::deserialize("/storage/emulated/0/Movies/shape_predictor_5_face_landmarks.dat")
202+
dlib::deserialize("/storage/emulated/0/Download/shape_predictor_5_face_landmarks.dat")
203203
>> sp1;
204-
dlib::deserialize("/storage/emulated/0/Movies/dlib_face_recognition_resnet_model_v1.dat")
204+
dlib::deserialize("/storage/emulated/0/Download/dlib_face_recognition_resnet_model_v1.dat")
205205
>> net1;
206206
} else{
207207
return -1;

0 commit comments

Comments
 (0)