Re: [ft-devel] [GSoC] Moving CFF stuff into psaux module

[Werner LEMBERG]

>> . If you are going to clean up, please replace the `cf2' file name
>>   prefix with something more generic.
> 
> I think s/cf2/ps for the file names should be fine?

Yes, this looks good.

> I have rebased onto latest and did a force push (this branch is
> meant to be disposable). I hope that is fine.

Yep.

> Either way, I have gotten freetype building again, and from a
> cursory inspection using the freetype demos, everything seems to
> work fine.  I can't tell if I may have introduced any subtle bugs,
> how can I make use of the testing suite to rigorously confirm this?

Hehe, I hope we have something after the other two GSoC students
finish their work :-)

> The main changes from last time are:

> (1) Added a new service in `cff', FT_Service_CFFLoad, providing
> functions from `cff/cffload' to `psaux'

OK.  Here a minor patch.


diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
index c27f74c3..e4721d74 100644
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -203,7 +203,7 @@
     FT_Bool      hinting, scaled, force_scaling;
     CFF_Font     cff  = (CFF_Font)face->extra.data;
 
-    PSAux_Service            psaux         = face->psaux;
+    PSAux_Service            psaux         = (PSAux_Service)face->psaux;
     const CFF_Decoder_Funcs  decoder_funcs = psaux->cff_decoder_funcs;
 
     FT_Matrix    font_matrix;


> (2) Moved all the CFF struct definitions from cffobjs.h and
> cfftypes.h to freetype/internal, so that the cff functions in psaux
> can access them as well.

OK.

> (1) is as advised previously, whereas (2) was necessary to make the
> project build again. I do wonder if it may have been too extreme to
> move all the definitions over, but I could not come up with a better
> solution.

At a first glance it looks OK.

> I will do a cleaned commit with proper changelogs once I can confirm
> that functionality is as it is before all my changes.

No hurry for that!

> Would you prefer that I squash everything into a single commit,
> since it does not compile on intermediate commits, or to separate
> changes in some logical manner, e.g. grouped by the specific
> component I was pulling out from `cff' ?

Please do logical, smaller commits.  Simply add a sentence to the log
message about not being able to compile the current commit.

So it seems that you have already done a big step into the right
direction.  Two main issues are still to tackle, right?

. Handle `cid' module.

. Make the cff hinter handle Type1 (and CID) fonts also, as an
  alternative to the `pshinter' module.


    Werner