--- cuneiform-git-47e5fd27f.old/cuneiform/cuneiform_src/Kern/ced/sources/main/ced_func_rtf.cpp +++ cuneiform-git-47e5fd27f/cuneiform/cuneiform_src/Kern/ced/sources/main/ced_func_rtf.cpp @@ -212,7 +212,7 @@ } */ // write the text lines - for (;sect>0;sect=sect->next) + for (;sect;sect=sect->next) { if (!WriteRtfSection(rtf,sect)) goto WRITE_END; //write section properties // int sectNum=0; @@ -897,7 +897,7 @@ // if (curChar->fontNum>=rtf->page->fontsUsed || (prevChar&&prevChar->fontNum>=rtf->page->fontsUsed)) return TRUE; // extract value for comparison - if (prevChar>0) { + if (prevChar) { // lstrcpy(PrevTypeFace,TerFont[PrevFont].TypeFace); PrevFamily=rtf->table[rtf->page->GetFontByNum(prevChar->fontNum)]; PrevStyle=prevChar->fontAttribs; --- cuneiform-git-47e5fd27f.old/cuneiform/cuneiform_src/Kern/hh/internal.h +++ cuneiform-git-47e5fd27f/cuneiform/cuneiform_src/Kern/hh/internal.h @@ -84,6 +84,7 @@ #endif #if !defined(__MATH_H) && !defined(_INC_MATH) + #undef _GLIBCXX_USE_STD_SPEC_FUNCS #include #endif --- cuneiform-git-47e5fd27f.old/cuneiform/cuneiform_src/Kern/hhh/tigerh/h/strings.h +++ cuneiform-git-47e5fd27f/cuneiform/cuneiform_src/Kern/hhh/tigerh/h/strings.h @@ -75,11 +75,14 @@ * * ***************************************************************************/ +#include_next +#if 0 # ifndef __STRINGS_H_INCLUDE # define __STRINGS_H_INCLUDE # include "ltconfig.h" # include "c_types.h" +# include "cttypes.h" struct _String; typedef struct _String STRING; @@ -154,3 +157,4 @@ extern STRING *pStringsUpList; extern STRING *pStringsDownList; # endif +#endif --- cuneiform-git-47e5fd27f.old/cuneiform/cuneiform_src/Kern/include/utf8-tables.h +++ cuneiform-git-47e5fd27f/cuneiform/cuneiform_src/Kern/include/utf8-tables.h @@ -68,7 +68,7 @@ #endif -const char win1250_to_utf8[][4] = { +const unsigned char win1250_to_utf8[][4] = { {0, 0, 0, 0}, {1, 0, 0, 0}, {2, 0, 0, 0}, @@ -328,7 +328,7 @@ }; -const char win1251_to_utf8[][4] = { +const unsigned char win1251_to_utf8[][4] = { {0, 0, 0, 0}, {1, 0, 0, 0}, {2, 0, 0, 0}, @@ -587,7 +587,7 @@ {209, 143, 0, 0}, }; -const char win1252_to_utf8[][4] = { +const unsigned char win1252_to_utf8[][4] = { {0, 0, 0, 0}, {1, 0, 0, 0}, {2, 0, 0, 0}, @@ -847,7 +847,7 @@ }; -const char win1254_to_utf8[][4] = { +const unsigned char win1254_to_utf8[][4] = { {0, 0, 0, 0}, {1, 0, 0, 0}, {2, 0, 0, 0}, @@ -1107,7 +1107,7 @@ }; -const char win1257_to_utf8[][4] = { +const unsigned char win1257_to_utf8[][4] = { {0, 0, 0, 0}, {1, 0, 0, 0}, {2, 0, 0, 0}, --- cuneiform-git-47e5fd27f.old/cuneiform/cuneiform_src/Kern/rblock/sources/c/ltmain.c +++ cuneiform-git-47e5fd27f/cuneiform/cuneiform_src/Kern/rblock/sources/c/ltmain.c @@ -344,7 +344,7 @@ # ifdef LT_DEBUG //if (LT_DebugGraphicsLevel >= 2) if(!LDPUMA_Skip(hFirstDustAbsorbtion)) - LT_GraphicsBlocksOutput ("After first dust absorbtion"); + LT_GraphicsBlocksOutput ("After first dust absorption"); # endif PageMatrixExcludeSeparators (TRUE); @@ -368,7 +368,7 @@ # ifdef LT_DEBUG //if (LT_DebugGraphicsLevel >= 2) if(!LDPUMA_Skip(hSecondDustAbsorbtion)) - LT_GraphicsBlocksOutput ("After second dust absorbtion"); + LT_GraphicsBlocksOutput ("After second dust absorption"); # endif if (cut_page_left || cut_page_right) --- cuneiform-git-47e5fd27f.old/cuneiform/cuneiform_src/Kern/rout/src/codetables.cpp +++ cuneiform-git-47e5fd27f/cuneiform/cuneiform_src/Kern/rout/src/codetables.cpp @@ -937,13 +937,13 @@ * codepage. */ -const char * getUTF8Str(const unsigned char in, const int codepage) { +const unsigned char * getUTF8Str(const unsigned char in, const int codepage) { switch(codepage) { case 1250 : return win1250_to_utf8[in]; case 1251 : return win1251_to_utf8[in]; case 1252 : return win1252_to_utf8[in]; case 1254 : return win1254_to_utf8[in]; case 1257 : return win1257_to_utf8[in]; - default : return "?"; + default : return (const unsigned char *) "?"; } } --- cuneiform-git-47e5fd27f.old/cuneiform/cuneiform_src/Kern/rout/src/rout_own.h +++ cuneiform-git-47e5fd27f/cuneiform/cuneiform_src/Kern/rout/src/rout_own.h @@ -458,7 +458,7 @@ void ResetCodeTables(); Bool UpdateActiveCodeTable(); long GetCodePage(); -const char * getUTF8Str(const unsigned char in, const int codepage); +const unsigned char * getUTF8Str(const unsigned char in, const int codepage); //***************************************************************** // Rout.cpp --- cuneiform-git-47e5fd27f.old/cuneiform/cuneiform_src/Kern/rout/src/text.cpp +++ cuneiform-git-47e5fd27f/cuneiform/cuneiform_src/Kern/rout/src/text.cpp @@ -310,7 +310,7 @@ *gMemCur++ = c2; } else { - const char *utfchar; + const unsigned char *utfchar; utfchar = getUTF8Str((char )c2, GetCodePage()); int i; for(i=0; utfchar[i] != '\0' ;i++){ --- cuneiform-git-47e5fd27f.old/cuneiform/cuneiform_src/Kern/rstr/src/acc_tabs.c +++ cuneiform-git-47e5fd27f/cuneiform/cuneiform_src/Kern/rstr/src/acc_tabs.c @@ -1233,7 +1233,7 @@ strcpy(decode_ASCII_to_[(uchar)liga_i ], "_i_"); strcpy(decode_ASCII_to_[(uchar)liga_exm ], "_!_"); - strcpy(decode_ASCII_to_[(uchar)liga_inv_exm], "_!!_"); + strcpy(decode_ASCII_to_[(uchar)liga_inv_exm], "_!_"); strcpy(decode_ASCII_to_[(uchar)right_quocket], "\xbb"); strcpy(decode_ASCII_to_[(uchar)liga_CC ], "\xa9"); strcpy(decode_ASCII_to_[(uchar)liga_CR ], "\xae"); @@ -2821,8 +2821,8 @@ strcpy(decode_ASCII_to_[(uchar)liga_j ], "_j_"); strcpy(decode_ASCII_to_[(uchar)liga_exm ], "_!_"); strcpy(decode_ASCII_to_[(uchar)liga_qm ], "_?_"); - strcpy(decode_ASCII_to_[(uchar)liga_inv_exm], "_!!_"); - strcpy(decode_ASCII_to_[(uchar)liga_inv_qm ], "_??_"); + strcpy(decode_ASCII_to_[(uchar)liga_inv_exm], "_!_"); + strcpy(decode_ASCII_to_[(uchar)liga_inv_qm ], "_?_"); strcpy(decode_ASCII_to_[(uchar)liga_bull ], "\xB0"); strcpy(decode_ASCII_to_[(uchar)left_quocket], "«"); strcpy(decode_ASCII_to_[(uchar)right_quocket], "»"); --- cuneiform-git-47e5fd27f.old/cuneiform/cuneiform_src/Kern/rstr/src/match_wd.c +++ cuneiform-git-47e5fd27f/cuneiform/cuneiform_src/Kern/rstr/src/match_wd.c @@ -484,7 +484,7 @@ str_raster->w=(int32_t)(right-left); str_raster->h=(int32_t)(bottom-top); - if (str_raster->w > LINE_WIDTH || str_raster->h > LINE_HEIGHT) + if ((str_raster->w+7) > LINE_WIDTH || str_raster->h > LINE_HEIGHT) return FALSE; memset(&str_raster->pict,0,(str_raster->w+7)/8*str_raster->h); --- cuneiform-git-47e5fd27f.old/cuneiform/cuneiform_src/Kern/rstr/src/pass3.c +++ cuneiform-git-47e5fd27f/cuneiform/cuneiform_src/Kern/rstr/src/pass3.c @@ -648,7 +648,7 @@ { if (snap_activity('d')) { - snap_show_text("Skiped as dust"); + snap_show_text("Skipped as dust"); snap_monitor(); } @@ -3135,7 +3135,7 @@ { if (snap_activity('n')) { - snap_show_text("Skiped as dust"); + snap_show_text("Skipped as dust"); snap_monitor(); } return FALSE; --- cuneiform-git-47e5fd27f.old/cuneiform/cuneiform_src/Kern/rstr/src/snap.c +++ cuneiform-git-47e5fd27f/cuneiform/cuneiform_src/Kern/rstr/src/snap.c @@ -542,7 +542,7 @@ else strcat(buf," n"); -strcat(buf," new agressive : "); +strcat(buf," new aggressive : "); if( _spell_agressive(wrd,lang) ) strcat(buf,"y "); else