Changeset 62178


Ignore:
Timestamp:
May 24, 2010, 6:40:15 PM (8 years ago)
Author:
Lucanus Simonson
Message:

fixed inspect errors

Location:
sandbox/gtl/boost/polygon
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • sandbox/gtl/boost/polygon/detail/polygon_arbitrary_formation.hpp

    r59798 r62178  
    281281        return *this; }
    282282      inline bool operator () (const half_edge& elm1, const half_edge& elm2) const {
    283         if(std::max(elm1.first.y(), elm1.second.y()) < std::min(elm2.first.y(), elm2.second.y()))
     283        if((std::max)(elm1.first.y(), elm1.second.y()) < (std::min)(elm2.first.y(), elm2.second.y()))
    284284          return true;
    285         if(std::min(elm1.first.y(), elm1.second.y()) > std::max(elm2.first.y(), elm2.second.y()))
     285        if((std::min)(elm1.first.y(), elm1.second.y()) > (std::max)(elm2.first.y(), elm2.second.y()))
    286286          return false;
    287287
     
    459459        if(!projected && !contains(rect1, result, true)) return false;
    460460        if(!projected && !contains(rect2, result, true)) return false;
     461        if(projected) {
     462          rectangle_data<long double> inf_rect((long double)(std::numeric_limits<Unit>::min)(),
     463                                               (long double) (std::numeric_limits<Unit>::min)(),
     464                                               (long double)(std::numeric_limits<Unit>::max)(),
     465                                               (long double) (std::numeric_limits<Unit>::max)() );
     466          return contains(inf_rect, intersection, true);
     467        }
    461468        intersection = result;
    462469        return true;
     
    473480          }
    474481        } else {
    475           if(lazy_success) {
    476             rectangle_data<Unit> inf_rect((std::numeric_limits<Unit>::min)(),  (std::numeric_limits<Unit>::min)(),
    477                                           (std::numeric_limits<Unit>::max)(),  (std::numeric_limits<Unit>::max)() );
    478             return contains(inf_rect, intersection, true);
    479           } else {
    480             return false;
    481           }
     482          return lazy_success;
    482483        }
    483484        typedef rectangle_data<Unit> Rectangle;
     
    740741      inline less_vertex_half_edge& operator=(const less_vertex_half_edge& that) { x_ = that.x_; justBefore_ = that.justBefore_; return *this; }
    741742      inline bool operator () (const vertex_half_edge& elm1, const vertex_half_edge& elm2) const {
    742         if(std::max(elm1.pt.y(), elm1.other_pt.y()) < std::min(elm2.pt.y(), elm2.other_pt.y()))
     743        if((std::max)(elm1.pt.y(), elm1.other_pt.y()) < (std::min)(elm2.pt.y(), elm2.other_pt.y()))
    743744          return true;
    744         if(std::min(elm1.pt.y(), elm1.other_pt.y()) > std::max(elm2.pt.y(), elm2.other_pt.y()))
     745        if((std::min)(elm1.pt.y(), elm1.other_pt.y()) > (std::max)(elm2.pt.y(), elm2.other_pt.y()))
    745746          return false;
    746747        //check if either x of elem1 is equal to x_
  • sandbox/gtl/boost/polygon/detail/scan_arbitrary.hpp

    r59798 r62178  
    129129      for(iT itr = begin; itr != end; ++itr) {
    130130        typename std::map<Unit, std::vector<std::pair<half_edge, segment_id> > >::iterator lb =
    131           bins.lower_bound(std::min((*itr).first.first.y(), (*itr).first.second.y()));
     131          bins.lower_bound((std::min)((*itr).first.first.y(), (*itr).first.second.y()));
    132132        if(lb != bins.begin())
    133133          --lb;
    134134        typename std::map<Unit, std::vector<std::pair<half_edge, segment_id> > >::iterator ub =
    135           bins.upper_bound(std::max((*itr).first.first.y(), (*itr).first.second.y()));
     135          bins.upper_bound((std::max)((*itr).first.first.y(), (*itr).first.second.y()));
    136136        for( ; lb != ub; ++lb) {
    137137          (*lb).second.push_back(*itr);
  • sandbox/gtl/boost/polygon/isotropy.hpp

    r61139 r62178  
    306306    typedef typename coordinate_traits<coordinate_type>::manhattan_area_type type; };
    307307
    308         struct y_c_edist : gtl_yes {};
     308  struct y_c_edist : gtl_yes {};
    309309
    310310  template <typename coordinate_type_1, typename coordinate_type_2>
    311311    typename enable_if<
    312312    typename gtl_and_3<y_c_edist, typename gtl_same_type<typename geometry_concept<coordinate_type_1>::type, coordinate_concept>::type,
    313         typename gtl_same_type<typename geometry_concept<coordinate_type_1>::type, coordinate_concept>::type>::type,
    314         typename coordinate_traits<coordinate_type_1>::coordinate_difference>::type
     313                       typename gtl_same_type<typename geometry_concept<coordinate_type_1>::type, coordinate_concept>::type>::type,
     314    typename coordinate_traits<coordinate_type_1>::coordinate_difference>::type
    315315  euclidean_distance(const coordinate_type_1& lvalue, const coordinate_type_2& rvalue) {
    316316    typedef typename coordinate_traits<coordinate_type_1>::coordinate_difference Unit;
  • sandbox/gtl/boost/polygon/polygon_set_data.hpp

    r59799 r62178  
    432432    inline polygon_set_data&
    433433    insert_with_resize_dispatch(const geometry_type& poly, coordinate_type resizing, bool corner_fill_arc, unsigned int num_circle_segments, bool hole,
    434                                      polygon_with_holes_concept tag) {
     434                               polygon_with_holes_concept tag) {
    435435      insert_with_resize_dispatch(poly, resizing, corner_fill_arc, num_circle_segments, hole, polygon_concept());
    436436      for(typename polygon_with_holes_traits<geometry_type>::iterator_holes_type itr =
     
    445445    inline polygon_set_data&
    446446    insert_with_resize_dispatch(const geometry_type& poly, coordinate_type resizing, bool corner_fill_arc, unsigned int num_circle_segments, bool hole,
    447                                 polygon_concept tag) {
     447                          polygon_concept tag) {
    448448
    449449      if (resizing==0)
     
    504504        point_data<T> curr_prev;
    505505        if (prev_concave)
    506         //TODO missing round_down()
     506          //TODO missing round_down()
    507507          curr_prev = point_data<T>(first->x()+v.x(),first->y()+v.y());
    508508        else
  • sandbox/gtl/boost/polygon/polygon_traits.hpp

    r61915 r62178  
    12951295    while( itH != end_holes( polygon ) ) {
    12961296      if(  contains( *itH, point, !consider_touch )  ) {
    1297         isInside = false;
    1298         break;
     1297        isInside = false;
     1298        break;
    12991299      }
    13001300      ++itH;
Note: See TracChangeset for help on using the changeset viewer.