From afe4982a801812db0820578451ca3b6a0433b972 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 28 Nov 2010 16:28:51 +0100 Subject: [PATCH] Fix an other build issue --- debian/patches/fix_bug_issue.diff | 134 ++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) create mode 100644 debian/patches/fix_bug_issue.diff diff --git a/debian/patches/fix_bug_issue.diff b/debian/patches/fix_bug_issue.diff new file mode 100644 index 0000000..a0eaa05 --- /dev/null +++ b/debian/patches/fix_bug_issue.diff @@ -0,0 +1,134 @@ +diff --git a/mgl/mgl_data_io.cpp b/mgl/mgl_data_io.cpp +index 0c5d845..d04f9ee 100644 +--- a/mgl/mgl_data_io.cpp ++++ b/mgl/mgl_data_io.cpp +@@ -2,31 +2,33 @@ + * mgl_data_io.cpp is part of Math Graphic Library + * Copyright (C) 2007 Alexey Balakin * + * * +- * This program is free software; you can redistribute it and/or modify * +- * it under the terms of the GNU Library General Public License as * +- * published by the Free Software Foundation; either version 3 of the * +- * License, or (at your option) any later version. * +- * * +- * This program is distributed in the hope that it will be useful, * +- * but WITHOUT ANY WARRANTY; without even the implied warranty of * +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +- * GNU General Public License for more details. * +- * * +- * You should have received a copy of the GNU Library General Public * +- * License along with this program; if not, write to the * +- * Free Software Foundation, Inc., * +- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * +- ***************************************************************************/ ++ * This program is free software; you can redistribute it and/or modify * ++ * it under the terms of the GNU Library General Public License as * ++ * published by the Free Software Foundation; either version 3 of the * ++ * License, or (at your option) any later version. * ++ * * ++ * This program is distributed in the hope that it will be useful, * ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of * ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * ++ * GNU General Public License for more details. * ++ * * ++ * You should have received a copy of the GNU Library General Public * ++ * License along with this program; if not, write to the * ++ * Free Software Foundation, Inc., * ++ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ++ ***************************************************************************/ + #include + #include + #include + #include +-#include ++#include + #ifdef HAVE_HDF5 + #include + #endif + #ifdef HAVE_HDF4 ++#define intf hdf4_intf + #include ++#undef intf + #endif + + #ifndef WIN32 +@@ -906,42 +908,42 @@ void mglData::Fill(const char *eq, mglPoint r1, mglPoint r2, const mglData *v, c + } + //----------------------------------------------------------------------------- + void mglData::ReadHDF4(const char *fname,const char *data) +-{ +-#ifdef HAVE_HDF4 +- int sd = SDstart(fname,DFACC_READ), nn, i; +- if(sd==-1) return; // is not a HDF4 file +- char name[64]; +- SDfileinfo(sd,&nn,&i); +- for(i=0;i