diff -Nru openvoronoi-12.02.270/deb/package_details.cmake openvoronoi-12.02.274/deb/package_details.cmake --- openvoronoi-12.02.270/deb/package_details.cmake 2012-11-04 17:20:45.000000000 +0000 +++ openvoronoi-12.02.274/deb/package_details.cmake 2012-11-06 17:44:50.000000000 +0000 @@ -20,7 +20,8 @@ # natty/maverick has 1.42.0 # lucid has 1.40.0 set(DEBSRC_PACKAGE_DEPENDS python git cmake - "libboost-python1.49.0 | libboost-python1.48.0 | libboost-python1.46.1 | libboost-python1.42.0 | libboost-python1.40.0" + # "libboost-python1.49.0 | libboost-python1.48.0 | libboost-python1.46.1 | libboost-python1.42.0 | libboost-python1.40.0" + "libboost-python" "libqd0 | libqd2c2a" CACHE STRING "name") # however CPack wants dependencies as a single comma separated string! diff -Nru openvoronoi-12.02.270/debian/changelog openvoronoi-12.02.274/debian/changelog --- openvoronoi-12.02.270/debian/changelog 2012-11-04 17:20:54.000000000 +0000 +++ openvoronoi-12.02.274/debian/changelog 2012-11-06 17:44:59.000000000 +0000 @@ -1,6 +1,6 @@ -openvoronoi (12.02.270-ubuntu1~precise1) precise; urgency=low +openvoronoi (12.02.274-ubuntu1~precise1) precise; urgency=low * Package built with CMake - -- Anders Wallin Sun, 04 Nov 2012 19:20:54 +0200 + -- Anders Wallin Tue, 06 Nov 2012 19:44:59 +0200 diff -Nru openvoronoi-12.02.270/debian/control openvoronoi-12.02.274/debian/control --- openvoronoi-12.02.270/debian/control 2012-11-04 17:20:54.000000000 +0000 +++ openvoronoi-12.02.274/debian/control 2012-11-06 17:44:59.000000000 +0000 @@ -10,7 +10,7 @@ Package: openvoronoi Architecture: any Suggests: -Depends: ${misc:Depends}, python, git, cmake, libboost-python1.49.0 | libboost-python1.48.0 | libboost-python1.46.1 | libboost-python1.42.0 | libboost-python1.40.0, libqd0 | libqd2c2a, +Depends: ${misc:Depends}, python, git, cmake, libboost-python, libqd0 | libqd2c2a, Description: 2D voronoi diagram algorithm 2D voronoi-diagram for point and line-segment sites. A C++ library with python bindings. diff -Nru openvoronoi-12.02.270/git-tag.txt openvoronoi-12.02.274/git-tag.txt --- openvoronoi-12.02.270/git-tag.txt 2012-11-04 17:20:45.000000000 +0000 +++ openvoronoi-12.02.274/git-tag.txt 2012-11-06 17:44:50.000000000 +0000 @@ -1 +1 @@ -12.02-270-g34f57d8 \ No newline at end of file +12.02-274-ge5a5424 \ No newline at end of file diff -Nru openvoronoi-12.02.270/test/cpptest_ttt_glyph/CMakeLists.txt openvoronoi-12.02.274/test/cpptest_ttt_glyph/CMakeLists.txt --- openvoronoi-12.02.270/test/cpptest_ttt_glyph/CMakeLists.txt 2012-11-04 17:20:45.000000000 +0000 +++ openvoronoi-12.02.274/test/cpptest_ttt_glyph/CMakeLists.txt 2012-11-06 17:44:50.000000000 +0000 @@ -42,7 +42,7 @@ ) -set( TTT_CASES 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25) # these fail: 12 22 +set( TTT_CASES 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25) # set( TTT2_CASES 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51) # 35 foreach( CASE ${TTT_CASES} ) ADD_TEST(${test_name}_big_${CASE} ${test_name} --c ${CASE}) diff -Nru openvoronoi-12.02.270/voronoidiagram.cpp openvoronoi-12.02.274/voronoidiagram.cpp --- openvoronoi-12.02.270/voronoidiagram.cpp 2012-11-04 17:20:45.000000000 +0000 +++ openvoronoi-12.02.274/voronoidiagram.cpp 2012-11-06 17:44:50.000000000 +0000 @@ -1827,15 +1827,16 @@ //count++; //assert(count<10000); // some reasonable max number of edges in face, to avoid infinite loop } while (current_edge!=start_edge && !found); + if (!found) { + std::cout << "find_separator_target() FATAL ERROR\n"; + std::cout << " find_separator_target Unable to find target vertex on face f=" << f << " endp= " << g[endp].index << "\n"; + std::cout << " looking for OUT-NEW-IN: " << OUT << " - " << NEW << " - " << IN << "\n"; + std::cout << " looking for IN-NEW-OUT: " << IN << " - " << NEW << " - " << OUT << "\n"; + g.print_face(f); + exit(-1); + } assert(found); - //if (!found) { - // std::cout << "find_separator_target() FATAL ERROR\n"; - // std::cout << " find_separator_target Unable to find target vertex on face f=" << f << " endp= " << g[endp].index << "\n"; - // std::cout << " looking for OUT-NEW-IN: " << OUT << " - " << NEW << " - " << IN << "\n"; - // std::cout << " looking for IN-NEW-OUT: " << IN << " - " << NEW << " - " << OUT << "\n"; - // g.print_face(f); - // exit(-1); - //} + return boost::make_tuple(v_previous, v_target, v_next, flag); }