diff -Nru opencamlib-11.10+git201711172316~ubuntu17.10.1/debian/bzr-builder.manifest opencamlib-11.10+git201801200005~ubuntu17.10.1/debian/bzr-builder.manifest --- opencamlib-11.10+git201711172316~ubuntu17.10.1/debian/bzr-builder.manifest 2017-11-17 23:16:51.000000000 +0000 +++ opencamlib-11.10+git201801200005~ubuntu17.10.1/debian/bzr-builder.manifest 2018-01-20 00:05:20.000000000 +0000 @@ -1,4 +1,4 @@ -# bzr-builder format 0.3 deb-version {debupstream}+git201711172316 -lp:~neomilium/opencamlib/mygithubfork revid:git-v1:08a26ce288415f61d476380c15b659d87bac1bd4 +# bzr-builder format 0.3 deb-version {debupstream}+git201801200005 +lp:opencamlib revid:git-v1:f8bd0a66ad4f1114a3caf84f430027c2da79c91d nest packaging lp:~neomilium/opencamlib/packaging debian revid:neomilium@gmail.com-20171115233328-2ngbkslxbw1e9tl2 nest-part versioning lp:~neomilium/opencamlib/versioning src/version_string.hpp src/version_string.hpp revid:neomilium@gmail.com-20140613122717-mhb9173sx94yjx0e diff -Nru opencamlib-11.10+git201711172316~ubuntu17.10.1/debian/changelog opencamlib-11.10+git201801200005~ubuntu17.10.1/debian/changelog --- opencamlib-11.10+git201711172316~ubuntu17.10.1/debian/changelog 2017-11-17 23:16:51.000000000 +0000 +++ opencamlib-11.10+git201801200005~ubuntu17.10.1/debian/changelog 2018-01-20 00:05:20.000000000 +0000 @@ -1,8 +1,8 @@ -opencamlib (11.10+git201711172316~ubuntu17.10.1) artful; urgency=low +opencamlib (11.10+git201801200005~ubuntu17.10.1) artful; urgency=low * Auto build. - -- neomilium Fri, 17 Nov 2017 23:16:51 +0000 + -- neomilium Sat, 20 Jan 2018 00:05:20 +0000 opencamlib (11.10-1) unstable; urgency=low diff -Nru opencamlib-11.10+git201711172316~ubuntu17.10.1/README opencamlib-11.10+git201801200005~ubuntu17.10.1/README --- opencamlib-11.10+git201711172316~ubuntu17.10.1/README 2017-11-17 23:16:49.000000000 +0000 +++ opencamlib-11.10+git201801200005~ubuntu17.10.1/README 2018-01-20 00:05:18.000000000 +0000 @@ -4,17 +4,12 @@ OpenCAMLib (ocl) is a c++ library for creating toolpaths for cnc-machines such as mills and lathes. -Unti around July 2011 the project was hosted at -http://code.google.com/p/opencamlib/ -We are now moving to github: +The OpenCAMLib code is hosted at: https://github.com/aewallin/opencamlib The mailing-list for general development and user-discussion is: http://groups.google.com/group/opencamlib -SVN commit messages go to a mailing-list: -http://groups.google.com/group/opencamlib-svn - IRC-channel #cam on irc.freenode.net It's probably a good idea to try to adhere to some coding standard. Maybe this one: diff -Nru opencamlib-11.10+git201711172316~ubuntu17.10.1/src/algo/adaptivewaterline.cpp opencamlib-11.10+git201801200005~ubuntu17.10.1/src/algo/adaptivewaterline.cpp --- opencamlib-11.10+git201711172316~ubuntu17.10.1/src/algo/adaptivewaterline.cpp 2017-11-17 23:16:49.000000000 +0000 +++ opencamlib-11.10+git201801200005~ubuntu17.10.1/src/algo/adaptivewaterline.cpp 2018-01-20 00:05:18.000000000 +0000 @@ -157,7 +157,7 @@ xfiber_adaptive_sample( span, start_t, mid_t , start_f, mid_f ); xfiber_adaptive_sample( span, mid_t , stop_t, mid_f , stop_f ); } else if ( !flat(start_f,mid_f,stop_f) ) { - if (fw_step > min_sampling) { // not a a flat segment, and we have not reached maximum sampling + if (fw_step > min_sampling) { // not a flat segment, and we have not reached maximum sampling xfiber_adaptive_sample( span, start_t, mid_t , start_f, mid_f ); xfiber_adaptive_sample( span, mid_t , stop_t, mid_f , stop_f ); } @@ -179,7 +179,7 @@ yfiber_adaptive_sample( span, start_t, mid_t , start_f, mid_f ); yfiber_adaptive_sample( span, mid_t , stop_t, mid_f , stop_f ); } else if ( !flat(start_f,mid_f,stop_f) ) { - if (fw_step > min_sampling) { // not a a flat segment, and we have not reached maximum sampling + if (fw_step > min_sampling) { // not a flat segment, and we have not reached maximum sampling yfiber_adaptive_sample( span, start_t, mid_t , start_f, mid_f ); yfiber_adaptive_sample( span, mid_t , stop_t, mid_f , stop_f ); } diff -Nru opencamlib-11.10+git201711172316~ubuntu17.10.1/src/algo/weave.hpp opencamlib-11.10+git201801200005~ubuntu17.10.1/src/algo/weave.hpp --- opencamlib-11.10+git201711172316~ubuntu17.10.1/src/algo/weave.hpp 2017-11-17 23:16:49.000000000 +0000 +++ opencamlib-11.10+git201801200005~ubuntu17.10.1/src/algo/weave.hpp 2018-01-20 00:05:18.000000000 +0000 @@ -37,13 +37,13 @@ virtual ~Weave() {} /// add Fiber f to the graph /// each fiber should be either in the X or Y-direction - /// FIXME: seprate addXFiber and addYFiber methods? + /// FIXME: separate addXFiber and addYFiber methods? void addFiber(Fiber& f); /// from the list of fibers, build a graph virtual void build() = 0; /// run planar_face_traversal to get the waterline loops void face_traverse(); - /// retrun list of loops + /// return list of loops std::vector< std::vector > getLoops() const; /// string representation std::string str() ; diff -Nru opencamlib-11.10+git201711172316~ubuntu17.10.1/src/algo/weave_py.hpp opencamlib-11.10+git201801200005~ubuntu17.10.1/src/algo/weave_py.hpp --- opencamlib-11.10+git201711172316~ubuntu17.10.1/src/algo/weave_py.hpp 2017-11-17 23:16:49.000000000 +0000 +++ opencamlib-11.10+git201801200005~ubuntu17.10.1/src/algo/weave_py.hpp 2018-01-20 00:05:18.000000000 +0000 @@ -66,7 +66,7 @@ } return edge_list; }; - /// return loops to pyton + /// return loops to python boost::python::list py_getLoops() { boost::python::list loop_list; BOOST_FOREACH( std::vector loop, loops ) { diff -Nru opencamlib-11.10+git201711172316~ubuntu17.10.1/src/attic/octree.cpp opencamlib-11.10+git201801200005~ubuntu17.10.1/src/attic/octree.cpp --- opencamlib-11.10+git201711172316~ubuntu17.10.1/src/attic/octree.cpp 2017-11-17 23:16:49.000000000 +0000 +++ opencamlib-11.10+git201801200005~ubuntu17.10.1/src/attic/octree.cpp 2018-01-20 00:05:18.000000000 +0000 @@ -246,7 +246,7 @@ n-=jump; // jump backward and see if the collapse has created // an opportunity for more collapsing - // collapsable nodes can be as far back as 7 steps + // collapsible nodes can be as far back as 7 steps n_collapse++; } else { @@ -264,7 +264,7 @@ return; } -/// return true if eight consequtive +/// return true if eight consecutive /// nodes beginning at idx can be collapsed bool LinOCT::can_collapse_at(int idx) { std::list::iterator it; @@ -276,7 +276,7 @@ return false; int deg = it->degree(); - // check for consequtive numbers 0-7 at position deg + // check for consecutive numbers 0-7 at position deg Ocode o; //std::cout << " checking "<< idx << " to " << idx+7 << " deg=" << deg << "\n"; for (int n=0; n < 8 ; n++) { diff -Nru opencamlib-11.10+git201711172316~ubuntu17.10.1/src/attic/pft_visitor.h opencamlib-11.10+git201801200005~ubuntu17.10.1/src/attic/pft_visitor.h --- opencamlib-11.10+git201711172316~ubuntu17.10.1/src/attic/pft_visitor.h 2017-11-17 23:16:49.000000000 +0000 +++ opencamlib-11.10+git201801200005~ubuntu17.10.1/src/attic/pft_visitor.h 2018-01-20 00:05:18.000000000 +0000 @@ -39,7 +39,7 @@ /// create a visitor-object vertex_output_visitor(Weave* w, WeaveGraph& g) : g_(g) , w_(w) {} - /// called when we begin traversing a a new face, clear contents of current_loop + /// called when we begin traversing a new face, clear contents of current_loop void begin_face() { current_loop.clear(); } diff -Nru opencamlib-11.10+git201711172316~ubuntu17.10.1/src/attic/weave.h opencamlib-11.10+git201801200005~ubuntu17.10.1/src/attic/weave.h --- opencamlib-11.10+git201711172316~ubuntu17.10.1/src/attic/weave.h 2017-11-17 23:16:49.000000000 +0000 +++ opencamlib-11.10+git201801200005~ubuntu17.10.1/src/attic/weave.h 2018-01-20 00:05:18.000000000 +0000 @@ -49,7 +49,7 @@ std::vector split_components(); /// run planar_face_traversal to get the waterline points in correct order void face_traverse(); - /// retrun list of loops + /// return list of loops std::vector< std::vector > getLoops() const; /// string representation diff -Nru opencamlib-11.10+git201711172316~ubuntu17.10.1/src/attic/weave_py.h opencamlib-11.10+git201801200005~ubuntu17.10.1/src/attic/weave_py.h --- opencamlib-11.10+git201711172316~ubuntu17.10.1/src/attic/weave_py.h 2017-11-17 23:16:49.000000000 +0000 +++ opencamlib-11.10+git201801200005~ubuntu17.10.1/src/attic/weave_py.h 2018-01-20 00:05:18.000000000 +0000 @@ -82,7 +82,7 @@ } return edge_list; }; - /// return loops to pyton + /// return loops to python boost::python::list py_getLoops() const { boost::python::list loop_list; BOOST_FOREACH( std::vector loop, loops ) { diff -Nru opencamlib-11.10+git201711172316~ubuntu17.10.1/src/cutters/millingcutter.hpp opencamlib-11.10+git201801200005~ubuntu17.10.1/src/cutters/millingcutter.hpp --- opencamlib-11.10+git201711172316~ubuntu17.10.1/src/cutters/millingcutter.hpp 2017-11-17 23:16:49.000000000 +0000 +++ opencamlib-11.10+git201801200005~ubuntu17.10.1/src/cutters/millingcutter.hpp 2018-01-20 00:05:18.000000000 +0000 @@ -162,7 +162,7 @@ // DROP-CUTTER /// drop cutter against edge p1-p2 at xy-distance d from cl - /// translates to cl=(0,0) and rotates edge to be alog x-axis + /// translates to cl=(0,0) and rotates edge to be along x-axis /// for call to singleEdgeDropCanonical() bool singleEdgeDrop(CLPoint& cl, const Point& p1, const Point& p2, double d) const; /// edge-drop in the 'canonical' position with cl=(0,0,cl.z) and edge u1-u2 along x-axis. diff -Nru opencamlib-11.10+git201711172316~ubuntu17.10.1/src/Doxyfile opencamlib-11.10+git201801200005~ubuntu17.10.1/src/Doxyfile --- opencamlib-11.10+git201711172316~ubuntu17.10.1/src/Doxyfile 2017-11-17 23:16:49.000000000 +0000 +++ opencamlib-11.10+git201801200005~ubuntu17.10.1/src/Doxyfile 2018-01-20 00:05:18.000000000 +0000 @@ -278,10 +278,10 @@ # For small to medium size projects (<1000 input files) the default value is # probably good enough. For larger projects a too small cache size can cause # doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penality. +# causing a significant performance penalty. # If the system has enough physical memory increasing the cache will improve the # performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will rougly double the +# a logarithmic scale so increasing the size by one will roughly double the # memory usage. The cache size is given by this formula: # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, # corresponding to a cache size of 2^16 = 65536 symbols diff -Nru opencamlib-11.10+git201711172316~ubuntu17.10.1/src/geo/point.hpp opencamlib-11.10+git201801200005~ubuntu17.10.1/src/geo/point.hpp --- opencamlib-11.10+git201711172316~ubuntu17.10.1/src/geo/point.hpp 2017-11-17 23:16:49.000000000 +0000 +++ opencamlib-11.10+git201801200005~ubuntu17.10.1/src/geo/point.hpp 2018-01-20 00:05:18.000000000 +0000 @@ -101,7 +101,7 @@ /// retruns true if Point *this is inside Triangle t bool isInside(const Triangle &t) const; - /// retrun true if Point within line segment p1-p2 + /// return true if Point within line segment p1-p2 bool isInside(const Point& p1, const Point& p2) const; diff -Nru opencamlib-11.10+git201711172316~ubuntu17.10.1/src/manual.hpp opencamlib-11.10+git201801200005~ubuntu17.10.1/src/manual.hpp --- opencamlib-11.10+git201711172316~ubuntu17.10.1/src/manual.hpp 2017-11-17 23:16:49.000000000 +0000 +++ opencamlib-11.10+git201801200005~ubuntu17.10.1/src/manual.hpp 2018-01-20 00:05:18.000000000 +0000 @@ -250,7 +250,7 @@ * where v is a normalized vector in the direction of the edge, or v=(p2-p1).xyNormalize() * * The tests find a contact between the cutter and an infinite line which contains the - * edge we are testing against. Once the contact cc-point is found we check wether this cc-point is + * edge we are testing against. Once the contact cc-point is found we check whether this cc-point is * actually in the edge. * * \subsubsection cyledge Cylindrical cutter edge test diff -Nru opencamlib-11.10+git201711172316~ubuntu17.10.1/Windows/version_string.hpp opencamlib-11.10+git201801200005~ubuntu17.10.1/Windows/version_string.hpp --- opencamlib-11.10+git201711172316~ubuntu17.10.1/Windows/version_string.hpp 2017-11-17 23:16:49.000000000 +0000 +++ opencamlib-11.10+git201801200005~ubuntu17.10.1/Windows/version_string.hpp 2018-01-20 00:05:18.000000000 +0000 @@ -1,4 +1,4 @@ -//version_string.hpp - Manualy created for Windows Compile#include "version.h" +//version_string.hpp - Manually created for Windows Compile#include "version.h" #include "version.h" #ifndef VERSION_STRING