Update for recent libpng

[svrt.git] / misc.h

diff --git a/misc.h b/misc.h
index e9cabf4..4762eaa 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -18,7 +18,7 @@
  *  General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with selector.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with svrt.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
@@ -67,18 +67,21 @@ void deallocate_array(T **array) {
   delete[] array;
 }
 
-template<class T>
-T smooth_min(T x, T y) {
-  T z = exp(x - y);
-  return 0.5 * (x + y - (x - y)/(1 + 1/z) - (y - x)/(1 + z));
-}
-
 template <class T>
 void write_var(ostream *os, const T *x) { os->write((char *) x, sizeof(T)); }
 
 template <class T>
 void read_var(istream *is, T *x) { is->read((char *) x, sizeof(T)); }
 
+template <class T>
+inline T sq(T x) {
+  return x * x;
+}
+
+inline scalar_t log2(scalar_t x) {
+  return log(x)/log(2.0);
+}
+
 template <class T>
 void grow(int *nb_max, int nb, T** current, int factor) {
   ASSERT(*nb_max > 0);
@@ -91,32 +94,4 @@ void grow(int *nb_max, int nb, T** current, int factor) {
   }
 }
 
-template <class T>
-inline T sq(T x) {
-  return x * x;
-}
-
-inline scalar_t log2(scalar_t x) {
-  return log(x)/log(2.0);
-}
-
-inline scalar_t xi(scalar_t x) {
-  if(x <= 0.0) return 0.0;
-  else         return - x * log(x)/log(2.0);
-}
-
-scalar_t discrete_entropy(int *n, int nb);
-
-char *next_word(char *buffer, char *r, int buffer_size);
-
-void random_permutation(int *val, int nb);
-void tag_subset(bool *val, int nb_total, int nb_to_tag);
-
-struct Couple {
-  int index;
-  scalar_t value;
-};
-
-int compare_couple(const void *a, const void *b);
-
 #endif