Learn how easy it is to sync an existing GitHub or Google Code repo to a SourceForge project! See Demo

Close

Diff of /adjust.c [6e390e] .. [531cd3] Maximize Restore

  Switch to unified view

a/adjust.c b/adjust.c
...
...
750
    case _lambertazimuthal: 
750
    case _lambertazimuthal: 
751
      tpara = 1;
751
      tpara = 1;
752
      lambertazimuthal_erect(b/2.0, 0.0, &tx, &ty, & tpara);
752
      lambertazimuthal_erect(b/2.0, 0.0, &tx, &ty, & tpara);
753
      mp->distance = pn->width/(2.0*tx);
753
      mp->distance = pn->width/(2.0*tx);
754
      break;
754
      break;
755
    case _hammer:
756
      tpara = 1;
757
      hammer_erect(b/2.0, 0.0, &tx, &ty, & tpara);
758
      mp->distance = pn->width/(2.0*tx);
759
      break;
755
    case _stereographic:
760
    case _stereographic:
756
      tpara = 1;
761
      tpara = 1;
757
      stereographic_erect(b/2.0, 0.0, &tx, &ty, & tpara);
762
      stereographic_erect(b/2.0, 0.0, &tx, &ty, & tpara);
758
      mp->distance = pn->width/(2.0*tx);
763
      mp->distance = pn->width/(2.0*tx);
759
      break;
764
      break;
...
...
957
        }
962
        }
958
    else if(pn->format == _lambertazimuthal)
963
    else if(pn->format == _lambertazimuthal)
959
        {
964
        {
960
            SetDesc(stack[i],   erect_lambertazimuthal, &(mp->distance) ); i++; // Convert lambert to equirect
965
            SetDesc(stack[i],   erect_lambertazimuthal, &(mp->distance) ); i++; // Convert lambert to equirect
961
        }
966
        }
967
    else if(pn->format == _hammer)
968
        {
969
            SetDesc(stack[i],   erect_hammer, &(mp->distance) ); i++; // Convert hammer to equirect
970
        }
962
    else if(pn->format == _trans_mercator)
971
    else if(pn->format == _trans_mercator)
963
        {
972
        {
964
            SetDesc(stack[i],   erect_transmercator,    &(mp->distance)  ); i++; // Convert transverse mercator to equirect
973
            SetDesc(stack[i],   erect_transmercator,    &(mp->distance)  ); i++; // Convert transverse mercator to equirect
965
        }
974
        }
966
    else if(pn->format == _stereographic)
975
    else if(pn->format == _stereographic)
...
...
1180
            mp->distance        = ((double) pn->width) / b;
1189
            mp->distance        = ((double) pn->width) / b;
1181
            break;
1190
            break;
1182
        case _lambertazimuthal:
1191
        case _lambertazimuthal:
1183
            tpara = 1;
1192
            tpara = 1;
1184
            lambertazimuthal_erect(b/2.0, 0.0, &tx, &ty, & tpara);
1193
            lambertazimuthal_erect(b/2.0, 0.0, &tx, &ty, & tpara);
1194
            mp->distance = pn->width/(2.0*tx);
1195
            break;
1196
        case _hammer:
1197
            tpara = 1;
1198
            hammer_erect(b/2.0, 0.0, &tx, &ty, & tpara);
1185
            mp->distance = pn->width/(2.0*tx);
1199
            mp->distance = pn->width/(2.0*tx);
1186
            break;
1200
            break;
1187
        case _panini:
1201
        case _panini:
1188
            tpara = 1;
1202
            tpara = 1;
1189
            panini_erect(b/2.0, 0.0, &tx, &ty, & tpara);
1203
            panini_erect(b/2.0, 0.0, &tx, &ty, & tpara);
...
...
1456
  }
1470
  }
1457
  else if(pn->format == _lambertazimuthal)
1471
  else if(pn->format == _lambertazimuthal)
1458
  {
1472
  {
1459
    SetDesc(stack[i], lambertazimuthal_erect,   &(mp->distance) ); i++; // Convert equirectangular to lambert azimuthal
1473
    SetDesc(stack[i], lambertazimuthal_erect,   &(mp->distance) ); i++; // Convert equirectangular to lambert azimuthal
1460
  }
1474
  }
1475
  else if(pn->format == _hammer)
1476
  {
1477
    SetDesc(stack[i], hammer_erect,   &(mp->distance) ); i++; // Convert equirectangular to hammer
1478
  }
1461
  else if(pn->format == _trans_mercator)
1479
  else if(pn->format == _trans_mercator)
1462
  {
1480
  {
1463
    SetDesc(stack[i], transmercator_erect,    &(mp->distance) ); i++; // Convert equirectangular to transverse mercator
1481
    SetDesc(stack[i], transmercator_erect,    &(mp->distance) ); i++; // Convert equirectangular to transverse mercator
1464
  }
1482
  }
1465
  else if(pn->format == _mirror)
1483
  else if(pn->format == _mirror)
...
...
3033
        g->pano.format != _albersequalareaconic && g->pano.format != _millercylindrical  && 
3051
        g->pano.format != _albersequalareaconic && g->pano.format != _millercylindrical  && 
3034
        g->pano.format != _panini               && g->pano.format != _architectural      &&
3052
        g->pano.format != _panini               && g->pano.format != _architectural      &&
3035
        g->pano.format != _equisolid            && g->pano.format != _equipanini         &&
3053
        g->pano.format != _equisolid            && g->pano.format != _equipanini         &&
3036
        g->pano.format != _biplane              && g->pano.format != _triplane &&
3054
        g->pano.format != _biplane              && g->pano.format != _triplane &&
3037
        g->pano.format != _panini_general       && g->pano.format != _thoby              &&
3055
        g->pano.format != _panini_general       && g->pano.format != _thoby              &&
3038
        g->pano.format != _orthographic
3056
        g->pano.format != _orthographic         && g->pano.format != _hammer
3039
        ) err=11;
3057
        ) err=11;
3040
    
3058
    
3041
    // Check Control Points
3059
    // Check Control Points
3042
    for( i=0; i<g->numPts; i++)         {
3060
    for( i=0; i<g->numPts; i++)         {
3043
        // Joost: cp coordinates can be possible, no problem!  
3061
        // Joost: cp coordinates can be possible, no problem!