--- a/headers/cuneiform.h +++ b/headers/cuneiform.h @@ -170,7 +170,7 @@ Bool PUMA_GetExportData(uint32_t dwType, void * pData); Bool PUMA_SetImportData(uint32_t dwType, void * pData); -Bool PUMA_XOpen(void * DIB_image, const char *identifier); +Bool PUMA_XOpen(const void * DIB_image, const char *identifier); Bool PUMA_XClose(void); Bool PUMA_XFinalRecognition(void); Bool PUMA_XSave(const char * lpOutFileName, int32_t lnFormat, int32_t lnCode ); --- a/cuneiform_src/Kern/hhh/__puma.c +++ b/cuneiform_src/Kern/hhh/__puma.c @@ -234,7 +234,7 @@ return rc; } ////////////////////////////////////////////////////////////////// -Bool32 LPUMA_XOpen(void * pDIB,const char * lpFileName) +Bool32 LPUMA_XOpen(const void * pDIB,const char * lpFileName) { Bool32 rc = FALSE; if(s_hLib && XOpen) --- a/cuneiform_src/Kern/puma/main/puma.cpp +++ b/cuneiform_src/Kern/puma/main/puma.cpp @@ -399,7 +399,7 @@ return rc; } ///////////////////////////////////////////////// -PUMA_FUNC(Bool) PUMA_XOpen(void * pDIB, const char *filename) +PUMA_FUNC(Bool) PUMA_XOpen(const void * pDIB, const char *filename) { Bool rc = TRUE; PreOpenInitialize(filename); @@ -414,7 +414,7 @@ // Запишем изображение // if(rc) { - if(!CIMAGE_WriteDIB((puchar)PUMA_IMAGE_USER,pDIB,1)) + if(!CIMAGE_WriteDIB((puchar)PUMA_IMAGE_USER,(Handle)pDIB,1)) { SetReturnCode_puma(CIMAGE_GetReturnCode()); rc = FALSE; --- a/cuneiform_src/cli/cuneiform-cli.cpp +++ b/cuneiform_src/cli/cuneiform-cli.cpp @@ -150,7 +150,7 @@ * Read file and return it as a BMP DIB entity. On failure write an error * and return NULL. Caller delete[]'s the returned result. */ -static char* read_file(const char *fname); +static const char* read_file(const char *fname); #ifdef USE_MAGICK #include @@ -165,7 +165,7 @@ } } -static char* read_file(const char *fname) { +static const char* read_file(const char *fname) { Blob blob; size_t data_size; char *dib; @@ -187,7 +187,7 @@ #else // No ImageMagick++ -static char* read_file(const char *fname) { +static const char* read_file(const char *fname) { char bmpheader[2]; char *dib; FILE *f; @@ -232,7 +232,7 @@ #endif // USE_MAGICK int main(int argc, char **argv) { - char *dib; + const char *dib; const char *infilename = NULL; int langcode = LANG_ENGLISH; // By default recognize plain english text --- a/cuneiform_src/Kern/hhh/puma.h +++ b/cuneiform_src/Kern/hhh/puma.h @@ -246,7 +246,7 @@ DEC_FUN(Bool, PUMA_SetImportData,(uint32_t dwType, void * pData)) ; -DEC_FUN(Bool, PUMA_XOpen, (void * pDIB, const char* filename)) +DEC_FUN(Bool, PUMA_XOpen, (const void * pDIB, const char* filename)) ; DEC_FUN(Bool, PUMA_XClose, (void)) ;