comparison TOOLS/subfont-c/subfont.c @ 1677:1bf2c3dbc36e

Resolved endianess issues.

1676:1f3030b34f5c

#include <string.h>
#include <libgen.h>


#ifndef OLD_FREETYPE2

#include <ft2build.h>	
#include FT_FREETYPE_H
#include FT_GLYPH_H

#else			/* freetype 2.0.1 */

#include <freetype/freetype.h>
#include <freetype/ftglyph.h>

#endif

#ifndef DEBUG
#define DEBUG	0
#endif

    char *outbuf = (char*)&o;
    int inbytesleft = 1;
    int outbytesleft = sizeof(FT_ULong);

    size_t count = iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
//    if (count==-1) o = 0; // not OK, at least my iconv() returns E2BIG for all
    if (outbytesleft!=0) o = 0;

    /* convert unicode BE -> LE */
    o = ((o>>24)&0xff)
      | ((o>>8)&0xff00)
      | ((o&0xff00)<<8)
      | ((o&0xff)<<24);

    /* we don't want control characters */
    if (o>=0x7f && o<0xa0) o = 0;
    return o;
}

1677:1bf2c3dbc36e

#include <string.h>
#include <libgen.h>


#ifndef OLD_FREETYPE2
#include <ft2build.h>	
#include FT_FREETYPE_H
#include FT_GLYPH_H
#else			/* freetype 2.0.1 */
#include <freetype/freetype.h>
#include <freetype/ftglyph.h>
#endif


#include "../../bswap.h"


#ifndef DEBUG
#define DEBUG	0
#endif

    char *outbuf = (char*)&o;
    int inbytesleft = 1;
    int outbytesleft = sizeof(FT_ULong);

    size_t count = iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);

    /* convert unicode BigEndian -> MachineEndian */
    o = be2me_32(o);

    // if (count==-1) o = 0; // not OK, at least my iconv() returns E2BIG for all
    if (outbytesleft!=0) o = 0;

    /* we don't want control characters */
    if (o>=0x7f && o<0xa0) o = 0;
    return o;
}