Attachment 171263 Details for Bug 201424 – patch-cuneiform

[patch] patch-cuneiform

patch-cuneiform (text/plain), 27.77 KB, created by Walter Schwarzenfeld on 2016-06-10 11:53:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2016-06-10 11:53:27 UTC

Size: 27.77 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 416515)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	cuneiform
> PORTVERSION=	1.1.0
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	graphics
> MASTER_SITES=	http://launchpadlibrarian.net/69906918/
> DISTNAME=	${PORTNAME}-linux-${PORTVERSION}
>@@ -16,6 +16,7 @@
> 
> ONLY_FOR_ARCHS=	i386 amd64
> 
>+USE_GCC=	4.9+
> USES=		cmake:outsource tar:bzip2
> USE_LDCONFIG=	yes
> 
>@@ -22,14 +23,10 @@
> CPPFLAGS+=	-I${LOCALBASE}/include
> CFLAGS+=	-I${LOCALBASE}/include
> 
>-OPTIONS_DEFINE=	IMAGEMAGICK
>+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
>Index: files/patch-CTDIB.cpp
>===================================================================
>--- files/patch-CTDIB.cpp	(nonexistent)
>+++ files/patch-CTDIB.cpp	(working copy)
>@@ -0,0 +1,36 @@
>+--- 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()) {
>
>Property changes on: files/patch-CTDIB.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-c_trans_h
>===================================================================
>--- files/patch-c_trans_h	(nonexistent)
>+++ files/patch-c_trans_h	(working copy)
>@@ -0,0 +1,11 @@
>+--- cuneiform_src/Kern/rblock/../hhh/tigerh/h/c_trans.h.orig	2015-07-08 10:10:03 UTC
>++++ cuneiform_src/Kern/rblock/../hhh/tigerh/h/c_trans.h
>+@@ -64,7 +64,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>+  *                       __WIN32__ - for Win 95/NT                    *
>+  *             __MAC__    - Macintosh                                 *
>+  **********************************************************************/
>+-#ifndef _C_TARNSLATOR_
>++#ifndef _C_TRANSLATOR_
>+   #define _C_TRANSLATOR_
>+ 
>+  ////////////////////////////////////////////////////////////////////////
>
>Property changes on: files/patch-c_trans_h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-clu_test.c
>===================================================================
>--- files/patch-clu_test.c	(nonexistent)
>+++ files/patch-clu_test.c	(working copy)
>@@ -0,0 +1,31 @@
>+--- 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;
>
>Property changes on: files/patch-clu_test.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-cor_spel_c
>===================================================================
>--- files/patch-cor_spel_c	(nonexistent)
>+++ files/patch-cor_spel_c	(working copy)
>@@ -0,0 +1,11 @@
>+--- cuneiform_src/Kern/rpstr/src/cor_spel.c.orig	2015-07-08 12:30:44 UTC
>++++ cuneiform_src/Kern/rpstr/src/cor_spel.c
>+@@ -2312,7 +2312,7 @@ static int rpstr_case_notequal( uchar *i
>+ ///////////
>+ // ïðîâåðèòü àëüòåðíàòèâû
>+ // ñ êåì ïóòàþòñÿ áóêâû
>+-static uchar *twinAlts[256]={
>++static char *twinAlts[256]={
>+ 	"","","","","","","","","","","","","","","","",
>+     "","","","","","","","","","","","","","","","",
>+ 	"","","","","","","","","","","","","","","","", //32-47
>
>Property changes on: files/patch-cor_spel_c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-cuneiform-cli-cpp
>===================================================================
>--- files/patch-cuneiform-cli-cpp	(nonexistent)
>+++ files/patch-cuneiform-cli-cpp	(working copy)
>@@ -0,0 +1,24 @@
>+--- 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
>+ 
>
>Property changes on: files/patch-cuneiform-cli-cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-cuneiform__src_Kern_rimage_sources_main_cricontrol.cpp
>===================================================================
>--- files/patch-cuneiform__src_Kern_rimage_sources_main_cricontrol.cpp	(revision 416515)
>+++ files/patch-cuneiform__src_Kern_rimage_sources_main_cricontrol.cpp	(working copy)
>@@ -1,13 +1,14 @@
>---- cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp.orig	2011-04-19 12:49:57 UTC
>+--- cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp.orig	2016-06-10 11:35:51 UTC
> +++ cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp
>-@@ -594,8 +594,8 @@ Bool32 CRIControl::CreateDestinatonDIB(u
>+@@ -594,8 +594,9 @@ 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());
>++       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) )
>Index: files/patch-debug_cpp
>===================================================================
>--- files/patch-debug_cpp	(nonexistent)
>+++ files/patch-debug_cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- cuneiform_src/Kern/puma/c/debug.cpp.orig	2016-06-07 15:17:15 UTC
>++++ cuneiform_src/Kern/puma/c/debug.cpp
>+@@ -70,7 +70,7 @@ void InitDebug()
>+ LDPUMA_RegistryHelp(hDebugRoot,
>+ "<ÐÑÐ²ÐµÑÑÑÐ²ÐµÐ½Ð½ÑÐ¹: Ð.Ð¥Ð»ÐµÐ±ÑÑÐ¸Ð½> Ð Ð¿ÐµÑÐµÐ¼ÐµÐ½Ð½ÑÑ ÑÑÐ¾Ð¹ Ð²ÐµÑÑÐ¸Ð½Ñ \
>+ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐµÐºÑÑÐ¸Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² ÑÐ°ÑÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°Ð½Ð¸Ñ Ð¸ Ð¾ÑÐ»Ð°Ð´ÐºÐ¸. "
>+-                ,NULL);
>++                ,0);
>+         LDPUMA_RegVariable(NULL,"Ð¯Ð·ÑÐº ÑÐ°ÑÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°Ð½Ð¸Ñ.",&gnLanguage,"unsigned");
>+         LDPUMA_RegVariable(NULL,"ÐÐ´Ð½Ð° ÐºÐ¾Ð»Ð¾Ð½ÐºÐ°.",&gbOneColumn,"unsigned");
>+         LDPUMA_RegVariable(NULL,"Ð¡Ð»Ð¾Ð²Ð°ÑÐ½ÑÐ¹ ÐºÐ¾Ð½ÑÑÐ¾Ð»Ñ.",&gbSpeller,"unsigned");
>
>Property changes on: files/patch-debug_cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-distance_c
>===================================================================
>--- files/patch-distance_c	(nonexistent)
>+++ files/patch-distance_c	(working copy)
>@@ -0,0 +1,20 @@
>+--- 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) ;
>
>Property changes on: files/patch-distance_c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-dll_cpp
>===================================================================
>--- files/patch-dll_cpp	(nonexistent)
>+++ files/patch-dll_cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- cuneiform_src/Kern/puma/main/dll.cpp.orig	2015-07-08 10:23:16 UTC
>++++ cuneiform_src/Kern/puma/main/dll.cpp
>+@@ -95,7 +95,7 @@ uint32_t ul_reason_for_call,
>+     case DLL_PROCESS_ATTACH:
>+ 		ghInst = hModule;
>+ 		GetModuleFileName(hModule,szPath,sizeof(szPath));
>+-		if(p = strstr(_strupr(szPath),"CUNEIFORM.DLL"))
>++		if(p == strstr(_strupr(szPath),"CUNEIFORM.DLL"))
>+ 			*(p-1)=0;
>+ 		else
>+ 		{
>
>Property changes on: files/patch-dll_cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-embbox_c
>===================================================================
>--- files/patch-embbox_c	(nonexistent)
>+++ files/patch-embbox_c	(working copy)
>@@ -0,0 +1,20 @@
>+--- 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;
>
>Property changes on: files/patch-embbox_c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-linutil_c
>===================================================================
>--- files/patch-linutil_c	(nonexistent)
>+++ files/patch-linutil_c	(working copy)
>@@ -0,0 +1,42 @@
>+--- 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);
>
>Property changes on: files/patch-linutil_c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-ltremove_c
>===================================================================
>--- files/patch-ltremove_c	(nonexistent)
>+++ files/patch-ltremove_c	(working copy)
>@@ -0,0 +1,56 @@
>+--- 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))
>+ 
>+              &&
>+ 
>
>Property changes on: files/patch-ltremove_c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-ltroots_c
>===================================================================
>--- files/patch-ltroots_c	(nonexistent)
>+++ files/patch-ltroots_c	(working copy)
>@@ -0,0 +1,107 @@
>+--- 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
>
>Property changes on: files/patch-ltroots_c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-out_cpp
>===================================================================
>--- files/patch-out_cpp	(nonexistent)
>+++ files/patch-out_cpp	(working copy)
>@@ -0,0 +1,31 @@
>+--- 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());
>
>Property changes on: files/patch-out_cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-sestring_c
>===================================================================
>--- files/patch-sestring_c	(nonexistent)
>+++ files/patch-sestring_c	(working copy)
>@@ -0,0 +1,24 @@
>+--- 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;
>+             }
>
>Property changes on: files/patch-sestring_c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-stdprt_cpp
>===================================================================
>--- files/patch-stdprt_cpp	(nonexistent)
>+++ files/patch-stdprt_cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- cuneiform_src/Kern/std/src/stdprt.cpp.orig	2015-07-09 14:11:21 UTC
>++++ cuneiform_src/Kern/std/src/stdprt.cpp
>+@@ -57,7 +57,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>+ #include "_prt.h"
>+ #include "internal.h"
>+ #pragma hdrstop
>+-
>++#pragma GCC diagnostic ignored "-Wwrite-strings"
>+ 
>+ 
>+ 
>
>Property changes on: files/patch-stdprt_cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-stdprt_h
>===================================================================
>--- files/patch-stdprt_h	(nonexistent)
>+++ files/patch-stdprt_h	(working copy)
>@@ -0,0 +1,11 @@
>+--- cuneiform_src/Kern/hrkint/stdprt.h.orig	2015-07-08 11:24:29 UTC
>++++ cuneiform_src/Kern/hrkint/stdprt.h
>+@@ -58,6 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>+ #define __STDPRT_H
>+ 
>+ #include "std.h"
>++#include <cstdarg>
>+ 
>+ typedef int32_t HEvent32;
>+ typedef struct tagStdPrtEvent
>+
>
>Property changes on: files/patch-stdprt_h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch__snp_c
>===================================================================
>--- files/patch__snp_c	(nonexistent)
>+++ files/patch__snp_c	(working copy)
>@@ -0,0 +1,11 @@
>+--- cuneiform-linux-1.1.0/cuneiform_src/Kern/hdebug/__snp.c.orig	2015-07-09 11:59:03 UTC
>++++ cuneiform-linux-1.1.0/cuneiform_src/Kern/hdebug/__snp.c
>+@@ -156,7 +156,7 @@ extern "C" {
>+ 	static Handle hWriteFile = NULL;
>+ 	//////////////////////////////////////////////
>+ 	static int __DPUMA__AllocHook__( int allocType, void *userData, size_t size, int blockType,
>+-			long requestNumber, const unsigned char *filename, int lineNumber)
>++			long requestNumber, const char *filename, int lineNumber)
>+ 	{
>+ 		uint32_t prevSize = 0;
>+ 		int rc = PrevAllocHook(allocType,userData,size,blockType,
>
>Property changes on: files/patch__snp_c
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:executable
>## -0,0 +1 ##
>+*
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 201424: 161087 | 161088 | 161574 | 162064 | 162185 | 162187 | 162197 | 162198 | 165398 | 165399 | 165406 | 171156 | 171263