Changeset 69:80426f9f85a6 in rrlib_model_fitting


Ignore:
Timestamp:
20.09.2018 18:36:50 (22 months ago)
Author:
Tobias Föhst <foehst@…>
Branch:
17.03
Parents:
66:a1859c23bb38 (diff), 67:cef5d6d5376e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merge with 14.08

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • examples/make.xml

    r66 r69  
    55  <program name="least_squares_polynomial" sources="least_squares_polynomial.cpp" /> 
    66  <program name="particle_filter" sources="particle_filter.cpp" /> 
    7   <program name="ransac_color_detection" sources="ransac_color_detection.cpp" libs="opencvp_all" /> 
     7  <program name="ransac_color_detection" sources="ransac_color_detection.cpp" libs="opencv" /> 
    88  <program name="cluster_analysis" sources="cluster_analysis.cpp" /> 
    99  <program name="icp" sources="icp.cpp" /> 
  • make.xml

    r60 r69  
    1313  </library> 
    1414 
    15   <library name="with_opencv" libs="opencv_core"> 
     15  <library name="with_opencv" libs="opencv"> 
    1616    <sources> 
    1717      tIterativeClosestPoint.h 
  • make.xml

    r67 r69  
    33<targets> 
    44 
    5   <rrlib> 
     5  <library> 
    66    <sources> 
    77      cluster_analysis/* 
     
    1111      tRansacModel.h 
    1212    </sources> 
    13   </rrlib> 
     13  </library> 
    1414 
    15   <rrlib name="ransac_plane_3d" 
    16         libs="opencv"> 
     15  <library name="with_opencv" libs="opencv"> 
    1716    <sources> 
     17      tIterativeClosestPoint.h 
    1818      tRansacPlane3D.h 
    1919    </sources> 
    20   </rrlib> 
    21  
    22   <testprogram name="least_squares_polynomial"> 
    23     <sources> 
    24       test/test_least_squares_polynomial.cpp 
    25     </sources> 
    26   </testprogram> 
    27  
    28   <testprogram name="particle_filter"> 
    29     <sources> 
    30       test/test_particle_filter.cpp 
    31     </sources> 
    32   </testprogram> 
    33  
    34   <testprogram name="ransac_color_detection" 
    35         libs="opencv"> 
    36     <sources> 
    37       test/test_ransac_color_detection.cpp 
    38     </sources> 
    39   </testprogram> 
    40  
    41   <testprogram name="cluster_analysis"> 
    42     <sources> 
    43       test/test_cluster_analysis.cpp 
    44     </sources> 
    45   </testprogram> 
     20  </library> 
    4621 
    4722</targets> 
Note: See TracChangeset for help on using the changeset viewer.