fix conflict

wangzhengquan

2020-08-24 e7e07f42b336bb7b5c488eb3bcc6397c0a2a03f4

 test/test_right_walk3.c

@@ -94,7 +94,7 @@

void test3() {

    std::ifstream fin("test.txt");
    std::ifstream fin("test3.txt");
    char line[1024];
    //std::string line;
    char *targetIdStr;
@@ -105,8 +105,9 @@
    char *targetPointXstr;
    char *targetPointYstr;
//{"x":148,"y":45},{"x":148,"y":539},{"x":769,"y":539},{"x":769,"y":45}
    //{148, 45}, {148, 539},  {769, 539}, {769, 45}
    Record record;
    IndirectAlg indirectAlg((std::initializer_list<Point>){{148, 45}, {148, 539},  {769, 539}, {769, 45} }, 5, {621, 0});
    IndirectAlg indirectAlg((std::initializer_list<Point>){}, 3, {621, 0});
    
    // const char *delim = " ";
    while(fin.getline(line, 1024)) {
@@ -151,10 +152,12 @@
        // printf("key = %s, value=%s\n", key, value);
    }
    fin.close();
    sleep(30);
}


int main() {
    test3();


}