Attachment #171156 for bug #201424





PORTNAME=	cuneiform
PORTVERSION=	1.1.0
PORTREVISION=	5
CATEGORIES=	graphics
MASTER_SITES=	http://launchpadlibrarian.net/69906918/
DISTNAME=	${PORTNAME}-linux-${PORTVERSION}


ONLY_FOR_ARCHS=	i386 amd64

USE_GCC=	4.9+
USES=		cmake:outsource tar:bzip2
USE_LDCONFIG=	yes


CPPFLAGS+=	-I${LOCALBASE}/include
CFLAGS+=	-I${LOCALBASE}/include

LIB_DEPENDS+=	libMagick++-6.so:graphics/ImageMagick

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MIMAGEMAGICK}
LIB_DEPENDS+=	libMagickWand-6.so:graphics/ImageMagick
.endif

post-patch:
	${MV} ${WRKSRC}/cuneiform_src/Kern/hhh/tigerh/h/strings.h \
		${WRKSRC}/cuneiform_src/Kern/hhh/tigerh/h/cf_strings.h




--- cuneiform_src/Kern/rdib/sources/cpp/CTDIB.cpp.orig	2016-06-07 14:16:39 UTC
+++ cuneiform_src/Kern/rdib/sources/cpp/CTDIB.cpp
@@ -538,7 +538,7 @@ Bool32 CTDIB::GetDIBHandle(Handle* phDIB
 }
 
 Bool32 CTDIB::GetDIBPtr(pvoid* ppDIB) {
-	CTDIB_IFNODIB(NULL);
+	CTDIB_IFNODIB(0);
 
 	*ppDIB = pDIB;
 	return TRUE;
@@ -547,7 +547,7 @@ Bool32 CTDIB::GetDIBPtr(pvoid* ppDIB) {
 Bool32 CTDIB::SetRGBQuad(uint32_t wQuad, CTDIBRGBQUAD Quad) {
 	PCTDIBRGBQUAD pCurrentQuad;
 
-	if (pRGBQuads == NULL)
+	if (pRGBQuads == 0)
 		return FALSE;
 	//CTDIB_UNDECONST(FALSE);
 
@@ -637,13 +637,13 @@ uint32_t CTDIB::GetPixelShiftInByte(uint
 
 Bool32 CTDIB::IsExternalsSets() {
 	return (pExternalAlloc && pExternalFree && pExternalLock && pExternalUnlock)
-			!= NULL;
+			!= 0;
 }
 
 Bool32 CTDIB::GetRGBQuad(uint32_t wQuad, PCTDIBRGBQUAD pQuad) {
 	PCTDIBRGBQUAD pCurrentQuad;
 
-	if (pRGBQuads == NULL)
+	if (pRGBQuads == 0)
 		return FALSE;
 
 	if (wQuad > GetActualColorNumber()) {

Line 0 Link Here

(-)files/patch-c_trans_h (+11 lines)
	1	--- cuneiform_src/Kern/rblock/../hhh/tigerh/h/c_trans.h.orig 2015-07-08 10:10:03 UTC
	2	+++ cuneiform_src/Kern/rblock/../hhh/tigerh/h/c_trans.h
	3	@@ -64,7 +64,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
	4	* __WIN32__ - for Win 95/NT *
	5	* __MAC__ - Macintosh *
	6	**********************************************************************/
	7	-#ifndef _C_TARNSLATOR_
	8	+#ifndef _C_TRANSLATOR_
	9	#define _C_TRANSLATOR_
	10
	11	////////////////////////////////////////////////////////////////////////




--- cuneiform_src/Kern/fon/src/clu_test.c.orig	2015-07-09 08:07:48 UTC
+++ cuneiform_src/Kern/fon/src/clu_test.c
@@ -781,8 +781,8 @@ int TestStayGood(int numCluster, int num
 
         if( allStay[let] <= 0 ||
 			infoC[allStay[let]-1].count < infoC[i].count ||
-			infoC[allStay[let]-1].count == infoC[i].count &&
-			infoC[allStay[let]-1].prob < infoC[i].prob
+			(infoC[allStay[let]-1].count == infoC[i].count &&
+			infoC[allStay[let]-1].prob < infoC[i].prob)
 			)
 			allStay[let]=i+1;
 	}
@@ -841,7 +841,7 @@ int TestStayGood(int numCluster, int num
         let=infoC[j].let;
 
 		if( infoC[j].invalid  ||
-			(infoC[j].valid & LEO_VALID_LINGVO) == 0 &&
+			((infoC[j].valid & LEO_VALID_LINGVO) == 0) &&
 			infoC[j].prob < POROG_ADD
 		  )
 		  continue;
@@ -965,7 +965,7 @@ int TestAddFontGood(int numCluster, Info
 
 		if( allStay[let] <= 0 ||
 			infoC[allStay[let]-1].count < infoC[i].count ||
-			infoC[allStay[let]-1].count == infoC[i].count &&
+			(infoC[allStay[let]-1].count == infoC[i].count) &&
 			infoC[allStay[let]-1].prob < infoC[i].prob
 			)
 			allStay[let]=i+1;

Line 0 Link Here

(-)files/patch-cor_spel_c (+11 lines)
	1	--- cuneiform_src/Kern/rpstr/src/cor_spel.c.orig 2015-07-08 12:30:44 UTC
	2	+++ cuneiform_src/Kern/rpstr/src/cor_spel.c
	3	@@ -2312,7 +2312,7 @@ static int rpstr_case_notequal( uchar *i
	4	///////////
	5	// ïðîâåðèòü àëüòåðíàòèâû
	6	// ñ êåì ïóòàþòñÿ áóêâû
	7	-static uchar *twinAlts[256]={
	8	+static char *twinAlts[256]={
	9	"","","","","","","","","","","","","","","","",
	10	"","","","","","","","","","","","","","","","",
	11	"","","","","","","","","","","","","","","","", //32-47




--- cuneiform_src/cli/cuneiform-cli.cpp.orig	2015-07-08 09:26:05 UTC
+++ cuneiform_src/cli/cuneiform-cli.cpp
@@ -152,7 +152,8 @@ static string supported_formats() {
  */
 static char* read_file(const char *fname);
 
-#ifdef USE_MAGICK
+#ifndef USE_MAGICK
+#define USE_MAGICK
 #include <Magick++.h>
 using namespace Magick;
 
@@ -337,7 +338,10 @@ int main(int argc, char **argv) {
         return 0;
     }
 
-#ifdef USE_MAGICK
+#ifndef USE_MAGICK 
+#define USE_MAGICK
+#include <Magick++.h>
+using namespace Magick;
     Magick::InitializeMagick("");
 #endif
 




--- cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp.orig	2011-04-19 12:49:57 UTC
+++ cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp
@@ -594,8 +594,8 @@ Bool32 CRIControl::CreateDestinatonDIB(u
 		return FALSE;
 	}
 
-	wNewHeight = (mbMarginsFlag ? abs(mrMargins.rmBottomMarg - mrMargins.rmTopMarg) : mpSourceDIB->GetLinesNumber());
-	wNewWidth = (mbMarginsFlag ? abs(mrMargins.rmLeftMarg - mrMargins.rmRightMarg) : mpSourceDIB->GetLineWidth());
+	wNewHeight = (mbMarginsFlag ? abs((int32_t)(mrMargins.rmBottomMarg - mrMargins.rmTopMarg)) : mpSourceDIB->GetLinesNumber());
+	wNewWidth = (mbMarginsFlag ? abs((int32_t)(mrMargins.rmLeftMarg - mrMargins.rmRightMarg)) : mpSourceDIB->GetLineWidth());
 	mpSourceDIB->GetResolutionDPM( &wXResolution, &wYResolution);
 
 	if ( !mpDestinationDIB->CreateDIBBegin( wNewWidth, wNewHeight, BitCount) )

Line 0 Link Here

(-)files/patch-debug_cpp (+11 lines)
	1	--- cuneiform_src/Kern/puma/c/debug.cpp.orig 2016-06-07 15:17:15 UTC
	2	+++ cuneiform_src/Kern/puma/c/debug.cpp
	3	@@ -70,7 +70,7 @@ void InitDebug()
	4	LDPUMA_RegistryHelp(hDebugRoot,
	5	"<ÐÑÐ²ÐµÑÑÑÐ²ÐµÐ½Ð½ÑÐ¹: Ð.Ð¥Ð»ÐµÐ±ÑÑÐ¸Ð½> Ð Ð¿ÐµÑÐµÐ¼ÐµÐ½Ð½ÑÑ ÑÑÐ¾Ð¹ Ð²ÐµÑÑÐ¸Ð½Ñ \
	6	Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐµÐºÑÑÐ¸Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² ÑÐ°ÑÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°Ð½Ð¸Ñ Ð¸ Ð¾ÑÐ»Ð°Ð´ÐºÐ¸. "
	7	- ,NULL);
	8	+ ,0);
	9	LDPUMA_RegVariable(NULL,"Ð¯Ð·ÑÐº ÑÐ°ÑÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°Ð½Ð¸Ñ.",&gnLanguage,"unsigned");
	10	LDPUMA_RegVariable(NULL,"ÐÐ´Ð½Ð° ÐºÐ¾Ð»Ð¾Ð½ÐºÐ°.",&gbOneColumn,"unsigned");
	11	LDPUMA_RegVariable(NULL,"Ð¡Ð»Ð¾Ð²Ð°ÑÐ½ÑÐ¹ ÐºÐ¾Ð½ÑÑÐ¾Ð»Ñ.",&gbSpeller,"unsigned");




--- cuneiform_src/Kern/fon/src/distance.c.orig	2015-07-09 08:44:36 UTC
+++ cuneiform_src/Kern/fon/src/distance.c
@@ -630,7 +630,7 @@ static int LookBestClusters(int w, int h
 		// Ð½Ðµ ÑÐ°ÑÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°ÑÑ ÑÐµÐ±Ñ ?
 		if (wel->weight == 1 && (wel->nInCTB == nInCTB ||
 		//wel->sr_col == col && wel->sr_row==row
-				abs(col - wel->sr_col) <= 1 && abs(row - wel->sr_row) <= 1))
+				(abs(col - wel->sr_col) <= 1 && abs(row - wel->sr_row) <= 1)))
 			//	  wel-> work < 230 )
 			continue;
 		//   dist=(255 - wel->work + 4)/(2*STRAFPOINT) ;
@@ -1352,7 +1352,7 @@ static int LookBestOkr(int w, int h, uch
 		// Ð½Ðµ ÑÐ°ÑÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°ÑÑ ÑÐµÐ±Ñ ?
 		if (wel->weight == 1 && (wel->nInCTB == nInCTB ||
 		//wel->sr_col == col && wel->sr_row==row
-				abs(col - wel->sr_col) <= 1 && abs(row - wel->sr_row) <= 1))
+				(abs(col - wel->sr_col) <= 1 && abs(row - wel->sr_row) <= 1)))
 			//	  wel-> work < 230 )
 			continue;
 		//   dist=(255 - wel->work + 4)/(2*STRAFPOINT) ;

Line 0 Link Here

(-)files/patch-dll_cpp (+11 lines)
	1	--- cuneiform_src/Kern/puma/main/dll.cpp.orig 2015-07-08 10:23:16 UTC
	2	+++ cuneiform_src/Kern/puma/main/dll.cpp
	3	@@ -95,7 +95,7 @@ uint32_t ul_reason_for_call,
	4	case DLL_PROCESS_ATTACH:
	5	ghInst = hModule;
	6	GetModuleFileName(hModule,szPath,sizeof(szPath));
	7	- if(p = strstr(_strupr(szPath),"CUNEIFORM.DLL"))
	8	+ if(p == strstr(_strupr(szPath),"CUNEIFORM.DLL"))
	9	*(p-1)=0;
	10	else
	11	{




--- cuneiform_src/Kern/rstr/src/embbox.c.orig	2016-06-07 15:22:31 UTC
+++ cuneiform_src/Kern/rstr/src/embbox.c
@@ -131,7 +131,7 @@ int16_t  isKlasterFull( int16_t typl )
 static void store_many(uint16_t ibcos, char let, char ff, int16_t typl)
 {
      if(language==PUMA_LANG_RUSSIAN) return;
-  switch (let)
+  switch ((unsigned int)let)
    {
     case 'x': case 'c': case 'v':
     case 's': case 'w':
@@ -226,7 +226,7 @@ static int16_t letagain(char curleta,int
    fl4 = fl*4;
    wiptr=NULL;
    if(language==PUMA_LANG_RUSSIAN) return 0;
-   switch (curleta)
+   switch ((unsigned int)curleta)
     {
      case 'c':
       rbfc |= fl1;




--- cuneiform_src/Kern/rbal/src/linutil.c.orig	2015-07-08 12:02:28 UTC
+++ cuneiform_src/Kern/rbal/src/linutil.c
@@ -228,10 +228,11 @@ int16_t twin(uchar ch) {
 	if (!isletter(ch))
 		return 0;
 	if (language == PUMA_LANG_RUSSIAN)
-		if (memchr(non_twin, ch, sizeof non_twin))
+	{	if (memchr(non_twin, ch, sizeof non_twin))
 			return 0;
 		else
 			return 1;
+	}
 	if (language != PUMA_LANG_RUSSIAN && memchr(lat_twins, ch, sizeof lat_twins))
 		return 1;
 	return 0;
@@ -509,7 +510,7 @@ int16_t setup_let_case(int16_t ckH) {
 			page_stat = 1;
 	}
 	if (db_status & snap_activity_rbal(db_pass) && ret != 0) {
-		char buf[120];
+		uchar buf[120];
 		sprintf(buf, "Page statistic lh=%u  caps=%u,%u lcase=%u,%u ", lh, umax,
 				uprob, lmax, lprob);
 		snap_show_text_rbal(buf);
@@ -892,7 +893,7 @@ int16_t GetPsFromHeights(void) {
 
 	c = cell_f();
 	//  while( (c=c->nextl)->nextl )
-	while (c = CSTR_GetNextRaster(c, f_letter)) {
+	while (c == CSTR_GetNextRaster(c, f_letter)) {
 		int16_t df, sn;
 
 		CSTR_GetAttr(c, &attr);
@@ -1045,7 +1046,7 @@ int16_t GetPsFromHeights(void) {
 
 	ret: HIST_STATISTIC = 1;
 	if (db_status & snap_activity_rbal(db_pass)) {
-		char buf[120];
+		uchar buf[120];
 		sprintf(buf,
 				"Histogramms: min=%d b3=%d peak1= %d|%d peak2= %d|%d sunk=%d",
 				minrow, bbs3, ind1, max1, ind2, max2, n_sunk);




--- cuneiform_src/Kern/rblock/sources/c/ltremove.c.orig	2015-07-08 10:28:27 UTC
+++ cuneiform_src/Kern/rblock/sources/c/ltremove.c
@@ -548,13 +548,13 @@ void BlocksRemoveEmptyBlocks (void)
 
         CalculateDirectionsValues (p);
 
-        if (Dirs [0].nPictureSquare >= Dirs [0].nWidth     &&
+        if ((Dirs [0].nPictureSquare >= Dirs [0].nWidth    &&
             Dirs [1].nPictureSquare >= Dirs [1].nWidth     &&
-            Dirs [2].nPictureSquare >= Dirs [2].nWidth / 2
+            Dirs [2].nPictureSquare >= Dirs [2].nWidth / 2)
                 ||
-            Dirs [0].nPictureSquare >= Dirs [0].nWidth * 2 &&
+            (Dirs [0].nPictureSquare >= Dirs [0].nWidth * 2 &&
             Dirs [1].nPictureSquare >= Dirs [1].nWidth * 2 &&
-            Dirs [2].nPictureSquare >= Dirs [2].nWidth / 3)
+            Dirs [2].nPictureSquare >= Dirs [2].nWidth / 3))
         {
 # ifdef LT_DEBUG
             //if (LT_DebugGraphicsLevel >= 3)
@@ -707,27 +707,27 @@ void BlocksRemoveEmptyBlocks (void)
         }
 # endif
 
-        if ((
+        if (((
              p -> nLetters == 0                     &&
              p -> nRoots - p -> nDust <= 10      &&  /* CRSH5 */
              nBlockWidth >  0                       &&
              nBlockWidth <= MAX_DUST_WIDTH / 2      &&
-             nBlockHeight / nBlockWidth >= 7
+             nBlockHeight / nBlockWidth >= 7)
                  ||
-             p -> nLetters == 0                     &&
+             (p -> nLetters == 0                     &&
              p -> nRoots - p -> nDust <= 2          &&
              nBlockHeight > 0                       &&
              nBlockHeight <= MAX_DUST_HEIGHT        &&
-             nBlockWidth / nBlockHeight >= 10
+             nBlockWidth / nBlockHeight >= 10)
                  ||
-             p -> nLetters == 0                     &&
+             (p -> nLetters == 0                     &&
              p -> nRoots - p -> nDust == 1          &&
-             nBlockHeight < MAX_DUST_HEIGHT * 3 / 2
+             nBlockHeight < MAX_DUST_HEIGHT * 3 / 2)
                  ||                                       /* OK */
-             p -> nLetters == 0                     &&
+             (p -> nLetters == 0                     &&
              p -> nRoots - p -> nDust < 5           &&
              nBlockHeight < MAX_DUST_HEIGHT * 4     &&
-             nBlockWidth  < MAX_DUST_WIDTH  * 4)
+             nBlockWidth  < MAX_DUST_WIDTH  * 4))
 
              &&
 




--- cuneiform_src/Kern/rblock/sources/c/ltroots.c.orig	2015-07-09 09:24:35 UTC
+++ cuneiform_src/Kern/rblock/sources/c/ltroots.c
@@ -71,6 +71,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # include <stdio.h>
 /*# include <crtdbg.h>*/
 #include <assert.h>
+#include <unistd.h>
 
 # include "c_memory.h"
 # include "iolib.h"
@@ -108,19 +109,19 @@ int nRootStripsOffset;
 
 # ifdef LT_STAND_ALONE
 # define ROOTS_MEMORY_QUANTUM   1024
-
+
 Bool RootsLoadFile (char * pFilename)
 {
 /*    typedef int HANDLE;*/
 
-    HANDLE hFile;
+    int hFile;
     ROOT   RootRecord;
 
     RootsFreeData ();
 
-    hFile = (HANDLE)open (pFilename, O_RDONLY | O_BINARY);
+    hFile = (int)open (pFilename, O_RDONLY | O_BINARY);
 
-    if (hFile == (HANDLE)(-1))
+    if (hFile == (int)(-1))
     {
         ErrorFile ();
         return (FALSE);
@@ -154,7 +155,7 @@ Bool RootsLoadFile (char * pFilename)
     return (TRUE);
 }
 # endif
-
+
 void CalculatePageParameters (void)
 {
     ROOT *pRoot;
@@ -287,7 +288,7 @@ void RootStripsCalculate (void)
         }
     }
 }
-
+
 void RootStripsGetLoopParameters
 (
     int yTop,
@@ -358,7 +359,7 @@ void RootStripsGetLoopParameters
         *ppAfter = pEnd + 1;
     }
 }
-
+
 void RootsRemoveFromRulers (void)
 {
     ROOT *p;
@@ -377,7 +378,7 @@ void RootsRemoveFromRulers (void)
         }
     }
 }
-
+
 void RootsSaveNonLayoutData (void)
 {
     int i;
@@ -400,7 +401,7 @@ void RootsSaveNonLayoutData (void)
         pRootExts [i].wLength     = pRoots [i].u1.u2.wLength;
     }
 }
-
+
 void RootsRestoreNonLayoutData_ForDustAndRemoved (void)
 {
     int i;
@@ -418,7 +419,7 @@ void RootsRestoreNonLayoutData_ForDustAn
         }
     }
 }
-
+
 void RootsRestoreNonLayoutData_ForBlock (BLOCK *p)
 {
     ROOT *pRoot, *pNext;
@@ -436,7 +437,7 @@ void RootsRestoreNonLayoutData_ForBlock 
         pRoot -> u1.u2.wLength     = pRootExts [pRoot - pRoots].wLength;
     }
 }
-
+
 void RootsRestoreNonLayoutData (void)
 {
     int i;
@@ -456,7 +457,8 @@ void RootsRestoreNonLayoutData (void)
     pAfterRootExts = NULL;
     nRootExts      = 0;
 }
-
+
+
 void RootsFreeData (void)
 {
 # ifdef LT_STAND_ALONE




--- cuneiform_src/Kern/puma/c/out.cpp.orig	2015-07-09 10:18:08 UTC
+++ cuneiform_src/Kern/puma/c/out.cpp
@@ -78,11 +78,11 @@ Bool32 ConverROUT(char * lpOutFileName, 
 		!ROUT_SetImportData(ROUT_LONG_TableTextOptions,
 						(void*)TableTextOptions)*/
 		!ROUT_SetImportData(ROUT_BOOL_PreserveLineBreaks,
-					  (void*)gnPreserveLineBreaks)||
+					  (void*)reinterpret_cast<int*>(gnPreserveLineBreaks))||
 		!ROUT_SetImportData(ROUT_PCHAR_PageName,szName) ||
 		!ROUT_SetImportData(ROUT_HANDLE_PageHandle,ghEdPage)||
-		!ROUT_SetImportData(ROUT_LONG_Format,(void*)lnFormat)||
-		!ROUT_SetImportData(ROUT_LONG_Code,(void*)lnCode)||
+		!ROUT_SetImportData(ROUT_LONG_Format,(void*)reinterpret_cast<int*>(lnFormat))||
+		!ROUT_SetImportData(ROUT_LONG_Code,(void*)reinterpret_cast<int*>(lnCode))||
 		!ROUT_SetImportData(ROUT_PCHAR_BAD_CHAR,&gnUnrecogChar))
 	{
 		SetReturnCode_puma(ROUT_GetReturnCode());
@@ -144,10 +144,10 @@ uint32_t ConverROUTtoMemory(Handle hEd, 
 uint32_t rc = 0;
 	if (
 		!ROUT_SetImportData(ROUT_BOOL_PreserveLineBreaks,
-					  (void*)gnPreserveLineBreaks)||
+					  (void*)reinterpret_cast<int*>(gnPreserveLineBreaks))||
 		!ROUT_SetImportData(ROUT_HANDLE_PageHandle,hEd)||
-		!ROUT_SetImportData(ROUT_LONG_Format,(void*)lnFormat)||
-		!ROUT_SetImportData(ROUT_LONG_Code,(void*)lnCode)||
+		!ROUT_SetImportData(ROUT_LONG_Format,(void*)reinterpret_cast<int*>(lnFormat))||
+		!ROUT_SetImportData(ROUT_LONG_Code,(void*)reinterpret_cast<int*>(lnCode))||
 		!ROUT_SetImportData(ROUT_PCHAR_BAD_CHAR,&gnUnrecogChar))
 	{
 		SetReturnCode_puma(ROUT_GetReturnCode());




--- cuneiform_src/Kern/rblock/sources/c/sestring.c.orig	2015-07-09 11:50:20 UTC
+++ cuneiform_src/Kern/rblock/sources/c/sestring.c
@@ -485,8 +485,8 @@ STRING *StringAddToList (void)
     }
     else if (! (pStringsUpList -> uFlags & SF_NEED_DELETE) &&
              (pStringsUpList -> yMiddleTop > pNew -> yMiddleBottom ||
-              pStringsUpList -> yMiddleBottom > pNew -> yMiddleTop &&
-              pStringsUpList -> xLeft > pNew -> xLeft))
+              (pStringsUpList -> yMiddleBottom > pNew -> yMiddleTop &&
+              pStringsUpList -> xLeft > pNew -> xLeft)))
     {
         pNew -> pUp           = NULL;
         pNew -> pDown         = pStringsUpList;
@@ -501,8 +501,8 @@ STRING *StringAddToList (void)
                 continue;
 
             if (pNew -> yMiddleBottom <= p -> pDown -> yMiddleTop ||
-                pNew -> yMiddleTop    <= p -> pDown -> yMiddleBottom &&
-                pNew -> xLeft         <= p -> pDown -> xLeft)
+                (pNew -> yMiddleTop    <= p -> pDown -> yMiddleBottom &&
+                pNew -> xLeft         <= p -> pDown -> xLeft))
             {
                 break;
             }

Line 0 Link Here

(-)files/patch-stdprt_cpp (+11 lines)
	1	--- cuneiform_src/Kern/std/src/stdprt.cpp.orig 2015-07-09 14:11:21 UTC
	2	+++ cuneiform_src/Kern/std/src/stdprt.cpp
	3	@@ -57,7 +57,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
	4	#include "_prt.h"
	5	#include "internal.h"
	6	#pragma hdrstop
	7	-
	8	+#pragma GCC diagnostic ignored "-Wwrite-strings"
	9
	10
	11

Line 0 Link Here

(-)files/patch-stdprt_h (+11 lines)
	1	--- cuneiform_src/Kern/hrkint/stdprt.h.orig 2015-07-08 11:24:29 UTC
	2	+++ cuneiform_src/Kern/hrkint/stdprt.h
	3	@@ -58,6 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
	4	#define __STDPRT_H
	5
	6	#include "std.h"
	7	+#include <cstdarg>
	8
	9	typedef int32_t HEvent32;
	10	typedef struct tagStdPrtEvent
	11

Line 0 Link Here

(-)files/patch__snp_c (+11 lines)
	1	--- cuneiform-linux-1.1.0/cuneiform_src/Kern/hdebug/__snp.c.orig 2015-07-09 11:59:03 UTC
	2	+++ cuneiform-linux-1.1.0/cuneiform_src/Kern/hdebug/__snp.c
	3	@@ -156,7 +156,7 @@ extern "C" {
	4	static Handle hWriteFile = NULL;
	5	//////////////////////////////////////////////
	6	static int __DPUMA__AllocHook__( int allocType, void *userData, size_t size, int blockType,
	7	- long requestNumber, const unsigned char *filename, int lineNumber)
	8	+ long requestNumber, const char *filename, int lineNumber)
	9	{
	10	uint32_t prevSize = 0;
	11	int rc = PrevAllocHook(allocType,userData,size,blockType,

Return to bug 201424

Lines 3-9 Link Here

(-)Makefile (-6 / +3 lines)
3		3
4	PORTNAME= cuneiform	4	PORTNAME= cuneiform
5	PORTVERSION= 1.1.0	5	PORTVERSION= 1.1.0
6	PORTREVISION= 4	6	PORTREVISION= 5
7	CATEGORIES= graphics	7	CATEGORIES= graphics
8	MASTER_SITES= http://launchpadlibrarian.net/69906918/	8	MASTER_SITES= http://launchpadlibrarian.net/69906918/
9	DISTNAME= ${PORTNAME}-linux-${PORTVERSION}	9	DISTNAME= ${PORTNAME}-linux-${PORTVERSION}
Lines 16-21 Link Here
16		16
17	ONLY_FOR_ARCHS= i386 amd64	17	ONLY_FOR_ARCHS= i386 amd64
18		18
		19	USE_GCC= 4.9+
19	USES= cmake:outsource tar:bzip2	20	USES= cmake:outsource tar:bzip2
20	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
21		22
Lines 22-35 Link Here
22	CPPFLAGS+= -I${LOCALBASE}/include	23	CPPFLAGS+= -I${LOCALBASE}/include
23	CFLAGS+= -I${LOCALBASE}/include	24	CFLAGS+= -I${LOCALBASE}/include
24		25
25	OPTIONS_DEFINE= IMAGEMAGICK	26	LIB_DEPENDS+= libMagick++-6.so:graphics/ImageMagick
26		27
27	.include <bsd.port.options.mk>	28	.include <bsd.port.options.mk>
28		29
29	.if ${PORT_OPTIONS:MIMAGEMAGICK}
30	LIB_DEPENDS+= libMagickWand-6.so:graphics/ImageMagick
31	.endif
32
33	post-patch:	30	post-patch:
34	${MV} ${WRKSRC}/cuneiform_src/Kern/hhh/tigerh/h/strings.h \	31	${MV} ${WRKSRC}/cuneiform_src/Kern/hhh/tigerh/h/strings.h \
35	${WRKSRC}/cuneiform_src/Kern/hhh/tigerh/h/cf_strings.h	32	${WRKSRC}/cuneiform_src/Kern/hhh/tigerh/h/cf_strings.h

Line 0 Link Here

(-)files/patch-CTDIB.cpp (+36 lines)
	1	--- cuneiform_src/Kern/rdib/sources/cpp/CTDIB.cpp.orig 2016-06-07 14:16:39 UTC
	2	+++ cuneiform_src/Kern/rdib/sources/cpp/CTDIB.cpp
	3	@@ -538,7 +538,7 @@ Bool32 CTDIB::GetDIBHandle(Handle* phDIB
	4	}
	5
	6	Bool32 CTDIB::GetDIBPtr(pvoid* ppDIB) {
	7	- CTDIB_IFNODIB(NULL);
	8	+ CTDIB_IFNODIB(0);
	9
	10	*ppDIB = pDIB;
	11	return TRUE;
	12	@@ -547,7 +547,7 @@ Bool32 CTDIB::GetDIBPtr(pvoid* ppDIB) {
	13	Bool32 CTDIB::SetRGBQuad(uint32_t wQuad, CTDIBRGBQUAD Quad) {
	14	PCTDIBRGBQUAD pCurrentQuad;
	15
	16	- if (pRGBQuads == NULL)
	17	+ if (pRGBQuads == 0)
	18	return FALSE;
	19	//CTDIB_UNDECONST(FALSE);
	20
	21	@@ -637,13 +637,13 @@ uint32_t CTDIB::GetPixelShiftInByte(uint
	22
	23	Bool32 CTDIB::IsExternalsSets() {
	24	return (pExternalAlloc && pExternalFree && pExternalLock && pExternalUnlock)
	25	- != NULL;
	26	+ != 0;
	27	}
	28
	29	Bool32 CTDIB::GetRGBQuad(uint32_t wQuad, PCTDIBRGBQUAD pQuad) {
	30	PCTDIBRGBQUAD pCurrentQuad;
	31
	32	- if (pRGBQuads == NULL)
	33	+ if (pRGBQuads == 0)
	34	return FALSE;
	35
	36	if (wQuad > GetActualColorNumber()) {

Line 0 Link Here

(-)files/patch-clu_test.c (+31 lines)
	1	--- cuneiform_src/Kern/fon/src/clu_test.c.orig 2015-07-09 08:07:48 UTC
	2	+++ cuneiform_src/Kern/fon/src/clu_test.c
	3	@@ -781,8 +781,8 @@ int TestStayGood(int numCluster, int num
	4
	5	if( allStay[let] <= 0 \|\|
	6	infoC[allStay[let]-1].count < infoC[i].count \|\|
	7	- infoC[allStay[let]-1].count == infoC[i].count &&
	8	- infoC[allStay[let]-1].prob < infoC[i].prob
	9	+ (infoC[allStay[let]-1].count == infoC[i].count &&
	10	+ infoC[allStay[let]-1].prob < infoC[i].prob)
	11	)
	12	allStay[let]=i+1;
	13	}
	14	@@ -841,7 +841,7 @@ int TestStayGood(int numCluster, int num
	15	let=infoC[j].let;
	16
	17	if( infoC[j].invalid \|\|
	18	- (infoC[j].valid & LEO_VALID_LINGVO) == 0 &&
	19	+ ((infoC[j].valid & LEO_VALID_LINGVO) == 0) &&
	20	infoC[j].prob < POROG_ADD
	21	)
	22	continue;
	23	@@ -965,7 +965,7 @@ int TestAddFontGood(int numCluster, Info
	24
	25	if( allStay[let] <= 0 \|\|
	26	infoC[allStay[let]-1].count < infoC[i].count \|\|
	27	- infoC[allStay[let]-1].count == infoC[i].count &&
	28	+ (infoC[allStay[let]-1].count == infoC[i].count) &&
	29	infoC[allStay[let]-1].prob < infoC[i].prob
	30	)
	31	allStay[let]=i+1;

Line 0 Link Here

(-)files/patch-cuneiform-cli-cpp (+24 lines)
	1	--- cuneiform_src/cli/cuneiform-cli.cpp.orig 2015-07-08 09:26:05 UTC
	2	+++ cuneiform_src/cli/cuneiform-cli.cpp
	3	@@ -152,7 +152,8 @@ static string supported_formats() {
	4	*/
	5	static char* read_file(const char *fname);
	6
	7	-#ifdef USE_MAGICK
	8	+#ifndef USE_MAGICK
	9	+#define USE_MAGICK
	10	#include <Magick++.h>
	11	using namespace Magick;
	12
	13	@@ -337,7 +338,10 @@ int main(int argc, char **argv) {
	14	return 0;
	15	}
	16
	17	-#ifdef USE_MAGICK
	18	+#ifndef USE_MAGICK
	19	+#define USE_MAGICK
	20	+#include <Magick++.h>
	21	+using namespace Magick;
	22	Magick::InitializeMagick("");
	23	#endif
	24

Lines 1-13 Link Here

(-)files/patch-cuneiform__src_Kern_rimage_sources_main_cricontrol.cpp (-13 lines)
1	--- cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp.orig 2011-04-19 12:49:57 UTC
2	+++ cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp
3	@@ -594,8 +594,8 @@ Bool32 CRIControl::CreateDestinatonDIB(u
4	return FALSE;
5	}
6
7	- wNewHeight = (mbMarginsFlag ? abs(mrMargins.rmBottomMarg - mrMargins.rmTopMarg) : mpSourceDIB->GetLinesNumber());
8	- wNewWidth = (mbMarginsFlag ? abs(mrMargins.rmLeftMarg - mrMargins.rmRightMarg) : mpSourceDIB->GetLineWidth());
9	+ wNewHeight = (mbMarginsFlag ? abs((int32_t)(mrMargins.rmBottomMarg - mrMargins.rmTopMarg)) : mpSourceDIB->GetLinesNumber());
10	+ wNewWidth = (mbMarginsFlag ? abs((int32_t)(mrMargins.rmLeftMarg - mrMargins.rmRightMarg)) : mpSourceDIB->GetLineWidth());
11	mpSourceDIB->GetResolutionDPM( &wXResolution, &wYResolution);
12
13	if ( !mpDestinationDIB->CreateDIBBegin( wNewWidth, wNewHeight, BitCount) )

Line 0 Link Here

(-)files/patch-distance_c (+20 lines)
	1	--- cuneiform_src/Kern/fon/src/distance.c.orig 2015-07-09 08:44:36 UTC
	2	+++ cuneiform_src/Kern/fon/src/distance.c
	3	@@ -630,7 +630,7 @@ static int LookBestClusters(int w, int h
	4	// Ð½Ðµ ÑÐ°ÑÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°ÑÑ ÑÐµÐ±Ñ ?
	5	if (wel->weight == 1 && (wel->nInCTB == nInCTB \|\|
	6	//wel->sr_col == col && wel->sr_row==row
	7	- abs(col - wel->sr_col) <= 1 && abs(row - wel->sr_row) <= 1))
	8	+ (abs(col - wel->sr_col) <= 1 && abs(row - wel->sr_row) <= 1)))
	9	// wel-> work < 230 )
	10	continue;
	11	// dist=(255 - wel->work + 4)/(2*STRAFPOINT) ;
	12	@@ -1352,7 +1352,7 @@ static int LookBestOkr(int w, int h, uch
	13	// Ð½Ðµ ÑÐ°ÑÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°ÑÑ ÑÐµÐ±Ñ ?
	14	if (wel->weight == 1 && (wel->nInCTB == nInCTB \|\|
	15	//wel->sr_col == col && wel->sr_row==row
	16	- abs(col - wel->sr_col) <= 1 && abs(row - wel->sr_row) <= 1))
	17	+ (abs(col - wel->sr_col) <= 1 && abs(row - wel->sr_row) <= 1)))
	18	// wel-> work < 230 )
	19	continue;
	20	// dist=(255 - wel->work + 4)/(2*STRAFPOINT) ;

Line 0 Link Here

(-)files/patch-embbox_c (+20 lines)
	1	--- cuneiform_src/Kern/rstr/src/embbox.c.orig 2016-06-07 15:22:31 UTC
	2	+++ cuneiform_src/Kern/rstr/src/embbox.c
	3	@@ -131,7 +131,7 @@ int16_t isKlasterFull( int16_t typl )
	4	static void store_many(uint16_t ibcos, char let, char ff, int16_t typl)
	5	{
	6	if(language==PUMA_LANG_RUSSIAN) return;
	7	- switch (let)
	8	+ switch ((unsigned int)let)
	9	{
	10	case 'x': case 'c': case 'v':
	11	case 's': case 'w':
	12	@@ -226,7 +226,7 @@ static int16_t letagain(char curleta,int
	13	fl4 = fl*4;
	14	wiptr=NULL;
	15	if(language==PUMA_LANG_RUSSIAN) return 0;
	16	- switch (curleta)
	17	+ switch ((unsigned int)curleta)
	18	{
	19	case 'c':
	20	rbfc \|= fl1;

Line 0 Link Here

(-)files/patch-linutil_c (+42 lines)
	1	--- cuneiform_src/Kern/rbal/src/linutil.c.orig 2015-07-08 12:02:28 UTC
	2	+++ cuneiform_src/Kern/rbal/src/linutil.c
	3	@@ -228,10 +228,11 @@ int16_t twin(uchar ch) {
	4	if (!isletter(ch))
	5	return 0;
	6	if (language == PUMA_LANG_RUSSIAN)
	7	- if (memchr(non_twin, ch, sizeof non_twin))
	8	+ { if (memchr(non_twin, ch, sizeof non_twin))
	9	return 0;
	10	else
	11	return 1;
	12	+ }
	13	if (language != PUMA_LANG_RUSSIAN && memchr(lat_twins, ch, sizeof lat_twins))
	14	return 1;
	15	return 0;
	16	@@ -509,7 +510,7 @@ int16_t setup_let_case(int16_t ckH) {
	17	page_stat = 1;
	18	}
	19	if (db_status & snap_activity_rbal(db_pass) && ret != 0) {
	20	- char buf[120];
	21	+ uchar buf[120];
	22	sprintf(buf, "Page statistic lh=%u caps=%u,%u lcase=%u,%u ", lh, umax,
	23	uprob, lmax, lprob);
	24	snap_show_text_rbal(buf);
	25	@@ -892,7 +893,7 @@ int16_t GetPsFromHeights(void) {
	26
	27	c = cell_f();
	28	// while( (c=c->nextl)->nextl )
	29	- while (c = CSTR_GetNextRaster(c, f_letter)) {
	30	+ while (c == CSTR_GetNextRaster(c, f_letter)) {
	31	int16_t df, sn;
	32
	33	CSTR_GetAttr(c, &attr);
	34	@@ -1045,7 +1046,7 @@ int16_t GetPsFromHeights(void) {
	35
	36	ret: HIST_STATISTIC = 1;
	37	if (db_status & snap_activity_rbal(db_pass)) {
	38	- char buf[120];
	39	+ uchar buf[120];
	40	sprintf(buf,
	41	"Histogramms: min=%d b3=%d peak1= %d\|%d peak2= %d\|%d sunk=%d",
	42	minrow, bbs3, ind1, max1, ind2, max2, n_sunk);

Line 0 Link Here

(-)files/patch-ltremove_c (+56 lines)
	1	--- cuneiform_src/Kern/rblock/sources/c/ltremove.c.orig 2015-07-08 10:28:27 UTC
	2	+++ cuneiform_src/Kern/rblock/sources/c/ltremove.c
	3	@@ -548,13 +548,13 @@ void BlocksRemoveEmptyBlocks (void)
	4
	5	CalculateDirectionsValues (p);
	6
	7	- if (Dirs [0].nPictureSquare >= Dirs [0].nWidth &&
	8	+ if ((Dirs [0].nPictureSquare >= Dirs [0].nWidth &&
	9	Dirs [1].nPictureSquare >= Dirs [1].nWidth &&
	10	- Dirs [2].nPictureSquare >= Dirs [2].nWidth / 2
	11	+ Dirs [2].nPictureSquare >= Dirs [2].nWidth / 2)
	12	\|\|
	13	- Dirs [0].nPictureSquare >= Dirs [0].nWidth * 2 &&
	14	+ (Dirs [0].nPictureSquare >= Dirs [0].nWidth * 2 &&
	15	Dirs [1].nPictureSquare >= Dirs [1].nWidth * 2 &&
	16	- Dirs [2].nPictureSquare >= Dirs [2].nWidth / 3)
	17	+ Dirs [2].nPictureSquare >= Dirs [2].nWidth / 3))
	18	{
	19	# ifdef LT_DEBUG
	20	//if (LT_DebugGraphicsLevel >= 3)
	21	@@ -707,27 +707,27 @@ void BlocksRemoveEmptyBlocks (void)
	22	}
	23	# endif
	24
	25	- if ((
	26	+ if (((
	27	p -> nLetters == 0 &&
	28	p -> nRoots - p -> nDust <= 10 && /* CRSH5 */
	29	nBlockWidth > 0 &&
	30	nBlockWidth <= MAX_DUST_WIDTH / 2 &&
	31	- nBlockHeight / nBlockWidth >= 7
	32	+ nBlockHeight / nBlockWidth >= 7)
	33	\|\|
	34	- p -> nLetters == 0 &&
	35	+ (p -> nLetters == 0 &&
	36	p -> nRoots - p -> nDust <= 2 &&
	37	nBlockHeight > 0 &&
	38	nBlockHeight <= MAX_DUST_HEIGHT &&
	39	- nBlockWidth / nBlockHeight >= 10
	40	+ nBlockWidth / nBlockHeight >= 10)
	41	\|\|
	42	- p -> nLetters == 0 &&
	43	+ (p -> nLetters == 0 &&
	44	p -> nRoots - p -> nDust == 1 &&
	45	- nBlockHeight < MAX_DUST_HEIGHT * 3 / 2
	46	+ nBlockHeight < MAX_DUST_HEIGHT * 3 / 2)
	47	\|\| /* OK */
	48	- p -> nLetters == 0 &&
	49	+ (p -> nLetters == 0 &&
	50	p -> nRoots - p -> nDust < 5 &&
	51	nBlockHeight < MAX_DUST_HEIGHT * 4 &&
	52	- nBlockWidth < MAX_DUST_WIDTH * 4)
	53	+ nBlockWidth < MAX_DUST_WIDTH * 4))
	54
	55	&&
	56

Line 0 Link Here

(-)files/patch-ltroots_c (+107 lines)
		1	--- cuneiform_src/Kern/rblock/sources/c/ltroots.c.orig 2015-07-09 09:24:35 UTC
		2	+++ cuneiform_src/Kern/rblock/sources/c/ltroots.c
		3	@@ -71,6 +71,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
		4	# include <stdio.h>
		5	/# include <crtdbg.h>/
		6	#include <assert.h>
		7	+#include <unistd.h>
		8
		9	# include "c_memory.h"
		10	# include "iolib.h"
		11	@@ -108,19 +109,19 @@ int nRootStripsOffset;
		12
		13	# ifdef LT_STAND_ALONE
		14	# define ROOTS_MEMORY_QUANTUM 1024
		15	-
		16	+
		17	Bool RootsLoadFile (char * pFilename)
		18	{
		19	/* typedef int HANDLE;*/
		20
		21	- HANDLE hFile;
		22	+ int hFile;
		23	ROOT RootRecord;
		24
		25	RootsFreeData ();
		26
		27	- hFile = (HANDLE)open (pFilename, O_RDONLY \| O_BINARY);
		28	+ hFile = (int)open (pFilename, O_RDONLY \| O_BINARY);
		29
		30	- if (hFile == (HANDLE)(-1))
		31	+ if (hFile == (int)(-1))
		32	{
		33	ErrorFile ();
		34	return (FALSE);
		35	@@ -154,7 +155,7 @@ Bool RootsLoadFile (char * pFilename)
		36	return (TRUE);
		37	}
		38	# endif
		39	-
		40	+
		41	void CalculatePageParameters (void)
		42	{
		43	ROOT *pRoot;
		44	@@ -287,7 +288,7 @@ void RootStripsCalculate (void)
		45	}
		46	}
		47	}
		48	-
		49	+
		50	void RootStripsGetLoopParameters
		51	(
		52	int yTop,
		53	@@ -358,7 +359,7 @@ void RootStripsGetLoopParameters
		54	*ppAfter = pEnd + 1;
		55	}
		56	}
		57	-
		58	+
		59	void RootsRemoveFromRulers (void)
		60	{
		61	ROOT *p;
		62	@@ -377,7 +378,7 @@ void RootsRemoveFromRulers (void)
		63	}
		64	}
65	}
66	-
67	+
68	void RootsSaveNonLayoutData (void)
69	{
70	int i;
71	@@ -400,7 +401,7 @@ void RootsSaveNonLayoutData (void)
72	pRootExts [i].wLength = pRoots [i].u1.u2.wLength;
73	}
74	}
75	-
76	+
77	void RootsRestoreNonLayoutData_ForDustAndRemoved (void)
78	{
79	int i;
80	@@ -418,7 +419,7 @@ void RootsRestoreNonLayoutData_ForDustAn
81	}
82	}
83	}
84	-
85	+
86	void RootsRestoreNonLayoutData_ForBlock (BLOCK *p)
87	{
88	ROOT pRoot, pNext;
89	@@ -436,7 +437,7 @@ void RootsRestoreNonLayoutData_ForBlock
90	pRoot -> u1.u2.wLength = pRootExts [pRoot - pRoots].wLength;
91	}
92	}
93	-
94	+
95	void RootsRestoreNonLayoutData (void)
96	{
97	int i;
98	@@ -456,7 +457,8 @@ void RootsRestoreNonLayoutData (void)
99	pAfterRootExts = NULL;
100	nRootExts = 0;
101	}
102	-
103	+
104	+
105	void RootsFreeData (void)
106	{
107	# ifdef LT_STAND_ALONE

Line 0 Link Here

(-)files/patch-out_cpp (+31 lines)
	1	--- cuneiform_src/Kern/puma/c/out.cpp.orig 2015-07-09 10:18:08 UTC
	2	+++ cuneiform_src/Kern/puma/c/out.cpp
	3	@@ -78,11 +78,11 @@ Bool32 ConverROUT(char * lpOutFileName,
	4	!ROUT_SetImportData(ROUT_LONG_TableTextOptions,
	5	(void)TableTextOptions)/
	6	!ROUT_SetImportData(ROUT_BOOL_PreserveLineBreaks,
	7	- (void*)gnPreserveLineBreaks)\|\|
	8	+ (void)reinterpret_cast<int>(gnPreserveLineBreaks))\|\|
	9	!ROUT_SetImportData(ROUT_PCHAR_PageName,szName) \|\|
	10	!ROUT_SetImportData(ROUT_HANDLE_PageHandle,ghEdPage)\|\|
	11	- !ROUT_SetImportData(ROUT_LONG_Format,(void*)lnFormat)\|\|
	12	- !ROUT_SetImportData(ROUT_LONG_Code,(void*)lnCode)\|\|
	13	+ !ROUT_SetImportData(ROUT_LONG_Format,(void)reinterpret_cast<int>(lnFormat))\|\|
	14	+ !ROUT_SetImportData(ROUT_LONG_Code,(void)reinterpret_cast<int>(lnCode))\|\|
	15	!ROUT_SetImportData(ROUT_PCHAR_BAD_CHAR,&gnUnrecogChar))
	16	{
	17	SetReturnCode_puma(ROUT_GetReturnCode());
	18	@@ -144,10 +144,10 @@ uint32_t ConverROUTtoMemory(Handle hEd,
	19	uint32_t rc = 0;
	20	if (
	21	!ROUT_SetImportData(ROUT_BOOL_PreserveLineBreaks,
	22	- (void*)gnPreserveLineBreaks)\|\|
	23	+ (void)reinterpret_cast<int>(gnPreserveLineBreaks))\|\|
	24	!ROUT_SetImportData(ROUT_HANDLE_PageHandle,hEd)\|\|
	25	- !ROUT_SetImportData(ROUT_LONG_Format,(void*)lnFormat)\|\|
	26	- !ROUT_SetImportData(ROUT_LONG_Code,(void*)lnCode)\|\|
	27	+ !ROUT_SetImportData(ROUT_LONG_Format,(void)reinterpret_cast<int>(lnFormat))\|\|
	28	+ !ROUT_SetImportData(ROUT_LONG_Code,(void)reinterpret_cast<int>(lnCode))\|\|
	29	!ROUT_SetImportData(ROUT_PCHAR_BAD_CHAR,&gnUnrecogChar))
	30	{
	31	SetReturnCode_puma(ROUT_GetReturnCode());

Line 0 Link Here

(-)files/patch-sestring_c (+24 lines)
	1	--- cuneiform_src/Kern/rblock/sources/c/sestring.c.orig 2015-07-09 11:50:20 UTC
	2	+++ cuneiform_src/Kern/rblock/sources/c/sestring.c
	3	@@ -485,8 +485,8 @@ STRING *StringAddToList (void)
	4	}
	5	else if (! (pStringsUpList -> uFlags & SF_NEED_DELETE) &&
	6	(pStringsUpList -> yMiddleTop > pNew -> yMiddleBottom \|\|
	7	- pStringsUpList -> yMiddleBottom > pNew -> yMiddleTop &&
	8	- pStringsUpList -> xLeft > pNew -> xLeft))
	9	+ (pStringsUpList -> yMiddleBottom > pNew -> yMiddleTop &&
	10	+ pStringsUpList -> xLeft > pNew -> xLeft)))
	11	{
	12	pNew -> pUp = NULL;
	13	pNew -> pDown = pStringsUpList;
	14	@@ -501,8 +501,8 @@ STRING *StringAddToList (void)
	15	continue;
	16
	17	if (pNew -> yMiddleBottom <= p -> pDown -> yMiddleTop \|\|
	18	- pNew -> yMiddleTop <= p -> pDown -> yMiddleBottom &&
	19	- pNew -> xLeft <= p -> pDown -> xLeft)
	20	+ (pNew -> yMiddleTop <= p -> pDown -> yMiddleBottom &&
	21	+ pNew -> xLeft <= p -> pDown -> xLeft))
	22	{
	23	break;
	24	}