[Csp-commits] APPLICATIONS/CSPSim/Tools/Terrain/dem2dat Makefile,1.1,1.2 dem2dat.h,1.1,1.2

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/Terrain/dem2dat
In directory sc8-pr-cvs1:/tmp/cvs-serv13903

Modified Files:
	Makefile dem2dat.h 
Log Message:


Index: Makefile
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Tools/Terrain/dem2dat/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	21 Jul 2003 07:45:09 -0000	1.1
--- Makefile	22 Jul 2003 21:18:13 -0000	1.2
***************
*** 2,9 ****
  
  dem2dat: dem2dat.cpp dem2dat.h
! 	g++ -O2 -g dem2dat.cpp -o dem2dat -I/usr/include/python2.2 -lSimData
  
  python: dem2dat_wrap.o
! 	g++ -shared -lswigpy -ldl -o _dem2dat.so dem2dat_wrap.o  -lSimData
  
  dem2dat_wrap.o: dem2dat_wrap.cxx
--- 2,9 ----
  
  dem2dat: dem2dat.cpp dem2dat.h
! 	g++ -O2 -g dem2dat.cpp -o dem2dat -I/usr/include/python2.2 -lSimData -lz
  
  python: dem2dat_wrap.o
! 	g++ -shared -lswigpy -ldl -o _dem2dat.so dem2dat_wrap.o  -lSimData -lz
  
  dem2dat_wrap.o: dem2dat_wrap.cxx

Index: dem2dat.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Tools/Terrain/dem2dat/dem2dat.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dem2dat.h	21 Jul 2003 07:45:09 -0000	1.1
--- dem2dat.h	22 Jul 2003 21:18:13 -0000	1.2
***************
*** 37,40 ****
--- 37,41 ----
  #include <iostream>
  #include <vector>
+ #include <zlib.h>
  
  using namespace simdata;
***************
*** 454,459 ****
  		x = _title.find("SCALE::");
  		sscanf(_title.c_str()+x, "SCALE:: %d", &_scale);
! 		_lat = la0 + la1/60.0 + _lat / 3600.0;
! 		_lon = lo0 + lo1/60.0 + _lon / 3600.0;
  		_title = std::string(_title, 0, _title.find_last_not_of(" \t\r\n"));
  	}
--- 455,463 ----
  		x = _title.find("SCALE::");
  		sscanf(_title.c_str()+x, "SCALE:: %d", &_scale);
! 		int sign;
! 		sign = la0 >= 0 ? 1 : -1; // XXX what about lat = -0.X?
! 		_lat = sign*(fabs(la0) + la1/60.0 + _lat / 3600.0);
! 		sign = lo0 >= 0 ? 1 : -1; // XXX what about lon = -0.X?
! 		_lon = sign*(fabs(lo0) + lo1/60.0 + _lon / 3600.0);
  		_title = std::string(_title, 0, _title.find_last_not_of(" \t\r\n"));
  	}
***************
*** 602,609 ****
  	
  	bool read(std::string fn) {
! 		FILE *fp = (FILE*) fopen(fn.c_str(), "rb");
  		if (!fp) return false;
  		_read(fp);
! 		fclose(fp);
  	}
  
--- 606,613 ----
  	
  	bool read(std::string fn) {
! 		gzFile fp = gzopen(fn.c_str(), "rb");
  		if (!fp) return false;
  		_read(fp);
! 		gzclose(fp);
  	}
  
***************
*** 616,624 ****
  
  protected:
! 	#define READD(x) fread(&(x), sizeof(double), 1, fp);
! 	#define READI(x) fread(&(x), sizeof(int), 1, fp);
! 	#define READS(x) fread(&(x), sizeof(unsigned short), 1, fp);
! 	#define READN(x,n) fread(x, sizeof(char), n, fp);
! 	void _read(FILE *fp) {
  		char buffer[256];
  		READN(buffer, 64);
--- 620,628 ----
  
  protected:
! 	#define READD(x) gzread(fp, &(x), sizeof(double));
! 	#define READI(x) gzread(fp, &(x), sizeof(int));
! 	#define READS(x) gzread(fp, &(x), sizeof(unsigned short));
! 	#define READN(x,n) gzread(fp, x, sizeof(char) * n);
! 	void _read(gzFile &fp) {
  		char buffer[256];
  		READN(buffer, 64);