Index: stsf/STClientLibrary/src/connection.h =================================================================== RCS file: /cvs/stsf/stsf/STClientLibrary/src/connection.h,v retrieving revision 1.2 diff -u -2 -0 -r1.2 connection.h --- stsf/STClientLibrary/src/connection.h 25 May 2004 02:47:24 -0000 1.2 +++ stsf/STClientLibrary/src/connection.h 20 Jun 2004 22:13:42 -0000 @@ -66,57 +66,57 @@ */ DataManager FSSessionGetGlyphManager(STServerSession); /** * Opens a connection with a server * returns an error code */ STStatus FSSessionOpen(STServerSession *); STStatus FSSessionClose(STServerSession); STStatus FSSessionGetFontsForPlatformName(STServerSession session, const byte *name, STCharCount namelen, uint16_t pID, uint16_t eID, uint16_t lID, uint16_t nID, STCount *fontcount, STFont **font); STStatus FSSessionCreateFontsFromURL(STServerSession session, STCount iURLCount, - char **iURL, + const char **iURL, STCount *oFontCount, STFont **oFont); STStatus FSSessionCreateFonts(STServerSession session, STCount iDataCount, byte **iData, size_t *iDataLength, STCount *oFontCount, STFont **oFont); STStatus FSSessionDestroyFonts(STServerSession session, STCount iFontCount, STFont *iFonts); -STStatus FSSessionGetFontsForURL(STServerSession session, char *url, STCount *fontcount, STFont **font); +STStatus FSSessionGetFontsForURL(STServerSession session, const char *url, STCount *fontcount, STFont **font); STStatus FSSessionCountObjects(STServerSession session, STTag objectType, STCount *objectCount, STObject **ids); /* returns: ST_OK, ST_SCALER_NOT_FOUND */ STStatus FSSessionFindObject(STServerSession session, STTag objectType, STTag objectTag, STObject *id); /* returns: ST_OK, ST_BADFONTID */ STStatus FSSessionVerifyFontID(STServerSession session, STFont font); /* * When STClientLibrary starts having a copy of fonts array it will handle most of * STFont methods without going to the server */ /* returns ST_OK, ST_BADFONTID */ STStatus FSSessionGetNameTags(STServerSession session, STFont font, STCount *count, STNameTagPtr *tags); /* return ST_OK, ST_BADFONTID */ STStatus FSSessionGetNameStr(STServerSession session, STFont font, STNameTagPtr tag, STCharCount *count, byte **str); @@ -185,83 +185,82 @@ uint32_t instanceID, STGlyph glyphID, double x, double y, ScaledGlyphData *metrics, size_t *buffersize, byte *buffer); /* */ STStatus FSSessionGetFontRenderingParams(STServerSession session, uint32_t instanceID, uint32_t *scalerID, FSRenderingMode *mode, int *bitsPerPixel, STLookupTable *clut); STStatus FSSessionGetGlobalFontMetrics(STServerSession session, uint32_t instanceID, ScaledFontMetrics *fontinfo); STStatus FSSessionGetFontExtInfo(STServerSession session, STFont font, - char **oFontName, - char **oPSName, + const char **oFontName, + const char **oPSName, STFontType *oType, STFontInfoFlags *oFlags, STCount *glyphcount, - int32_t *oSbitCount, - int32_t **oSbitArray, + int *oSbitCount, + const int **oSbitArray, STFontMetrics *oFontMetrics); STStatus FSSessionKernGlyphPair(STServerSession session, STBoolean isInstance, uint32_t id, STGlyph firstGlyph, STGlyph secondGlyph, STKernData *kern); STStatus FSSessionGetStyleDesignMetrics(STServerSession session, STStyle style, STLineMetrics *metrics); STStatus FSSessionGetScalerInfo(STServerSession session, STScaler scalerID, STTag *tag, uint32_t *version, - char **sname, - char **lname, - char **notice, + const char **sname, + const char **lname, + const char **notice, STScalerFlags *sflags, STFontMask *fflags); STStatus FSSessionGetLayoutEngineInfo(STServerSession session, STLayoutEngine leID, STTag *tag, uint32_t *version, - char **sname, - char **lname, - char **notice, + const char **sname, + const char **lname, + const char **notice, STLayoutEngineFlags *leflags); STStatus FSSessionSetScalerForInstanceByTag(STServerSession session, STTag scalerTag, uint32_t instanceID); STStatus FSSessionGetFontType(STServerSession session, STFont font, STFontType *oType); -STStatus FSSessionGetFontURL(STServerSession session, STFont iFont, char **oFontURL); - +STStatus FSSessionGetFontURL(STServerSession session, STFont iFont, const char **oFontURL); STStatus FSSessionGetFontSignature(STServerSession session, STFont iFont, byte **oSignature); -STStatus FSSessionGetFontForSignature(STServerSession session, byte *iSignature, STFont *oFont); +STStatus FSSessionGetFontForSignature(STServerSession session, const byte *iSignature, STFont *font); -STStatus FSSessionGetFontData(STServerSession session, STFont iFont, STTag iTable, STSize *oByteCount, byte **oRawData); +STStatus FSSessionGetFontData(STServerSession session, STFont iFont, STTag iTable, STSize *oByteCount, const byte **oRawData); STStatus FSSessionLayoutChars(STServerSession session, uint32_t fontInstanceID, STScaler scaler, STLayoutEngine le, STLocale locale, utf16 *chars, STPosition offset, STCount charCount, STCount charMax, STBoolean rightToLeft, double x, double y, STCount *glyphCount, STGlyph **glyphID, uint32_t **charIndex, double **glyphPos); STStatus FSSessionTerminateFontServer(STServerSession session); /* This function makes no roundtripts to the server */ STStatus FSSessionQueryGlyphs(STServerSession session, uint32_t gcount, STGlyphKey *gk, STScaledMaxBox *b, void **pptr, void **gptr, STCount *pcount); #endif /* __CONNECTION_H */ Index: stsf/stsflib/crc32.h =================================================================== RCS file: /cvs/stsf/stsf/stsflib/crc32.h,v retrieving revision 1.1.1.1 diff -u -2 -0 -r1.1.1.1 crc32.h --- stsf/stsflib/crc32.h 26 Mar 2004 19:19:53 -0000 1.1.1.1 +++ stsf/stsflib/crc32.h 20 Jun 2004 22:13:42 -0000 @@ -38,26 +38,26 @@ */ /* $Id: crc32.h,v 1.1.1.1 2004/03/26 19:19:53 adg Exp $ */ /** * * @file crc32.h * @brief CRC-32 calculation function * @author Alexander Gelfenbain * @version 0.8 * */ #include #ifdef __cplusplus extern "C"{ #endif #define crc32 stsf_crc32 -uint32_t stsf_crc32(const void *ptr, size_t len); +unsigned int stsf_crc32(const void *ptr, size_t len); #ifdef __cplusplus } #endif