[SCM] image display tool for astronomy branch, master, updated. 5794483d14351c5f026188734459a2f42faad777

[Ole Streicher]

The following commit has been merged in the master branch:
commit 5794483d14351c5f026188734459a2f42faad777
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri May 18 11:55:52 2012 +0200

    Fix saotk/fitsy++ compilation errors with latest gcc

diff --git a/debian/patches/fix_saotk_fitsy.patch b/debian/patches/fix_saotk_fitsy.patch
new file mode 100644
index 0000000..7c4dbb1
--- /dev/null
+++ b/debian/patches/fix_saotk_fitsy.patch
@@ -0,0 +1,98 @@
+diff --git a/saotk/fitsy++/strm.C b/saotk/fitsy++/strm.C
+index 0474bf3..c20da10 100644
+--- a/saotk/fitsy++/strm.C
++++ b/saotk/fitsy++/strm.C
+@@ -286,7 +286,7 @@ template<class T> void FitsStream<T>::skipEnd()
+ template<class T> void FitsStream<T>::found()
+ {
+   // only read allbytes, since the data seg maybe short
+-  if (!dataRead(head_->allbytes())) {
++  if (!this->dataRead(head_->allbytes())) {
+     error();
+     return;
+   }
+@@ -361,7 +361,7 @@ template<class T> void FitsFitsStream<T>::processExact()
+       this->error();
+       return;
+     }
+-    dataSkip(this->primary_->datablocks()*FTY_BLOCK);
++    this->dataSkip(this->primary_->datablocks()*FTY_BLOCK);
+ 
+     if (this->pExt_) {
+       while (1) {
+@@ -384,7 +384,7 @@ template<class T> void FitsFitsStream<T>::processExact()
+ 	  delete [] b;
+ 	}
+ 
+-	dataSkip(this->head_->datablocks()*FTY_BLOCK);
++	this->dataSkip(this->head_->datablocks()*FTY_BLOCK);
+ 	delete this->head_;
+ 	this->head_ = NULL;
+       }
+@@ -397,7 +397,7 @@ template<class T> void FitsFitsStream<T>::processExact()
+ 	}
+ 	this->ext_++;
+ 
+-	dataSkip(this->head_->datablocks()*FTY_BLOCK);
++	this->dataSkip(this->head_->datablocks()*FTY_BLOCK);
+ 	delete this->head_;
+ 	this->head_ = NULL;
+       }
+@@ -434,7 +434,7 @@ template<class T> void FitsFitsStream<T>::processRelax()
+   // ok, no image, save primary and lets check extensions
+   this->primary_ = this->head_;
+   this->managePrimary_ = 1;
+-  dataSkip(this->head_->datablocks()*FTY_BLOCK);
++  this->dataSkip(this->head_->datablocks()*FTY_BLOCK);
+   this->head_ = NULL;
+ 
+   // ok, no image, lets check extensions
+@@ -470,7 +470,7 @@ template<class T> void FitsFitsStream<T>::processRelax()
+ 	delete [] a;
+     }
+ 
+-    dataSkip(this->head_->datablocks()*FTY_BLOCK);
++    this->dataSkip(this->head_->datablocks()*FTY_BLOCK);
+     delete this->head_;
+     this->head_ = NULL;
+   }
+@@ -528,10 +528,10 @@ template<class T> FitsArrStream<T>::FitsArrStream(FitsFile::FlushMode f)
+ 
+   // skip header
+   if (this->pSkip_)
+-    dataSkip(this->pSkip_);
++    this->dataSkip(this->pSkip_);
+ 
+   // read data
+-  if (!dataRead((off_t)this->pWidth_*this->pHeight_*this->pDepth_*abs(this->pBitpix_)/8)) {
++  if (!this->dataRead((off_t)this->pWidth_*this->pHeight_*this->pDepth_*abs(this->pBitpix_)/8)) {
+     if ((this->flush_ == this->FLUSH) && this->data_)
+       this->skipEnd();
+     this->valid_=0;
+@@ -575,7 +575,7 @@ template<class T> FitsMosaicStream<T>::FitsMosaicStream(FitsFile::FlushMode f)
+     this->error();
+     return;
+   }
+-  dataSkip(this->primary_->datablocks()*FTY_BLOCK);
++  this->dataSkip(this->primary_->datablocks()*FTY_BLOCK);
+ 
+   // first extension
+   this->head_  = this->headRead();
+@@ -586,7 +586,7 @@ template<class T> FitsMosaicStream<T>::FitsMosaicStream(FitsFile::FlushMode f)
+   this->ext_++;
+ 
+   // be sure to read all blocks, so that the next call starts on a boundary
+-  if (!dataRead(this->head_->datablocks()*FTY_BLOCK)) {
++  if (!this->dataRead(this->head_->datablocks()*FTY_BLOCK)) {
+     this->error();
+     return;
+   }
+@@ -620,7 +620,7 @@ template<class T> FitsMosaicNextStream<T>::FitsMosaicNextStream(FitsFile* p,
+   this->ext_++;
+ 
+   // be sure to read all blocks, so that the next call starts on a boundary
+-  if (!dataRead(this->head_->datablocks()*FTY_BLOCK)) {
++  if (!this->dataRead(this->head_->datablocks()*FTY_BLOCK)) {
+     this->error();
+     return;
+   }
diff --git a/debian/patches/series b/debian/patches/series
index 88fb15e..c36315b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@ remove_blt_rpath.patch
 htmlwidget.patch
 optional_doc_package.patch
 fix_bit32_saotk.patch
+fix_saotk_fitsy.patch

-- 
image display tool for astronomy