head 1.2; access; symbols pkgsrc-2021Q1:1.1.0.122 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.120 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.118 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.114 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.94 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.116 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.112 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.110 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.108 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.106 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.104 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.102 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.100 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.98 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.96 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.92 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.90 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.88 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.86 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.84 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.82 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.80 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.78 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.76 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.74 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.72 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.70 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.68 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.66 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.64 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.62 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.60 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.58 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.56 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.54 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.52 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.50 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.48 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.46 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.44 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.42 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.40 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.38 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.36 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.34 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.32 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.30 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.28 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.26 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.24 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.22 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.20 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.18 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.16 pkgsrc-2008Q1:1.1.0.14 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.12 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.10 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.8 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.6 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.4 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.2 pkgsrc-2006Q3-base:1.1; locks; strict; comment @# @; 1.2 date 2021.05.04.14.48.34; author prlw1; state dead; branches; next 1.1; commitid BlR7MN58bTdEbQRC; 1.1 date 2006.09.24.15.53.06; author joerg; state Exp; branches; next ; desc @@ 1.2 log @Update vtk to 9.0.1 18 years of updates. In memory of Matthias Drochner. @ text @$NetBSD: patch-ab,v 1.1 2006/09/24 15:53:06 joerg Exp $ --- IO/vtkImageReader.cxx.orig 2006-09-24 16:29:56.000000000 +0000 +++ IO/vtkImageReader.cxx @@@@ -191,14 +191,14 @@@@ void vtkImageReaderUpdate2(vtkImageReade { int inIncr[3], outIncr[3]; OT *outPtr0, *outPtr1, *outPtr2; - long streamSkip0, streamSkip1; + std::streamoff streamSkip0, streamSkip1; unsigned long streamRead; int idx0, idx1, idx2, pixelRead; unsigned char *buf; int inExtent[6]; int dataExtent[6]; int comp, pixelSkip; - long filePos, correction = 0; + std::streampos filePos, correction = 0; unsigned long count = 0; unsigned short DataMask; unsigned long target; @@@@ -233,18 +233,18 @@@@ void vtkImageReaderUpdate2(vtkImageReade pixelRead = dataExtent[1] - dataExtent[0] + 1; streamRead = static_cast(pixelRead * self->GetDataIncrements()[0]); - streamSkip0 = (long)(self->GetDataIncrements()[1] - streamRead); - streamSkip1 = (long)(self->GetDataIncrements()[2] - - (dataExtent[3] - dataExtent[2] + 1)* self->GetDataIncrements()[1]); + streamSkip0 = self->GetDataIncrements()[1] - streamRead; + streamSkip1 = self->GetDataIncrements()[2] - + (dataExtent[3] - dataExtent[2] + 1)* self->GetDataIncrements()[1]; pixelSkip = data->GetNumberOfScalarComponents(); // read from the bottom up if (!self->GetFileLowerLeft()) { - streamSkip0 = (long)(-static_cast(streamRead) - - self->GetDataIncrements()[1]); - streamSkip1 = (long)(self->GetDataIncrements()[2] + - (dataExtent[3] - dataExtent[2] + 1)* self->GetDataIncrements()[1]); + streamSkip0 = -static_cast(streamRead) + - self->GetDataIncrements()[1]; + streamSkip1 = self->GetDataIncrements()[2] + + (dataExtent[3] - dataExtent[2] + 1)* self->GetDataIncrements()[1]; } @@@@ -298,8 +298,8 @@@@ void vtkImageReaderUpdate2(vtkImageReade vtkGenericWarningMacro("File operation failed. row = " << idx1 << ", Tried to Read = " << streamRead << ", Read = " << self->GetFile()->gcount() - << ", Skip0 = " << streamSkip0 - << ", Skip1 = " << streamSkip1 + << ", Skip0 = " << (long)streamSkip0 + << ", Skip1 = " << (long)streamSkip1 << ", FilePos = " << static_cast(self->GetFile()->tellg())); delete [] buf; return; @ 1.1 log @Use std::streampos and std::streamoff, since + and - are ambigious for long. This fixes compilation with GCC 3.4+. @ text @d1 1 a1 1 $NetBSD$ @