| ming.h | ming.h | |||
|---|---|---|---|---|
| skipping to change at line 22 | skipping to change at line 22 | |||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |||
| Lesser General Public License for more details. | Lesser General Public License for more details. | |||
| You should have received a copy of the GNU Lesser General Public | You should have received a copy of the GNU Lesser General Public | |||
| License along with this library; if not, write to the Free Software | License along with this library; if not, write to the Free Software | |||
| Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 U SA | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 U SA | |||
| */ | */ | |||
| /* ming.h | /* ming.h | |||
| * | * | |||
| * $Id: ming.h.in,v 1.107 2009/06/08 08:49:00 strk Exp $ | * $Id$ | |||
| * | * | |||
| * This header file contains all declarations of functions and types that | * This header file contains all declarations of functions and types that | |||
| * are supposed to be publicly accessable. | * are supposed to be publicly accessable. | |||
| */ | */ | |||
| #ifndef SWF_MING_H_INCLUDED | #ifndef SWF_MING_H_INCLUDED | |||
| #define SWF_MING_H_INCLUDED | #define SWF_MING_H_INCLUDED | |||
| #ifdef __GNUC__ | #ifdef __GNUC__ | |||
| #define __deprecated __attribute__((deprecated)) | #define __deprecated __attribute__((deprecated)) | |||
| skipping to change at line 47 | skipping to change at line 47 | |||
| #ifdef __cplusplus | #ifdef __cplusplus | |||
| extern "C" { | extern "C" { | |||
| #endif | #endif | |||
| #ifdef _MSC_VER | #ifdef _MSC_VER | |||
| #define inline __inline | #define inline __inline | |||
| #endif | #endif | |||
| #include <stdio.h> | #include <stdio.h> | |||
| #define MING_VERSION 0.4.3 | #define MING_VERSION 0.4.4 | |||
| #define MING_VERSION_TEXT "0.4.3" | #define MING_VERSION_TEXT "0.4.4" | |||
| /***** Type definitions - avoid cyclic dependencies ****/ | /***** Type definitions - avoid cyclic dependencies ****/ | |||
| typedef unsigned char byte; | typedef unsigned char byte; | |||
| typedef struct SWFBlock_s *SWFBlock; | typedef struct SWFBlock_s *SWFBlock; | |||
| typedef struct SWFMatrix_s *SWFMatrix; | typedef struct SWFMatrix_s *SWFMatrix; | |||
| typedef struct SWFInput_s *SWFInput; | typedef struct SWFInput_s *SWFInput; | |||
| typedef struct SWFCharacter_s *SWFCharacter; | typedef struct SWFCharacter_s *SWFCharacter; | |||
| typedef struct SWFDBLBitmap_s *SWFDBLBitmap; | typedef struct SWFDBLBitmap_s *SWFDBLBitmap; | |||
| End of changes. 2 change blocks. | ||||
| 3 lines changed or deleted | 3 lines changed or added | |||
| mingpp.h | mingpp.h | |||
|---|---|---|---|---|
| skipping to change at line 803 | skipping to change at line 803 | |||
| c_SWFFont font; | c_SWFFont font; | |||
| SWFFont(FILE *file) // deprecated | SWFFont(FILE *file) // deprecated | |||
| { | { | |||
| std::cerr << "SWFFont(FILE *file) is deprecated and will be removed in future releases." << std::endl; | std::cerr << "SWFFont(FILE *file) is deprecated and will be removed in future releases." << std::endl; | |||
| this->font = loadSWFFont_fromFdbFile(file); | this->font = loadSWFFont_fromFdbFile(file); | |||
| if(this->font == NULL) | if(this->font == NULL) | |||
| throw SWFException("SWFFont(FILE *file)"); | throw SWFException("SWFFont(FILE *file)"); | |||
| } | } | |||
| SWFFont(char *path) | SWFFont(const char *path) | |||
| { | { | |||
| this->font = newSWFFont_fromFile(path); | this->font = newSWFFont_fromFile(path); | |||
| if(this->font == NULL) | if(this->font == NULL) | |||
| throw SWFException("SWFFont(char *path)"); | throw SWFException("SWFFont(char *path)"); | |||
| } | } | |||
| virtual ~SWFFont() | virtual ~SWFFont() | |||
| { destroySWFFont(/*(c_SWFBlock)*/this->font); } | { destroySWFFont(/*(c_SWFBlock)*/this->font); } | |||
| c_SWFBlock getBlock() | c_SWFBlock getBlock() | |||
| skipping to change at line 840 | skipping to change at line 840 | |||
| float getLeading() | float getLeading() | |||
| { return SWFFont_getLeading(this->font); } | { return SWFFont_getLeading(this->font); } | |||
| const char *getName() | const char *getName() | |||
| { return SWFFont_getName(this->font); } | { return SWFFont_getName(this->font); } | |||
| int getGlyphCount() | int getGlyphCount() | |||
| { return SWFFont_getGlyphCount(this->font); } | { return SWFFont_getGlyphCount(this->font); } | |||
| char *getShape(unsigned short c) | char *getShape(unsigned short c) __deprecated | |||
| { return SWFFont_getShape(this->font, c); } | { return SWFFont_getShape(this->font, c); } | |||
| SWF_DECLAREONLY(SWFFont); | SWF_DECLAREONLY(SWFFont); | |||
| private: | private: | |||
| SWFFont(c_SWFFont font) | SWFFont(c_SWFFont font) | |||
| { | { | |||
| this->font = font; | this->font = font; | |||
| if(this->font == NULL) | if(this->font == NULL) | |||
| throw SWFException("SWFFont(c_SWFFont)"); | throw SWFException("SWFFont(c_SWFFont)"); | |||
| End of changes. 2 change blocks. | ||||
| 2 lines changed or deleted | 2 lines changed or added | |||