Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37041710
en ru br
Репозитории ALT
S:2.10.1-alt1
5.1: 2.0.0-alt3
3.0: 1.4.0-alt1.3
+updates:1.5.0-alt0.0.4.M30.1
+backports:1.5.0-alt0.0.4.M30.1
www.altlinux.org/Changes

Группа :: Науки/Прочее
Пакет: labplot

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: labplot-2.0.0-gcc43.patch
Скачать


--- src/filter/FilterCDF.cc.orig	2008-08-04 12:59:33 +0400
+++ src/filter/FilterCDF.cc	2009-01-18 00:33:37 +0300
@@ -67,7 +67,7 @@ QString FilterCDF::Enc(int i) {
 	return 0;
 }
 
-QString FilterCDF::Type(int t) {
+QString FilterCDF::Type(int t) const {
 	switch(t) {
 	case CDF_BYTE: return QString("BYTE");break;
 	case CDF_CHAR: return QString("CHAR");break;
@@ -88,7 +88,7 @@ QString FilterCDF::Type(int t) {
 	return 0;
 }
 
-QString FilterCDF::Comp(int c) {
+QString FilterCDF::Comp(int c) const {
 	switch(c) {
 	case NO_COMPRESSION: return QString("NO_COMPRESSION");break;
 	case RLE_COMPRESSION: return QString("RLE_COMPRESSION");break;
@@ -100,7 +100,7 @@ QString FilterCDF::Comp(int c) {
 	return 0;
 }
 
-QString FilterCDF::Maj() {
+QString FilterCDF::Maj() const {
 	switch(maj) {
 	case ROW_MAJOR : return QString("ROW_MAJOR");break;
 	case COLUMN_MAJOR : return QString("COLUMN_MAJOR");break;
@@ -109,7 +109,7 @@ QString FilterCDF::Maj() {
 	return 0;
 }
 
-bool FilterCDF::isZvar(int varid) {
+bool FilterCDF::isZvar(int varid) const {
 
 	int status = CDFlib(SELECT_, zVAR_, varid);
    	if (status < CDF_OK) {	// Rvar
@@ -118,7 +118,7 @@ bool FilterCDF::isZvar(int varid) {
 	return true;
 }
 
-bool FilterCDF::isZvar(QString varname) {
+bool FilterCDF::isZvar(QString varname) const {
 	int status = CDFlib(SELECT_, zVAR_NAME_, qPrintable(varname));
    	if (status < CDF_OK) {	// Rvar
 		return false;
@@ -126,7 +126,7 @@ bool FilterCDF::isZvar(QString varname) 
 	return true;
 }
 
-QString FilterCDF::Var(int varid) {
+QString FilterCDF::Var(int varid) const {
 	char name[CDF_VAR_NAME_LEN+1];
 	long type, nelems, recvary;
 	long dimvary[CDF_MAX_DIMS];
@@ -141,7 +141,7 @@ QString FilterCDF::Var(int varid) {
 	return var;
 }
 
-QString FilterCDF::VarName(int varid) {
+QString FilterCDF::VarName(int varid) const {
 	char name[CDF_VAR_NAME_LEN+1];
 	long type, nelems, recvary;
 	long dimvary[CDF_MAX_DIMS];
@@ -153,7 +153,7 @@ QString FilterCDF::VarName(int varid) {
 	return QString(name);
 }
 
-QString FilterCDF::Att(int aid) {
+QString FilterCDF::Att(int aid) const {
 	char name[CDF_ATTR_NAME_LEN+1];
 	long scope, entry;
 
@@ -163,7 +163,7 @@ QString FilterCDF::Att(int aid) {
 	return att;
 }
 
-QString FilterCDF::Compression( ) {
+QString FilterCDF::Compression( ) const {
 	long type, pct;
 	long parms[CDF_MAX_PARMS];
 
@@ -219,7 +219,7 @@ QStringList FilterCDF::DataString(int va
 	return list;
 }
 
-long FilterCDF::VarLen(QString name) {
+long FilterCDF::VarLen(QString name) const {
   	long maxrec=0;
 
 	int status = CDFlib(SELECT_, zVAR_NAME_, qPrintable(name));
@@ -246,7 +246,7 @@ double FilterCDF::Value(void *value,long
 	return v;
 }
 
-double FilterCDF::Data(QString varname, int i){
+double FilterCDF::Data(QString varname, int i) {
 	if(i>VarLen(varname))
 		return 0;
 
--- src/filter/FilterCDF.h.orig	2008-08-04 12:59:33 +0400
+++ src/filter/FilterCDF.h	2009-01-18 00:33:41 +0300
@@ -28,11 +28,11 @@ public:
 	QString Var(int varid) const;				// get variable varid description
 	QString VarName(int varid) const;			// get variable varid name 
 	long VarLen(QString name) const;
-	QStringList DataString(int varid) const;		// data info
-	double Data(QString varname, int i) const;
+	QStringList DataString(int varid) ;		// data info
+	double Data(QString varname, int i);
 	
 	QString Comp(int c) const;
-	QString Enc(int e) const;
+	QString Enc(int e);
 protected:
 	QString Type(int t) const;
 	bool isZvar(int varid) const;
--- src/filter/FilterNETCDF.h.orig	2008-08-04 12:59:33 +0400
+++ src/filter/FilterNETCDF.h	2009-01-18 15:58:49 +0300
@@ -7,7 +7,7 @@
 #include <qstringlist.h>
 
 #ifdef HAVE_NETCDF
-#include <netcdf.h>
+#include <netcdf-3/netcdf.h>
 
 struct ncdim {			// dimension
     char name[NC_MAX_NAME];
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin