Commit Graph

282 Commits

Author SHA1 Message Date
Werner Lemberg
bd5ae40006 Run g++ on the FreeType library. This should make the use of code in
C++ programs easier:

  Renamed FT_WordXX to FT_UIntXX.

  Changed a lot of void* to FT_Byte* if related to i/o streams -- FreeType
  always accesses streams byte-wise, so this makes sense IMHO.

  Added a lot of #ifdef __cplusplus to header files (and removed a few).

  Other minor syntax fixes (mostly casts).

  Replaced the variable `private' with `private_dict' -- `private' is
  reserved in C++.
2000-07-05 04:32:02 +00:00
David Turner
c6a92202c2 various clean-ups:
- using FT_UNUSED instead of UNUSED
- using FT_LONG64 and FT_INT64 instead of LONG64 & INT64
- using FT_SIZEOF_INT & FT_SIZEOF_LONG instead of...

- removed the #ifdefs that used SIZEOF_INT, instead we now
  use FT_Int32 and FT_UInt32 when needed to support
  32-bits quantity correctly on 64-bits systems..
2000-07-04 18:12:13 +00:00
Werner Lemberg
aa8c7da0bf Don't use -lefence in the demo Makefile.
Added C++ guards in ftmodule.h

Fix error check in ftglyph.c

Formatting; adding copyrights; fixing documentation
2000-07-04 03:37:18 +00:00
Werner Lemberg
d0c36e3b5a Formatting; fixing documentation. 2000-07-03 16:45:15 +00:00
David Turner
d18388e44b fixed a few 64-bit related bugs in "sfnt/ttload.c" and
"base/ftstream.c"

Note that "TT_PCLT" was incorrectly defined in
<freetype/tttables.h>
2000-07-03 15:00:49 +00:00
Werner Lemberg
768c9561f6 Formatting. Fixing some tracing messages. 2000-07-03 07:09:09 +00:00
Werner Lemberg
5811c7c3a5 Formatting.
Fixed some errors which prevented compiling.
2000-07-02 13:53:16 +00:00
Werner Lemberg
fbeb41d93d Formatting.
Adding copyright notices.

Removing an unnecessary file (smooth.h).
2000-07-02 00:27:53 +00:00
David Turner
e0bba32291 fixed the PSNames -> Unicode translation table
the Python script "glnames.py" was buggy and
lacked quite a few values in the "names_to_unicode"
table !!
2000-07-01 19:33:40 +00:00
Werner Lemberg
798e70e44c Removing. 2000-07-01 14:09:27 +00:00
Werner Lemberg
11735fe317 A small fix from Tom. 2000-07-01 14:08:31 +00:00
Werner Lemberg
a8bbc267a2 Formatting as usual...
Adding trivial argument checking to some functions.

Added dynamic driver interface to cidriver.

Minor `version' fixes for macfont and psnames modules.

Removed unnecessary files
2000-07-01 14:06:46 +00:00
David Turner
f9ca2bb58a managed to re-design entirely the API in <freetype/ftglyph.h>
It is now really the "glyph factory" that Stefan was probably
dreaming about..

fixed some recent formatting errors from Werner ;-)

cleaned up the demonstration programs from most of the
rust that they had, though I'm sure someone is going to
re-format them really soon !!

"ftstring" now uses the new ftglyph.h API, and is now
faster and smaller.. yep..
2000-06-30 23:12:55 +00:00
Werner Lemberg
ac39ecdca8 Formatting...
Fixing incorrect scaling of vertical advance width.
2000-06-30 22:24:36 +00:00
Werner Lemberg
cc9fc49c90 Formatting...
Applying some fixes from Tom.
2000-06-30 06:21:26 +00:00
David Turner
5ae831c101 changes used to implement the auto-hinting support 2000-06-30 01:31:22 +00:00
David Turner
32b85e67cb various bug fixes in the postscript font drivers (mainly they
added one un-necessary point to each contour..)
2000-06-29 21:48:58 +00:00
David Turner
60402683ba small fix in the definition of the convenience functions 2000-06-29 06:19:07 +00:00
Werner Lemberg
deb4e98396 Formatting...
Preprocessor lines now always start the line.

Improved error handling in `base' module.

Fixed a out-of-bounds error in ttgload.
2000-06-29 03:14:25 +00:00
David Turner
98258619df debugged the CFF driver. The "advance width" problem
was strictly unrelated to our previous worries, it was a
really simple bug in t2gload.c !!
2000-06-28 20:43:07 +00:00
David Turner
075cdf1288 fixed a _nasty_ bug in the CFF driver. Note that there are still escapement problems though.. 2000-06-28 05:35:58 +00:00
David Turner
98c2fde0b3 removed obsolete files... :-( 2000-06-28 04:31:24 +00:00
David Turner
81bb4ad937 latest clean-ups..
The code compiles with NO WARNINGS with GCC and
Visual C++ (also with LCC minus debugging options)
2000-06-28 04:19:49 +00:00
David Turner
9d636b6d14 various cleanups to reduce compiler warnings
+ support for CID-keyed fonts in the CFF driver
(still some unexpected bugs though..)
2000-06-27 23:32:27 +00:00
David Turner
74abee8e2e various cleanups to reduce compiler warnings 2000-06-27 23:31:53 +00:00
David Turner
7ed5a057cf small bugfix 2000-06-27 23:23:22 +00:00
David Turner
385bedb832 formatting 2000-06-27 23:22:49 +00:00
David Turner
728da1c863 changed file names and some functions names to avoid
conflicts with the "type1" driver.
2000-06-27 23:21:51 +00:00
David Turner
a1be2dcee3 cleaned up source code to avoid function name
conflicts with Type 1 driver(s)
2000-06-27 23:20:35 +00:00
David Turner
5ae1bad3f6 added new renderer module 2000-06-27 23:18:39 +00:00
Werner Lemberg
d7a046838f More formatting.
About previous commitment: Added latest versions of (still unused)
config.guess and config.sub files.
2000-06-25 23:02:11 +00:00
Werner Lemberg
dcd2e14c58 forgotten fixes. 2000-06-25 07:43:15 +00:00
Werner Lemberg
a929ba9b20 applying formatting again 2000-06-25 06:47:11 +00:00
David Turner
994d7747fb various hacks to the TrueType driver that I cannot
explain now, but they'll be very useful in the near future :-)
2000-06-25 04:49:19 +00:00
David Turner
2a98b3c431 reduced some nasty memory leaks 2000-06-23 13:47:55 +00:00
David Turner
90f68b7272 still more updates to the TrueType driver to make it more
"extensible"..
2000-06-23 12:26:14 +00:00
David Turner
c31286153a bugfixes in the Type1 drivers 2000-06-23 05:02:13 +00:00
Pavel Kaňkovský
5b58f5e374 fixed *top++ bug present in type1/t1gload.c as well 2000-06-23 04:19:36 +00:00
Pavel Kaňkovský
7802d4664d *top++-bug was not a compiler bug, therefore the comment about the
affected compiler was misleading and has been removed
2000-06-23 04:18:55 +00:00
David Turner
d0079e669e improved the Type1 drivers to deal with the case where
the lenIV field is set to -1 to indicate unencoded charstrings

fixed some source code to prevent a compiler bug on IRIX

fixed the module version's in the "type1z" driver
2000-06-23 00:07:06 +00:00
David Turner
910c597d1a updated for new design 2000-06-22 00:31:01 +00:00
David Turner
aa4c28f9fe added new files 2000-06-22 00:27:15 +00:00
David Turner
206297435e small bugfix 2000-06-22 00:26:21 +00:00
David Turner
e82a82af6d small bugfix in the "seac" code 2000-06-22 00:26:11 +00:00
David Turner
f0df85ba2a - MAJOR INTERNAL REDESIGN:
A lot of internal modifications have been performed lately on the
    source in order to provide the following enhancements:

      - more generic module support:

        The FT_Module type is now defined to represent a handle to a given
        module. The file <freetype/ftmodule.h> contains the FT_Module_Class
        definition, as well as the module-loading public API

        The FT_Driver type is still defined, and still represents a pointer
        to a font driver. Note that FT_Add_Driver is replaced by FT_Add_Module,
        FT_Get_Driver by FT_Get_Module, etc..


      - support for generic glyph image types:

        The FT_Renderer type is a pointer to a module used to perform various
        operations on glyph image.

        Each renderer is capable of handling images in a single format
        (e.g. ft_glyph_format_outline). Its functions are used to:

           - transform an glyph image
           - render a glyph image into a bitmap
           - return the control box (dimensions) of a given glyph image


        The scan converters "ftraster.c" and "ftgrays.c" have been moved
        to the new directory "src/renderer", and are used to provide two
        default renderer modules.

        One corresponds to the "standard" scan-converter, the other to the
        "smooth" one.

        The current renderer can be set through the new function
        FT_Set_Renderer.

        The old raster-related function FT_Set_Raster, FT_Get_Raster and
        FT_Set_Raster_Mode have now disappeared, in favor of the new:

           FT_Get_Renderer
           FT_Set_Renderer

        see the file <freetype/ftrender.h> for more details..

        These changes were necessary to properly support different scalable
        formats in the future, like bi-color glyphs, etc..


      - glyph loader object:

        A new internal object, called a 'glyph loader' has been introduced
        in the base layer. It is used by all scalable format font drivers
        to load glyphs and composites.

        This object has been created to reduce the code size of each driver,
        as each one of them basically re-implemented its functionality.

        See <freetype/internal/ftobjs.h> and the FT_GlyphLoader type for
        more information..



      - FT_GlyphSlot had new fields:

        In order to support extended features (see below), the FT_GlyphSlot
        structure has a few new fields:

           linearHoriAdvance:  this field gives the linearly scaled (i.e.
                               scaled but unhinted) advance width for the glyph,
                               expressed as a 16.16 fixed pixel value. This
                               is useful to perform WYSIWYG text.

           linearVertAdvance:  this field gives the linearly scaled advance
                               height for the glyph (relevant in vertical glyph
                               layouts only). This is useful to perform
                               WYSIWYG text.

        Note that the two above field replace the removed "metrics2" field
        in the glyph slot.

           advance:   this field is a vector that gives the transformed
                      advance for the glyph. By default, it corresponds
                      to the advance width, unless FT_LOAD_VERTICAL_LAYOUT
                      was specified when calling FT_Load_Glyph or FT_Load_Char

           bitmap_left: this field gives the distance in integer pixels from
                        the current pen position to the left-most pixel of
                        a glyph image WHEN IT IS A BITMAP. It is only valid
                        when the "format" field is set to
                        "ft_glyph_format_bitmap", for example, after calling
                        the new function FT_Render_Glyph.

           bitmap_top:  this field gives the distance in integer pixels from
                        the current pen position (located on the baseline) to
                        the top-most pixel of the glyph image WHEN IT IS A
                        BITMAP. Positive values correspond to upwards Y.

           loader:  this is a new private field for the glyph slot. Client
                    applications should not touch it..


      - support for transforms and direct rendering in FT_Load_Glyph:

        Most of the functionality found in <freetype/ftglyph.h> has been
        moved to the core library. Hence, the following:

          - a transform can be specified for a face through FT_Set_Transform.
            this transform is applied by FT_Load_Glyph to scalable glyph images
            (i.e. NOT TO BITMAPS) before the function returns, unless the
            bit flag FT_LOAD_IGNORE_TRANSFORM was set in the load flags..


          - once a glyph image has been loaded, it can be directly converted to
            a bitmap by using the new FT_Render_Glyph function. Note that this
            function takes the glyph image from the glyph slot, and converts
            it to a bitmap whose properties are returned in "face.glyph.bitmap",
            "face.glyph.bitmap_left" and "face.glyph.bitmap_top". The original
            native image might be lost after the conversion.


          - when using the new bit flag FT_LOAD_RENDER, the FT_Load_Glyph
            and FT_Load_Char functions will call FT_Render_Glyph automatically
            when needed.
2000-06-22 00:17:42 +00:00
Werner Lemberg
9ca2af3838 A new formatting orgy.
Added some `#if 0' to completely disable the CID AFM stuff.  In case this is
not correct please fix.
2000-06-21 03:03:28 +00:00
Werner Lemberg
9c05268eae Newly generated. 2000-06-17 20:15:53 +00:00
Werner Lemberg
100d6d47d8 Fixing glyph name typos in glnames.py; more formatting. 2000-06-17 20:15:06 +00:00
David Turner
f9b8dec437 major reformatting of the modules source code in order to get
rid of most of the basic types redefinitions (i.e. FT_Int instead
of "FT_Int", etc..)

The format-specific prefixs like "TT_", "T1_", "T2_" & 'CID_"
are now only used in relevant structures..

fixed Werner's fix to t2gload.c :-)
other small bug fixes
2000-06-16 19:34:52 +00:00
Werner Lemberg
e3c11d7f00 A new round of formatting, adding/fixing documentation etc. 2000-06-16 06:49:56 +00:00
Werner Lemberg
67d301f305 Fixed the PACK() macro. 2000-06-14 04:13:59 +00:00
Werner Lemberg
7a4fda8821 The next round of formatting, checking documentation, etc. 2000-06-13 23:21:00 +00:00
Werner Lemberg
78575dc0d1 A lot of formatting.
Added more tracing levels.

More Makefile fixes.

Minor other changes.
2000-06-12 19:36:41 +00:00
Werner Lemberg
e35cac66c6 A complete revision of FreeType 2's GNU makefiles (of the library):
Tons of unnecessary stuff have been removed; only the essential rules
  have been retained.

  The source files now depend on all header files in include/freetype,
  include/freetype/config, and include/freetype/internal.  This is not
  optimal, I know, and I'll try to improve this, but it is better than
  before (namely no dependencies on `internal').

  FTDEBUG_SRC has been added (similar to FTSYS_SRC) -- I don't know
  exactly whether this is really useful, but it doesn't harm.

  There is now more documentation in the makefiles itself.

io-frames.html: Use of <th>, <code>, and <var> for better tagging.

Reactivating of FT_DEBUG_LEVEL_xxx macros.

Added a lot of #include directives to make `multi' builds possible -- note
that currently the modules cid, t1, and t1z have clashing structures and
functions which means that you can only use one of these three modules for a
multi build.

Added some missing function declarations to (local) header files.

Renamed some T1_Open_Face() to CID_Open_Face() in the cid module -- a lot
of other functions should be renamed also...

Replaced many FT_xxx stuff with T1_xxx in t1z driver -- this isn't finished
yet...

Fixed FT_Free() to allow a NULL pointer without an assertion (this has
always been a valid assumption in FreeType, at least in FT 1.x).

A lot of other, minor fixes (mostly documentation).
2000-06-11 03:46:57 +00:00
Werner Lemberg
cb9109fc40 Applied Tom's patches to improve CFF handling. 2000-06-09 05:25:19 +00:00
David Turner
3d99f79669 finally fixed that crazy Type 1 hinter..
it still sucks though .. ;-)
2000-06-07 23:06:10 +00:00
David Turner
24aaddaeed removed invalid #include 2000-06-07 20:19:21 +00:00
David Turner
6cef627d17 added code to correctly scale global metrics 2000-06-07 20:06:54 +00:00
David Turner
b770a4ab6d bug fix, suggested by Tor Lillqvist 2000-06-07 20:06:18 +00:00
David Turner
de6523ee05 Added code to correctly scale global metrics 2000-06-07 20:05:50 +00:00
David Turner
0f991b4312 new version of the CFF driver, this one works :-) 2000-06-07 20:04:34 +00:00
Werner Lemberg
e1d5dd78f4 Moved all *errors.h header files to include/freetype/internal for
consistency.

Removed unused error message.
2000-06-07 04:48:12 +00:00
Werner Lemberg
61bd4b9dd1 Added FT_FRAME_SKIP_xxx to skip fields.
More use of READ_Fields() in ttsbit.c

Other minor fixes.
2000-06-07 00:00:08 +00:00
Werner Lemberg
1c0d4acb25 Fine-tuned a lot of tracing levels to make them more functional with ftview.
Added a lot of \n to tracing messages.

Fixed a serious bug in loading SBit offsets (missing parentheses around a
xxx ? yyy : zzz construct).

Replaced most GET_xxx() functions with calls to READ_Frame() in ttsbit.c
2000-06-06 20:41:48 +00:00
Werner Lemberg
920d41e038 Removing trailing whitespace. 2000-06-05 14:32:32 +00:00
Werner Lemberg
4e6dd8587e freetype.h: Adding ft_encoding_xxx values for some CJK encodings.
Fixing copyright notice on many files.

Changed some tracing levels.

A lot of formatting, fixing documentation etc. as usual.
2000-06-05 05:26:15 +00:00
Werner Lemberg
5617726108 ftview now has two new options: -d activates debugging, and -l sets the
trace level.

Since FT2 is still beta, I've activated the FT_DEBUG_xxx macros by default.

To make reasonable output, I've changed some TRACEx macros to other levels.
2000-06-03 21:59:44 +00:00
Werner Lemberg
eb81e37825 More preparation for tracing. Formatting. 2000-06-03 06:03:11 +00:00
Werner Lemberg
9a754ce32b Formatting; adding some tracing code. 2000-06-02 21:31:32 +00:00
Werner Lemberg
91e52d416a Finishing first formatting/documenting etc. of the `base' dir. Some modules
are still badly documented, though...
2000-06-02 14:30:38 +00:00
Werner Lemberg
08edde5805 Correct wrong fix. 2000-06-02 00:11:57 +00:00
Werner Lemberg
2fbf7e439f Added a lot of error checking code to the exported functions in the `base'
subdir (not complete yet).
2000-06-02 00:01:14 +00:00
Werner Lemberg
d66ea312f6 FT_Outline_Decompose() now returns FT_Error.
Minor bug fixes.

More formatting, adding/fixing documentation.
2000-06-01 15:49:28 +00:00
David Turner
6b0bf34665 slight change to the smooth renderer to make it compile
stand alone with the _STANDALONE_ macro defined..
See comments inside it "src/base/ftgrays.c"
2000-06-01 05:01:01 +00:00
David Turner
b3936a1600 small bug fix from Robert :-) 2000-06-01 04:44:36 +00:00
David Turner
04aa800ce9 added a CID-keyed font driver in "src/cid"
fixed two bugs in the smooth renderer
2000-06-01 03:27:48 +00:00
David Turner
3581d06464 changed the SFNT format check to make it less strict.
A certain number of TrueType fonts have invalid values
in the SFNT header..
2000-06-01 03:26:58 +00:00
Werner Lemberg
a3b6c6c290 Formatting, fixing and adding documentation. 2000-05-31 06:55:12 +00:00
Werner Lemberg
0c8cde2e05 ftgrays.c: Formatting. It seems to me that _STANDALONE_ doesn't work yet...
Will it ever work?  If not, the unused code should be removed.

ftconfig.h, ftobjs.h: Fix my last fix of the UNUSED() macro.
2000-05-30 20:10:06 +00:00
Werner Lemberg
f13e6333f9 Formatting; minor improvements. 2000-05-30 16:49:14 +00:00
Werner Lemberg
026bd17b41 ftmulti.c: Will now accept any filename. It will no longer append `.ttf'
or `.ttc'.  Reformatted.

ftcalc.c, ftdebug.c: Minor formatting stuff.
2000-05-30 05:13:30 +00:00
David Turner
5b401bb918 additional changes to the CFF/Type2 driver 2000-05-29 23:03:15 +00:00
Werner Lemberg
c3c344c76e Fixing the fixes :-) More formatting. 2000-05-29 22:40:57 +00:00
David Turner
4f99c3c423 fixed divide by zero bug
added CFF/OpenType driver source (not working for now)
2000-05-29 20:55:13 +00:00
Werner Lemberg
a519b3b7a3 Formatting, fixing descriptions. 2000-05-29 20:46:12 +00:00
David Turner
b1677a87ca changed the SFNT driver slightly to add more robust
checking based on the "search_rang", etc.., fields of
the sfnt header..

This avoids problems (like certain Type 1 multiple masters
incorrectly recognized as trueType files)..
2000-05-29 20:37:41 +00:00
David Turner
241e151eb2 oops, forgot to commit these files 2000-05-28 17:15:37 +00:00
David Turner
2e421319fc moved a lot of things from the TrueType driver to the SFNT
module (whose interface has changed, by the way)

This allows even more code re-use between TrueType and
OpenType formats..
2000-05-26 22:13:17 +00:00
David Turner
2c5f482b48 removed obsolete files 2000-05-26 22:10:08 +00:00
David Turner
5413644b5e added a new demonstration program called "ftmulti" to
demonstrate the multiple masters support

