On Fri, 26 Mar 2010 at  9:10:39 +0200, Johann Haarhoff wrote:
> Hi Carlos
> 
> >*data should not be CARD32, but 'long' as the original version.
> >There are problems in using CARD32 for a 'long' in 64-bits.
> >
> >The original cairo work from Alfredo and Dan probably was using CARD32
> >because the patch removing this particular CARD32 is from Sept 2009,
> >see commit c7f2a189.
> 
> To be honest, I have not looked carefully at the mountain of stuff
> that had to be merged. If you see something that is obviously wrong
> or out of line, please fix. Most of this was done late at night
> copy-and-pasting code from patch.rej files because the darcs patches
> would not apply cleanly.

Sure, given the amount of more important stuff to do, that is quite
natural. I read through the patch trying to do some review while
I noticed this CARD32, then I also pointed out the style issues
in nearby code while at it.

> I will definitely check this for the lines I touch by hand. I
> dislike the spaces between * and the name very much.

Good, that was the intention of pointing that out :-)

> 
> >Do you want me to fix the these or have you already made more changes
> >to the code in the meantime?
> 
> You can fix these. I am sending patches for the cairo branch as soon
> as possible, so I am sharing very early, perhaps too early. The
> upshot is that it makes it easier for other people to help.

Ok, I will 'fixup' (which is a new mode in git rebase -i) the above into 
your original conversion.


> >In fact, this is something I want to ask you. What workflow would you
> >prefer right now? If somebody decides to make changes (like the CARD32
> >above) should it go through you or will you be able to cope with the
> >code changing behind your back in #cairo, with you having probably
> >changes locally in your tree and having to rebase your own work locally
> >to take into account the "moving" cairo branch?
> 
> I think that because I am sharing my patches very early, there
> should not be a big problem with code changing behind my back. I
> will try to keep my branch up with the moving cairo branch.

Ok then. 


-- 
To unsubscribe, send mail to [email protected].

Reply via email to