[Insight-developers] ITK Dashboard: locally modified files in : riemann.sumost.ca

[Luis Ibanez]

Hi Steve,


One part of the patch already contains code that is
conditioned to the version of Tcl:


Lines 142 of
Insight/Wrapping/CSwig/IO/itkTkImageViewer2D.cxx


#if (TK_MAJOR_VERSION == 8) && (TK_MINOR_VERSION < 4)
  Tk_PhotoPutBlock(photo, &block, 0, 0, size[0], size[1]);
#else
  Tk_PhotoPutBlock(photo, &block, 0, 0, size[0], size[1],
                   TK_PHOTO_COMPOSITE_SET);
#endif


Couldn't we do the same for the change in line 114 ?

For example, we could do:

#if (TK_MAJOR_VERSION == 8) && (TK_MINOR_VERSION < 5)
  Tk_PhotoSetSize(photo, width, height);
#else
  Tk_PhotoSetSize(m_Interpreter, photo, width, height);
#endif


------


I just modified the patch,  uploaded it to the bug report,
http://www.kwwidgets.org/Bug/view.php?id=10532

and committed it to CVS.
http://public.kitware.com/cgi-bin/viewcvs.cgi/Wrapping/CSwig/IO/itkTkImageViewer2D.cxx?root=Insight&r1=1.2&r2=1.3


Could you please sync your checkout in Riemman ?


We really don't want to keep a machine submitting
builds with red entries on a regular basis.


     Thanks a lot for contributing the patch,


            Luis


---------------------------------------------------------------------------------
On Thu, Apr 22, 2010 at 9:31 PM, Steve M. Robbins <steve at sumost.ca> wrote:

> On Thu, Apr 22, 2010 at 10:12:27AM -0400, Luis Ibanez wrote:
> > Hi Steve,
> >
> >        riemann.sumost.ca
> >
> > seems to have locally modified files.
> >
> > http://www.cdash.org/CDash/viewUpdate.php?buildid=592236
> >
> > Could you please take a look ?
>
> Yes: CSwig wrapping is broken for tcl 8.5
>
> I have applied the patch described here
> http://www.kwwidgets.org/Bug/view.php?id=10532
>
> I haven't committed this patch because I'm afraid
> it will break tcl versions prior to 8.5.
>
>
> > BTW: Parallel build for the
> > wrapping should we working now,
> > after the fix we committed a couple
> > of days ago.
>
> Great!  I'll clean out the build dir and see what happens tonight.
>
> -Steve
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.10 (GNU/Linux)
>
> iD8DBQFL0Phr0i2bPSHbMcURAuZOAJ0aLo18AIWYqqtmBm4pux+mV42xvACgrJn5
> DCFokVFOwc/yrD4hy/EWFIA=
> =LApo
> -----END PGP SIGNATURE-----
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.itk.org/mailman/private/insight-developers/attachments/20100425/fe68982d/attachment.htm>