fixed a few bugs
2000-05-26 17:52:06 +00:00
David Turner
1118720679 finalised the multiple masters support
fixed some nasty little bugs too
2000-05-26 17:13:23 +00:00
David Turner
fea68c6800 fixed two minor bugs:
- the glyph index was not checked in FT_Load_Glyph
  - the "type1" driver didn't read the FontBBox and FontMatrix
    correctly..
2000-05-26 06:40:49 +00:00
David Turner
936d2e072b a small change to allow the "type1" driver to detect
multiple master fonts and return an error code that allows
the "type1z" driver to load them after..
2000-05-26 02:16:06 +00:00
David Turner
7c388ba491 added support for multiple master fonts in "type1z". It is
now working, but there is no way currently to change the default
weight vector (tested with custom vectors though).

Note that you should remove the "type1" driver from the
module list to be able to test it..
2000-05-26 02:07:40 +00:00
David Turner
1c9a1cab3f important modifications to the Type1z driver
these are used to prepare for multiple master fonts
2000-05-24 21:12:02 +00:00
David Turner
1fb6eea7d1 EXPORT_DEF renamed to FT_EXPORT_DEF +
reformating/spacing
2000-05-24 00:31:14 +00:00
David Turner
f5dcdd5cfb minor fix to the Type1 driver(s) to apply the font matrix when
necessary..
2000-05-23 22:16:27 +00:00
David Turner
5e4c2cb3bf fixed some header files inclusions
added C++ stubs to public header files
2000-05-22 16:25:14 +00:00
David Turner
51179f0ae3 some fixes for 64-bit systems. Mainly changed some
FT_TRACE calls to use %p instead of %lx when dumping
a pointer address
2000-05-18 16:18:05 +00:00
David Turner
109fcf6086 fixed the sbit loader (src/base/sfnt/ttsbit.c)
introduced a new load flag (FT_LOAD_CROP_BITMAP) used
to indicate that we want embedded bitmaps to be cropped..

Thanks a lot to Yamano-uchi, Hidetoshi
2000-05-17 23:35:37 +00:00