[metview] 03/04: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Thu May 25 07:53:15 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag debian/4.8.4-1
in repository metview.
commit 99a97f4eae716fbfb1efb0824550913575b642cb
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Fri Mar 24 11:42:35 2017 +0000
refresh patches
---
debian/patches/auto-ptr.patch | 190 +++++++++++++++++++++---------------------
1 file changed, 95 insertions(+), 95 deletions(-)
diff --git a/debian/patches/auto-ptr.patch b/debian/patches/auto-ptr.patch
index 5721580..0ef406f 100644
--- a/debian/patches/auto-ptr.patch
+++ b/debian/patches/auto-ptr.patch
@@ -1,12 +1,12 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: Move auto_ptr -> std::unique_ptr() for c++11 standard
-Last-Updated: 2016-03-21
+Last-Updated: 2017-03-24
Forwarded: no
-Index: metview-4.6.5/src/Desktop/Log.cc
+Index: metview-4.8.4/src/Desktop/Log.cc
===================================================================
---- metview-4.6.5.orig/src/Desktop/Log.cc
-+++ metview-4.6.5/src/Desktop/Log.cc
+--- metview-4.8.4.orig/src/Desktop/Log.cc
++++ metview-4.8.4/src/Desktop/Log.cc
@@ -56,11 +56,11 @@ Log::operator ostream&()
if(tee_.get() == 0)
{
@@ -30,10 +30,10 @@ Index: metview-4.6.5/src/Desktop/Log.cc
-}*/
\ No newline at end of file
+}*/
-Index: metview-4.6.5/src/Desktop/Log.h
+Index: metview-4.8.4/src/Desktop/Log.h
===================================================================
---- metview-4.6.5.orig/src/Desktop/Log.h
-+++ metview-4.6.5/src/Desktop/Log.h
+--- metview-4.8.4.orig/src/Desktop/Log.h
++++ metview-4.8.4/src/Desktop/Log.h
@@ -41,8 +41,8 @@ private:
Log& operator=(const Log&);
@@ -45,11 +45,11 @@ Index: metview-4.6.5/src/Desktop/Log.h
IconObject* object_;
static ostream& global();
-Index: metview-4.6.5/src/Macro/grib.cc
+Index: metview-4.8.4/src/Macro/grib.cc
===================================================================
---- metview-4.6.5.orig/src/Macro/grib.cc
-+++ metview-4.6.5/src/Macro/grib.cc
-@@ -376,10 +376,10 @@ nontested_grib_api_port("GenerateFunctio
+--- metview-4.8.4.orig/src/Macro/grib.cc
++++ metview-4.8.4/src/Macro/grib.cc
+@@ -441,10 +441,10 @@ nontested_grib_api_port("GenerateFunctio
field *g = get_field(v,i,expand_mem);
field *h = get_field(w,i,expand_mem);
@@ -62,7 +62,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
bool cont = true;
while( cont ) //-- process current field
-@@ -526,11 +526,11 @@ Value MaskFunction::Execute(int arity,Va
+@@ -591,11 +591,11 @@ Value MaskFunction::Execute(int arity,Va
for(i = 0; i < v->count ;i++)
{
@@ -76,7 +76,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
for( int j=0; j < grd->length(); ++j )
{
-@@ -629,7 +629,7 @@ Value RMaskFunction::Execute( int arity,
+@@ -694,7 +694,7 @@ Value RMaskFunction::Execute( int arity,
for( i = 0; i < v->count; i++ ) //-- for all fields in a fieldset
{
@@ -85,7 +85,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
if(! newGrd->hasLocationInfo() )
return Error( "rmask: unimplemented or spectral data - unable to extract location data" );
-@@ -725,7 +725,7 @@ Value GridDistanceFunction::Execute( int
+@@ -790,7 +790,7 @@ Value GridDistanceFunction::Execute( int
for( i = 0; i < v->count; i++ ) //-- for all fields in a fieldset
{
@@ -94,7 +94,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
if(! newGrd->hasLocationInfo() )
return Error( "distance: unimplemented or spectral data - unable to extract location data" );
-@@ -1828,11 +1828,11 @@ Value CosLatFunction::Execute(int,Value
+@@ -1893,11 +1893,11 @@ Value CosLatFunction::Execute(int,Value
for(i = 0; i < v->count ;i++)
{
@@ -108,7 +108,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
for( int j=0; j < grd->length(); ++j )
{
-@@ -1870,11 +1870,11 @@ Value SinLatFunction::Execute(int,Value
+@@ -1935,11 +1935,11 @@ Value SinLatFunction::Execute(int,Value
for(i = 0; i < v->count ;i++)
{
@@ -122,7 +122,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
for( int j=0; j < grd->length(); ++j )
{
-@@ -1976,7 +1976,7 @@ Value GridLatLonsFunction::Execute(int /
+@@ -2041,7 +2041,7 @@ Value GridLatLonsFunction::Execute(int /
for(i = 0; i < fs->count ;i++) // for each field...
{
@@ -131,7 +131,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
if(! grid->hasLocationInfo() )
return Error( "gridlats/gridlons: unimplemented or spectral data - unable to extract location data" );
-@@ -2565,15 +2565,15 @@ Value IntegrateFunction::Execute(int ari
+@@ -2668,15 +2668,15 @@ Value IntegrateFunction::Execute(int ari
for(i = 0; i < v->count ;i++)
{
@@ -151,7 +151,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
}
if( maskgrd.get() && ! maskgrd->isEqual( grd.get() ) )
-@@ -2685,7 +2685,7 @@ Value MinMaxAreaFunction::Execute(int, V
+@@ -2788,7 +2788,7 @@ Value MinMaxAreaFunction::Execute(int, V
for(i = 0; i < v->count ;i++)
{
@@ -160,7 +160,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
if(! grd->hasLocationInfo() )
return Error( "minvalue/maxvalue: unimplemented or spectral data - unable to extract location data" );
-@@ -2826,7 +2826,7 @@ Value InterpolateFunction::Execute(int a
+@@ -2929,7 +2929,7 @@ Value InterpolateFunction::Execute(int a
release_field(g);
#else
@@ -169,7 +169,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
if( ! grd->hasLocationInfo() )
{
-@@ -2991,7 +2991,7 @@ Value NearestGridpointFunction::Execute(
+@@ -3094,7 +3094,7 @@ Value NearestGridpointFunction::Execute(
vvals = new CVector(vlat->Count());
@@ -178,7 +178,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
if( ! grd->hasLocationInfo() )
{
-@@ -3229,15 +3229,15 @@ Value FindFunction::Execute(int arity,Va
+@@ -3332,15 +3332,15 @@ Value FindFunction::Execute(int arity,Va
for(i = 0; i < v->count ;i++)
{
@@ -198,7 +198,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
}
if( maskgrd.get() && ! maskgrd->isEqual( grd.get() ) )
-@@ -3349,7 +3349,7 @@ Value GFindFunction::Execute(int arity,V
+@@ -3452,7 +3452,7 @@ Value GFindFunction::Execute(int arity,V
for(int i = 0; i < v->count ;i++)
{
@@ -207,7 +207,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
if(! grd->hasLocationInfo() )
return Error( "gfind: unimplemented or spectral data - unable to extract location data" );
-@@ -3423,7 +3423,7 @@ Value VertIntFunction::Execute(int arity
+@@ -3526,7 +3526,7 @@ Value VertIntFunction::Execute(int arity
{
field *g = GetIndexedFieldWithAtLeastPackedMem (v,i);
//gribsec1 *s1 = (gribsec1*)&g->ksec1[0];
@@ -216,7 +216,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
//if(s1->parameter == 152) n = i;
if( grd->getLong(parameterKey) == 152 )
n = i;
-@@ -3765,7 +3765,7 @@ Value UniVertIntFunction::Execute(int /*
+@@ -3868,7 +3868,7 @@ Value UniVertIntFunction::Execute(int /*
for(int i = 0; (i < fs_data->count) && (n_lnsp == -1) ; ++i)
{
f_lnsp_orig = GetIndexedFieldWithAtLeastPackedMem(fs_data,i);
@@ -225,7 +225,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
if( grd->getLong(parameterKey) == lnsp_ )
{
n_lnsp = i; //-- lnsp found - stop the loop
-@@ -4333,7 +4333,7 @@ Value UniThicknessAndPressureFunction::E
+@@ -4436,7 +4436,7 @@ Value UniThicknessAndPressureFunction::E
for(i = 0; i < w->count ;i++)
{
field *g = GetIndexedFieldWithAtLeastPackedMem(w,i);
@@ -234,7 +234,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
levels[i] = (int)fld->level();
release_field(g);
}
-@@ -4347,7 +4347,7 @@ Value UniThicknessAndPressureFunction::E
+@@ -4450,7 +4450,7 @@ Value UniThicknessAndPressureFunction::E
for(int i = 0; i < v->count ;i++)
{
@@ -243,7 +243,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
if(! grd->isValid() )
return Error( "unipressure/unithickness: cannot process this type of grid!" );
long param = grd->getLong(parameterKey);
-@@ -4376,7 +4376,7 @@ Value UniThicknessAndPressureFunction::E
+@@ -4479,7 +4479,7 @@ Value UniThicknessAndPressureFunction::E
grd->init();
field* h = copy_field(g,false);
@@ -252,7 +252,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
double a1, b1, a0, b0;
if( ! grd->vertCoordCoefs( a1, b1, level ) )
-@@ -4608,7 +4608,7 @@ Value GribMatrixFunction::Execute(int,Va
+@@ -4711,7 +4711,7 @@ Value GribMatrixFunction::Execute(int,Va
{
field *g = get_field(v,i,expand_mem);
//gribsec2_ll *s2 = (gribsec2_ll*) &g->ksec2[0];
@@ -261,7 +261,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
string gridType = grd->gridType();
if ((gridType != cLatLonGrid) && (gridType != cSatelliteImage))
-@@ -4679,18 +4679,18 @@ Value GribDirectionFunction::Execute(int
+@@ -4782,18 +4782,18 @@ Value GribDirectionFunction::Execute(int
for(int i = 0; i < u->count ;i++)
{
@@ -283,7 +283,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
for( int j=0; j < gu->length(); ++j )
{
-@@ -4754,7 +4754,7 @@ Value MeanEwFunction::Execute(int,Value
+@@ -4857,7 +4857,7 @@ Value MeanEwFunction::Execute(int,Value
for( int i = 0; i < v->count; i++ )
{
@@ -292,7 +292,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
if(! grd->hasLocationInfo() )
return Error( "mean_ew: unimplemented grid type: %s", grd->gridType().c_str() );
-@@ -4765,7 +4765,7 @@ Value MeanEwFunction::Execute(int,Value
+@@ -4868,7 +4868,7 @@ Value MeanEwFunction::Execute(int,Value
grd->gridType() != cGaussianReducedGrid )
return Error( "mean_ew: unsuitable grid type: %s", grd->gridType().c_str() );
@@ -301,7 +301,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
double currentLatRow = grd->lat_y();
bool cont = true;
-@@ -4870,7 +4870,7 @@ LatLonAverageFunction::Execute(int,Value
+@@ -4973,7 +4973,7 @@ LatLonAverageFunction::Execute(int,Value
for( int fi = 0; fi < fs->count; fi++ ) //-- loop over fields in fieldset
{
@@ -310,7 +310,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
if(! grd->hasLocationInfo() )
return Error( "average_xx: unimplemented grid type: %s", grd->gridType().c_str() );
-@@ -5054,12 +5054,12 @@ Value GribIntToFloatFunction::Execute( i
+@@ -5157,12 +5157,12 @@ Value GribIntToFloatFunction::Execute( i
for( int i = 0; i < v->count; ++i ) //-- for all fields in a fieldset
{
field *g = get_field(v,i,expand_mem);
@@ -325,7 +325,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
if(! grdOut->isValid() )
return Error( "float: unimplemented grid type: %s", grdOut->gridType().c_str() );
-@@ -5132,12 +5132,12 @@ Value GribFloatToIntFunction::Execute( i
+@@ -5235,12 +5235,12 @@ Value GribFloatToIntFunction::Execute( i
for( int i = 0; i < v->count; ++i ) //-- for all fields in a fieldset
{
field *g = get_field(v,i,expand_mem); //-- input field
@@ -340,7 +340,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
if(! grdOut->isValid() )
return Error( "integer: unimplemented grid type: %s", grdOut->gridType().c_str() );
-@@ -5293,11 +5293,11 @@ Value CovarianceFunction::Execute(int ar
+@@ -5396,11 +5396,11 @@ Value CovarianceFunction::Execute(int ar
double CovarFunc( field* f1, field* f2, const MvGeoBox& area )
{
@@ -354,7 +354,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
if(! grd2->hasLocationInfo() )
throw MvException( "Unimplemented or spectral data - unable to extract location data" );
-@@ -5612,7 +5612,7 @@ Value FrequenciesFunction::Execute(int a
+@@ -5715,7 +5715,7 @@ Value FrequenciesFunction::Execute(int a
bool found;
for(i = 0; i < v->count ;i++)
{
@@ -363,7 +363,7 @@ Index: metview-4.6.5/src/Macro/grib.cc
if(! grd->hasLocationInfo() )
return Error( "frequencies: unimplemented or spectral data - unable to extract location data" );
-@@ -5681,11 +5681,11 @@ Value FillMVEWFunction::Execute(int,Valu
+@@ -5784,11 +5784,11 @@ Value FillMVEWFunction::Execute(int,Valu
for( int i = 0; i < v->count; i++)
{
@@ -377,10 +377,10 @@ Index: metview-4.6.5/src/Macro/grib.cc
// Copy first point
v1 = grd->value();
-Index: metview-4.6.5/src/MetviewUI/CMakeLists.txt
+Index: metview-4.8.4/src/MetviewUI/CMakeLists.txt
===================================================================
---- metview-4.6.5.orig/src/MetviewUI/CMakeLists.txt
-+++ metview-4.6.5/src/MetviewUI/CMakeLists.txt
+--- metview-4.8.4.orig/src/MetviewUI/CMakeLists.txt
++++ metview-4.8.4/src/MetviewUI/CMakeLists.txt
@@ -385,7 +385,6 @@ set(MetviewUI_srcs
XPalette.h
XPixmap.h
@@ -389,10 +389,10 @@ Index: metview-4.6.5/src/MetviewUI/CMakeLists.txt
)
include_directories( CMAKE_CURRENT_SOURCE_DIR . )
-Index: metview-4.6.5/src/MetviewUI/Log.cc
+Index: metview-4.8.4/src/MetviewUI/Log.cc
===================================================================
---- metview-4.6.5.orig/src/MetviewUI/Log.cc
-+++ metview-4.6.5/src/MetviewUI/Log.cc
+--- metview-4.8.4.orig/src/MetviewUI/Log.cc
++++ metview-4.8.4/src/MetviewUI/Log.cc
@@ -63,10 +63,10 @@ Log::operator ostream&()
if(tee_.get() == 0)
{
@@ -406,10 +406,10 @@ Index: metview-4.6.5/src/MetviewUI/Log.cc
tee_ = t;
-Index: metview-4.6.5/src/MetviewUI/Log.h
+Index: metview-4.8.4/src/MetviewUI/Log.h
===================================================================
---- metview-4.6.5.orig/src/MetviewUI/Log.h
-+++ metview-4.6.5/src/MetviewUI/Log.h
+--- metview-4.8.4.orig/src/MetviewUI/Log.h
++++ metview-4.8.4/src/MetviewUI/Log.h
@@ -92,8 +92,8 @@ private:
// -- Members
@@ -421,11 +421,11 @@ Index: metview-4.6.5/src/MetviewUI/Log.h
IconObject* object_;
// -- Methods
-Index: metview-4.6.5/src/libMetview/MvFieldSet.cc
+Index: metview-4.8.4/src/libMetview/MvFieldSet.cc
===================================================================
---- metview-4.6.5.orig/src/libMetview/MvFieldSet.cc
-+++ metview-4.6.5/src/libMetview/MvFieldSet.cc
-@@ -1314,7 +1314,7 @@ double MvField::covar( MvField& other,
+--- metview-4.8.4.orig/src/libMetview/MvFieldSet.cc
++++ metview-4.8.4/src/libMetview/MvFieldSet.cc
+@@ -1331,7 +1331,7 @@ double MvField::covar( MvField& other,
}
//-- cReleaseMemoryFalse or cReleaseMemoryTrue???
@@ -434,23 +434,23 @@ Index: metview-4.6.5/src/libMetview/MvFieldSet.cc
if( ! mvgrid_->isEqual( grd2.get() ) )
{
-Index: metview-4.6.5/src/libUtil/CMakeLists.txt
+Index: metview-4.8.4/src/libUtil/CMakeLists.txt
===================================================================
---- metview-4.6.5.orig/src/libUtil/CMakeLists.txt
-+++ metview-4.6.5/src/libUtil/CMakeLists.txt
-@@ -31,7 +31,7 @@ Tokenizer.cc
+--- metview-4.8.4.orig/src/libUtil/CMakeLists.txt
++++ metview-4.8.4/src/libUtil/CMakeLists.txt
+@@ -30,7 +30,7 @@ Tokenizer.cc
UtilitiesC.c
Cached.h GribMetaData.h LogHandler.h MagicsColours.h MtInputEvent.h MvException.h
- MvFileInfo.h MvFlextra.h MvGribParC.h MvKeyManager.h MvKeyProfile.h MvMessageMetaData.h MvMsg.h MvOdb.h
+ MvFlextra.h MvGribParC.h MvKeyManager.h MvKeyProfile.h MvMessageMetaData.h MvMsg.h MvOdb.h
-MvSTL.h MvStopWatch.h MvVersionInfo.h Rectangle.h Request.h UtilitiesC.h auto_ptr.h
+MvSTL.h MvStopWatch.h MvVersionInfo.h Rectangle.h Request.h UtilitiesC.h
bits.h gdefines.h inc_iostream.h inc_stl.h min_max_macros.h
xec.h
Assertions.hpp Box.hpp Factory.hpp Grib.hpp
-Index: metview-4.6.5/src/libUtil/inc_stl.h
+Index: metview-4.8.4/src/libUtil/inc_stl.h
===================================================================
---- metview-4.6.5.orig/src/libUtil/inc_stl.h
-+++ metview-4.6.5/src/libUtil/inc_stl.h
+--- metview-4.8.4.orig/src/libUtil/inc_stl.h
++++ metview-4.8.4/src/libUtil/inc_stl.h
@@ -30,7 +30,7 @@
#ifndef NOUSING
//-- for HPUX aCC
@@ -460,10 +460,10 @@ Index: metview-4.6.5/src/libUtil/inc_stl.h
using std::less;
using std::list;
using std::map;
-Index: metview-4.6.5/src/uPlot/Canvas.h
+Index: metview-4.8.4/src/uPlot/Canvas.h
===================================================================
---- metview-4.6.5.orig/src/uPlot/Canvas.h
-+++ metview-4.6.5/src/uPlot/Canvas.h
+--- metview-4.8.4.orig/src/uPlot/Canvas.h
++++ metview-4.8.4/src/uPlot/Canvas.h
@@ -195,7 +195,7 @@ protected:
// Members
Device& myDevice_; // pointer to the device
@@ -473,10 +473,10 @@ Index: metview-4.6.5/src/uPlot/Canvas.h
double aspectRatio_; // aspectRatio must be preserved
-Index: metview-4.6.5/src/uPlot/CartesianView.cc
+Index: metview-4.8.4/src/uPlot/CartesianView.cc
===================================================================
---- metview-4.6.5.orig/src/uPlot/CartesianView.cc
-+++ metview-4.6.5/src/uPlot/CartesianView.cc
+--- metview-4.8.4.orig/src/uPlot/CartesianView.cc
++++ metview-4.8.4/src/uPlot/CartesianView.cc
@@ -253,7 +253,7 @@ void CartesianView::DecodeDataUnit ( MvI
// Build a new data decoder, which will provide information
@@ -486,10 +486,10 @@ Index: metview-4.6.5/src/uPlot/CartesianView.cc
ensure (decoder.get() != 0);
int subpageId = 0;
-Index: metview-4.6.5/src/uPlot/CommonXSectView.cc
+Index: metview-4.8.4/src/uPlot/CommonXSectView.cc
===================================================================
---- metview-4.6.5.orig/src/uPlot/CommonXSectView.cc
-+++ metview-4.6.5/src/uPlot/CommonXSectView.cc
+--- metview-4.8.4.orig/src/uPlot/CommonXSectView.cc
++++ metview-4.8.4/src/uPlot/CommonXSectView.cc
@@ -387,7 +387,7 @@ void CommonXSectView::DecodeDataUnit ( M
// Build a new data decoder, which will provide information
@@ -508,10 +508,10 @@ Index: metview-4.6.5/src/uPlot/CommonXSectView.cc
int offset = Matrix("_OFFSET");
const char *fullName = Matrix("_FILE_NAME");
-Index: metview-4.6.5/src/uPlot/DataBuilder.cc
+Index: metview-4.8.4/src/uPlot/DataBuilder.cc
===================================================================
---- metview-4.6.5.orig/src/uPlot/DataBuilder.cc
-+++ metview-4.6.5/src/uPlot/DataBuilder.cc
+--- metview-4.8.4.orig/src/uPlot/DataBuilder.cc
++++ metview-4.8.4/src/uPlot/DataBuilder.cc
@@ -50,7 +50,7 @@ DataBuilder::Execute (PmContext& context
// Then try to get from contents of file
if ( ! (const char *)viewName )
@@ -521,10 +521,10 @@ Index: metview-4.6.5/src/uPlot/DataBuilder.cc
viewName = decoder->GetView();
}
#endif
-Index: metview-4.6.5/src/uPlot/GeoView.cc
+Index: metview-4.8.4/src/uPlot/GeoView.cc
===================================================================
---- metview-4.6.5.orig/src/uPlot/GeoView.cc
-+++ metview-4.6.5/src/uPlot/GeoView.cc
+--- metview-4.8.4.orig/src/uPlot/GeoView.cc
++++ metview-4.8.4/src/uPlot/GeoView.cc
@@ -213,7 +213,7 @@ void GeoView::DecodeDataUnit ( MvIcon& d
MvIconDataBase& dataBase = Owner().IconDataBase();
@@ -543,10 +543,10 @@ Index: metview-4.6.5/src/uPlot/GeoView.cc
Owner().SetView(view);
#endif
}
-Index: metview-4.6.5/src/uPlot/MapView.cc
+Index: metview-4.8.4/src/uPlot/MapView.cc
===================================================================
---- metview-4.6.5.orig/src/uPlot/MapView.cc
-+++ metview-4.6.5/src/uPlot/MapView.cc
+--- metview-4.8.4.orig/src/uPlot/MapView.cc
++++ metview-4.8.4/src/uPlot/MapView.cc
@@ -207,7 +207,7 @@ void MapView::DecodeDataUnit ( MvIcon& d
// Build a new data decoder, which will provide information
@@ -565,10 +565,10 @@ Index: metview-4.6.5/src/uPlot/MapView.cc
Owner().SetView(view);
#endif
}
-Index: metview-4.6.5/src/uPlot/Page.cc
+Index: metview-4.8.4/src/uPlot/Page.cc
===================================================================
---- metview-4.6.5.orig/src/uPlot/Page.cc
-+++ metview-4.6.5/src/uPlot/Page.cc
+--- metview-4.8.4.orig/src/uPlot/Page.cc
++++ metview-4.8.4/src/uPlot/Page.cc
@@ -29,15 +29,15 @@ Page::Page ( MvRequest& pageRequest ):
dropShouldStay_(false)
{
@@ -634,10 +634,10 @@ Index: metview-4.6.5/src/uPlot/Page.cc
}
#if 0
-Index: metview-4.6.5/src/uPlot/Page.h
+Index: metview-4.8.4/src/uPlot/Page.h
===================================================================
---- metview-4.6.5.orig/src/uPlot/Page.h
-+++ metview-4.6.5/src/uPlot/Page.h
+--- metview-4.8.4.orig/src/uPlot/Page.h
++++ metview-4.8.4/src/uPlot/Page.h
@@ -233,8 +233,8 @@ public:
virtual PlotModView& GetView() const
{ return *myView_; }
@@ -670,10 +670,10 @@ Index: metview-4.6.5/src/uPlot/Page.h
DrawingPriority drawingPriority_;
};
-Index: metview-4.6.5/src/uPlot/Presentable.cc
+Index: metview-4.8.4/src/uPlot/Presentable.cc
===================================================================
---- metview-4.6.5.orig/src/uPlot/Presentable.cc
-+++ metview-4.6.5/src/uPlot/Presentable.cc
+--- metview-4.8.4.orig/src/uPlot/Presentable.cc
++++ metview-4.8.4/src/uPlot/Presentable.cc
@@ -848,8 +848,8 @@ void
Presentable::SetDeviceData ( DeviceData* devdata )
{
@@ -694,10 +694,10 @@ Index: metview-4.6.5/src/uPlot/Presentable.cc
ensure (decoder.get() != 0);
// Read data headers (one by one)
-Index: metview-4.6.5/src/uPlot/Presentable.h
+Index: metview-4.8.4/src/uPlot/Presentable.h
===================================================================
---- metview-4.6.5.orig/src/uPlot/Presentable.h
-+++ metview-4.6.5/src/uPlot/Presentable.h
+--- metview-4.8.4.orig/src/uPlot/Presentable.h
++++ metview-4.8.4/src/uPlot/Presentable.h
@@ -405,7 +405,7 @@ protected:
MvRequest myRequest_; // request used to build me
int presentableId_; // unique Id
@@ -707,10 +707,10 @@ Index: metview-4.6.5/src/uPlot/Presentable.h
Location myLocation_; // position of the presentable
// Definition for the tree hierarchy of the Presentable class
-Index: metview-4.6.5/src/uPlot/SuperPage.cc
+Index: metview-4.8.4/src/uPlot/SuperPage.cc
===================================================================
---- metview-4.6.5.orig/src/uPlot/SuperPage.cc
-+++ metview-4.6.5/src/uPlot/SuperPage.cc
+--- metview-4.8.4.orig/src/uPlot/SuperPage.cc
++++ metview-4.8.4/src/uPlot/SuperPage.cc
@@ -120,8 +120,8 @@ SuperPage::SuperPage(const SuperPage &ol
printIndex_(0)
{
@@ -743,10 +743,10 @@ Index: metview-4.6.5/src/uPlot/SuperPage.cc
// Visit me
vis->Visit (*this);
-Index: metview-4.6.5/src/uPlot/SuperPage.h
+Index: metview-4.8.4/src/uPlot/SuperPage.h
===================================================================
---- metview-4.6.5.orig/src/uPlot/SuperPage.h
-+++ metview-4.6.5/src/uPlot/SuperPage.h
+--- metview-4.8.4.orig/src/uPlot/SuperPage.h
++++ metview-4.8.4/src/uPlot/SuperPage.h
@@ -299,8 +299,8 @@ public:
// Members
PaperSize size_; // size of superpage in paper coords (cms)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/metview.git
More information about the debian-science-commits
mailing list