← Back to branch summary

~ubuntu-branches/ubuntu/wily/geotranz/wily

« back to all changes in this revision

Viewing changes to SpreadsheetTester/src/SpreadsheetTester.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Roberto Lumbreras
  • Date: 2011-03-06 21:06:09 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20110306210609-tsvzx88vdmpgc7u4
Tags: 3.1-1
http://bugs.debian.org/609504
* New upstream version.
* Added debian/make-orig-tar-bz2 to repackage the upstream .tgz easily.
* Dropped 005-openjdk-forms.patch, it didn't work well in all systems.
* Renamed libgeotranz3 to libgeotranz3.1 because of ABI changes.
* Added symbols64 file for alpha, s390 and 64bit architectures.
  (Closes: #609504)

Show diffs side-by-side

added added

removed removed

Lines of Context:
SpreadsheetTester/src/SpreadsheetTester.cpp
34
34
History
35
35
-------
36
36
7-12-2000
37
 
01-06-2009 - updated to work with thread safe msp ccs 
 
37
01-06-2009 - updated to work with thread safe msp ccs
 
38
06-16-2010 - S. Gillis, BAEts26660, spreadsheet tester has incorrect datum string
38
39
 
39
40
*/
40
41
 
1571
1572
  {
1572
1573
    coordinateSystemState[direction].coordinateType = CoordinateType::mercatorStandardParallel;
1573
1574
  }
1574
 
  else if (strstr("MERCATOR_(SCALE FACTOR)", projection_str))
 
1575
  else if (strstr("MERCATOR_(SCALE_FACTOR)", projection_str))
1575
1576
  {
1576
1577
    coordinateSystemState[direction].coordinateType = CoordinateType::mercatorScaleFactor;
1577
1578
  }