← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/gmsh/intrepid

« back to all changes in this revision

Viewing changes to Geo/Geo.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Andrea Veri
  • Date: 2007-07-14 23:29:56 UTC
  • mfrom: (1.2.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20070714232956-ikw2f28278kxkquw
Tags: 2.0.8-1ubuntu1
* Merge from debian unstable, remaining changes:
  debian/rules:
    - added dh_desktop for registering gmsh.desktop file.
  debian/gmsh.install:
    - Installing both gmsh.desktop and respective icon.
  debian/menu:
    - added gmsh icon path
  debian/control:
    - Modify Maintainer value to match Debian-Maintainer-Field Spec.

* removing 02_gcc4.3-FTBFS.dpatch previously added in ubuntu, it has been reported 
  and fixed upstream with the new usptream release (2.0.8).
  Check debian bug #417211 for confirmation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Geo/Geo.cpp
1
 
// $Id: Geo.cpp,v 1.87 2007/03/23 08:44:41 geuzaine Exp $
 
1
// $Id: Geo.cpp,v 1.88 2007-04-05 12:51:28 geuzaine Exp $
2
2
//
3
3
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
4
4
//
2391
2391
          body.Num = ps->Num;
2392
2392
          body.Type = ps->Typ;
2393
2393
          List_Add(list_out, &body);
2394
 
          for(int j = 0; j < List_Nbr(ps->Generatrices); j++){
2395
 
            Curve *c;
2396
 
            List_Read(ps->Generatrices, j, &c);
2397
 
            if(abs(c->Num) != shape.Num && abs(c->Num) != top.Num){
2398
 
              Shape side;
2399
 
              side.Num = c->Num;
2400
 
              side.Type = c->Typ;
2401
 
              List_Add(list_out, &side);
 
2394
          if(CTX.geom.extrude_return_lateral){
 
2395
            for(int j = 0; j < List_Nbr(ps->Generatrices); j++){
 
2396
              Curve *c;
 
2397
              List_Read(ps->Generatrices, j, &c);
 
2398
              if(abs(c->Num) != shape.Num && abs(c->Num) != top.Num){
 
2399
                Shape side;
 
2400
                side.Num = c->Num;
 
2401
                side.Type = c->Typ;
 
2402
                List_Add(list_out, &side);
 
2403
              }
2402
2404
            }
2403
2405
          }
2404
2406
        }
2422
2424
          body.Num = pv->Num;
2423
2425
          body.Type = pv->Typ;
2424
2426
          List_Add(list_out, &body);
2425
 
          for(int j = 0; j < List_Nbr(pv->Surfaces); j++){
2426
 
            Surface *s;
2427
 
            List_Read(pv->Surfaces, j, &s);
2428
 
            if(abs(s->Num) != shape.Num && abs(s->Num) != top.Num){
2429
 
              Shape side;
2430
 
              side.Num = s->Num;
2431
 
              side.Type = s->Typ;
2432
 
              List_Add(list_out, &side);
 
2427
          if(CTX.geom.extrude_return_lateral){
 
2428
            for(int j = 0; j < List_Nbr(pv->Surfaces); j++){
 
2429
              Surface *s;
 
2430
              List_Read(pv->Surfaces, j, &s);
 
2431
              if(abs(s->Num) != shape.Num && abs(s->Num) != top.Num){
 
2432
                Shape side;
 
2433
                side.Num = s->Num;
 
2434
                side.Type = s->Typ;
 
2435
                List_Add(list_out, &side);
 
2436
              }
2433
2437
            }
2434
2438
          }
2435
2439
        }