[fyba] 05/06: Refresh patches.
Bas Couwenberg
sebastic at debian.org
Sun Aug 28 16:58:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository fyba.
commit 01771aa9826e1b581a7040a9c591eed640eac2db
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Aug 28 18:35:35 2016 +0200
Refresh patches.
---
debian/patches/01_noexit_in_library.patch | 30 ++----
debian/patches/02_fix_linking.patch | 18 ++--
debian/patches/fix_issue.patch | 168 +++++++++++++-----------------
3 files changed, 89 insertions(+), 127 deletions(-)
diff --git a/debian/patches/01_noexit_in_library.patch b/debian/patches/01_noexit_in_library.patch
index e2e2b6d..3f6fd4e 100644
--- a/debian/patches/01_noexit_in_library.patch
+++ b/debian/patches/01_noexit_in_library.patch
@@ -2,10 +2,8 @@ Description: This fixes the shlib-calls-exit lintian. Every
exit()-call is replaced with an error message and return.
Forwarded: will do
Author: Ruben Undheim <ruben.undheim at gmail.com>
-Index: fyba/src/FYBA/FYLB.cpp
-===================================================================
---- fyba.orig/src/FYBA/FYLB.cpp
-+++ fyba/src/FYBA/FYLB.cpp
+--- a/src/FYBA/FYLB.cpp
++++ b/src/FYBA/FYLB.cpp
@@ -3280,7 +3280,8 @@ short LB_RGru(LC_FILADM *pFil,UT_INT64 s
UT_SNPRINTF(err().tx,LC_ERR_LEN," \"%s %s\"",LN_GetNavn(&(pAktFil->SosiNavn),
pLb->cur_navn[pLb->cur_niv-1]),pLb->pp);
@@ -36,10 +34,8 @@ Index: fyba/src/FYBA/FYLB.cpp
}
/* Nullstill pekere */
-Index: fyba/src/FYBA/FYLI.cpp
-===================================================================
---- fyba.orig/src/FYBA/FYLI.cpp
-+++ fyba/src/FYBA/FYLI.cpp
+--- a/src/FYBA/FYLI.cpp
++++ b/src/FYBA/FYLI.cpp
@@ -151,7 +151,8 @@ short LI_OpenInit(LC_FILADM *pFil)
if (fil[strlen(fil)-1] == ' ')
{
@@ -265,10 +261,8 @@ Index: fyba/src/FYBA/FYLI.cpp
}
pFil->pBase->n64FilPosRb = _ftelli64(pF);
-Index: fyba/src/FYBA/FYLO.cpp
-===================================================================
---- fyba.orig/src/FYBA/FYLO.cpp
-+++ fyba/src/FYBA/FYLO.cpp
+--- a/src/FYBA/FYLO.cpp
++++ b/src/FYBA/FYLO.cpp
@@ -757,11 +757,13 @@ SK_EntPnt_FYBA LC_BASEADM * LC_OpenBase(
*/
if (fyba_initiert != 1){
@@ -329,10 +323,8 @@ Index: fyba/src/FYBA/FYLO.cpp
}
avbrutt = LC_Cancel(); /* <ESC> avbryter lesing */
-Index: fyba/src/FYBA/Fyba_Callback.cpp
-===================================================================
---- fyba.orig/src/FYBA/Fyba_Callback.cpp
-+++ fyba/src/FYBA/Fyba_Callback.cpp
+--- a/src/FYBA/Fyba_Callback.cpp
++++ b/src/FYBA/Fyba_Callback.cpp
@@ -102,7 +102,8 @@ void LC_ErrorHandler (short feil_nr, con
case 4:
printf("\aTrykk [Enter] for � avbryte programmet:");
@@ -343,10 +335,8 @@ Index: fyba/src/FYBA/Fyba_Callback.cpp
break;
}
}
-Index: fyba/src/FYBA/fyln.cpp
-===================================================================
---- fyba.orig/src/FYBA/fyln.cpp
-+++ fyba/src/FYBA/fyln.cpp
+--- a/src/FYBA/fyln.cpp
++++ b/src/FYBA/fyln.cpp
@@ -448,7 +448,8 @@ short LN_PakkNavn (LC_NAVNETABELL * pLn,
UT_FPRINTF(stderr,"%s\n",LN_VisNavn(pLn,nr));
}
diff --git a/debian/patches/02_fix_linking.patch b/debian/patches/02_fix_linking.patch
index f501415..3c0391b 100644
--- a/debian/patches/02_fix_linking.patch
+++ b/debian/patches/02_fix_linking.patch
@@ -1,10 +1,8 @@
Description: This call makes libfyba link with libfyut and libfygm.
Forwarded: will do
Author: Ruben Undheim <ruben.undheim at gmail.com>
-Index: fyba/Makefile.am
-===================================================================
---- fyba.orig/Makefile.am
-+++ fyba/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
@@ -1,6 +1,6 @@
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = foreign
@@ -13,10 +11,8 @@ Index: fyba/Makefile.am
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = fyba.pc
-Index: fyba/src/FYBA/Makefile.am
-===================================================================
---- fyba.orig/src/FYBA/Makefile.am
-+++ fyba/src/FYBA/Makefile.am
+--- a/src/FYBA/Makefile.am
++++ b/src/FYBA/Makefile.am
@@ -4,6 +4,8 @@ ACLOCAL_AMFLAGS = -I m5
lib_LTLIBRARIES = libfyba.la
libfyba_la_SOURCES = fyba.h Fyba_Callback.cpp FYBA_DLL.cpp FYHO.cpp FYLD.cpp FYLH.cpp fyln.cpp FYLP.cpp FYLS.cpp FYLX.cpp stdafx.cpp FYBA.cpp Fyba_melding.cpp FYLB.cpp FYLE.cpp FYLI.cpp FYLO.cpp FYLR.cpp FYLU.cpp FYTA.cpp fyba.h fyba_strings.h fybax.h stdafx.h
@@ -26,10 +22,8 @@ Index: fyba/src/FYBA/Makefile.am
library_includedir=$(includedir)/fyba
library_include_HEADERS = fyba.h
-Index: fyba/src/GM/Makefile.am
-===================================================================
---- fyba.orig/src/GM/Makefile.am
-+++ fyba/src/GM/Makefile.am
+--- a/src/GM/Makefile.am
++++ b/src/GM/Makefile.am
@@ -4,6 +4,7 @@ ACLOCAL_AMFLAGS = -I m5
lib_LTLIBRARIES = libfygm.la
libfygm_la_SOURCES = fygm.h GM.cpp stdafx.cpp stdafx.h
diff --git a/debian/patches/fix_issue.patch b/debian/patches/fix_issue.patch
index 40afdd3..3db44f1 100644
--- a/debian/patches/fix_issue.patch
+++ b/debian/patches/fix_issue.patch
@@ -3,10 +3,8 @@ Description: With GCC 6, it's problematic to define the min and max
Author: Ruben Undheim <ruben.undheim at gmail.com>
Last-Update: 2016-08-19
-Index: fyba/src/FYBA/FYLU.cpp
-===================================================================
---- fyba.orig/src/FYBA/FYLU.cpp 2016-08-19 17:47:17.055355770 +0000
-+++ fyba/src/FYBA/FYLU.cpp 2016-08-19 17:47:17.047355770 +0000
+--- a/src/FYBA/FYLU.cpp
++++ b/src/FYBA/FYLU.cpp
@@ -8,12 +8,16 @@
#include <ctype.h>
@@ -25,7 +23,7 @@ Index: fyba/src/FYBA/FYLU.cpp
/* Felles variabler for hele FYBA */
extern LC_SYSTEMADM Sys;
-@@ -1232,7 +1236,7 @@
+@@ -1232,7 +1236,7 @@ static short LU_PiTestLinje(LC_UTVALG_EL
} else if (metode == LC_U_IKKEFLERE) { /* Metode "!FL" */
/* Teller opp antall av dette SOSI-navnet */
@@ -34,7 +32,7 @@ Index: fyba/src/FYBA/FYLU.cpp
tilslag = 0;
while (LC_GetPiVerdi(pUE->sosi,lPnr,&sSett) != NULL) {
-@@ -1831,7 +1835,7 @@
+@@ -1831,7 +1835,7 @@ static short LU_GiTestLinje(LC_UT_ADM *
/* Metode "!FL" */
} else if (metode == LC_U_IKKEFLERE) {
/* Teller opp antall av dette SOSI-navnet */
@@ -43,7 +41,7 @@ Index: fyba/src/FYBA/FYLU.cpp
tilslag = 0;
while ((*apara = LC_GetGP(pUE->sosi,gilin,9999)) != NULL) {
tilslag++;
-@@ -2097,10 +2101,10 @@
+@@ -2097,10 +2101,10 @@ static void LU_JustPara(char *para,short
if (cp != NULL){
if (start != 0){
if (slutt != 0){
@@ -56,10 +54,8 @@ Index: fyba/src/FYBA/FYLU.cpp
cp += (start-1);
}
UT_StrCopy(akt_para,cp,max_len);
-Index: fyba/include/fyut.h
-===================================================================
---- fyba.orig/include/fyut.h 2016-08-19 17:47:17.055355770 +0000
-+++ fyba/include/fyut.h 2016-08-19 17:47:17.047355770 +0000
+--- a/include/fyut.h
++++ b/include/fyut.h
@@ -125,8 +125,8 @@
@@ -71,10 +67,8 @@ Index: fyba/include/fyut.h
-Index: fyba/src/GM/GM.cpp
-===================================================================
---- fyba.orig/src/GM/GM.cpp 2016-08-19 17:47:17.055355770 +0000
-+++ fyba/src/GM/GM.cpp 2016-08-19 17:47:17.047355770 +0000
+--- a/src/GM/GM.cpp
++++ b/src/GM/GM.cpp
@@ -20,8 +20,8 @@
#define GM_ACCY 1.0E-8
@@ -86,7 +80,7 @@ Index: fyba/src/GM/GM.cpp
/*
-@@ -214,10 +214,10 @@
+@@ -214,10 +214,10 @@ SK_EntPnt_GM short GM_wtstPunkt(double P
short sAntSkjaer;
// Sjekk 1: Ligger punktet utenfor omskrevet rektangel - s� ligger det utenfor vinduet
@@ -101,7 +95,7 @@ Index: fyba/src/GM/GM.cpp
if((PktA>dPolyMaxA) || (PktA<dPolyMinA) || (PktN>dPolyMaxN) || (PktN<dPolyMinN))
return 0;
-@@ -276,16 +276,16 @@
+@@ -276,16 +276,16 @@ SK_EntPnt_GM short GM_sver(double ka,dou
unsigned int kryss = 0;
double mini,maxi;
@@ -122,7 +116,7 @@ Index: fyba/src/GM/GM.cpp
/* Sjekk om det er skj�ring */
kryss = (unsigned int)(*sn >= mini && *sn <= maxi);
}
-@@ -335,16 +335,16 @@
+@@ -335,16 +335,16 @@ SK_EntPnt_GM short GM_shor(double ka,dou
unsigned int kryss = 0;
double mini,maxi;
@@ -143,7 +137,7 @@ Index: fyba/src/GM/GM.cpp
/* Sjekk om det er skj�ring */
kryss = (unsigned int)(*sa >= mini && *sa <= maxi);
}
-@@ -401,10 +401,10 @@
+@@ -401,10 +401,10 @@ SK_EntPnt_GM short GM_sLinLin(double ka,
/* Sorterer f�rst ut �penbare tilfeller der det ikke er skj�ring */
@@ -158,7 +152,7 @@ Index: fyba/src/GM/GM.cpp
det = anm * nlk - nnm * alk;
-@@ -429,10 +429,10 @@
+@@ -429,10 +429,10 @@ SK_EntPnt_GM short GM_sLinLin(double ka,
* Sjekker etterp� om skj�ringspunktet ligger p� linjebitene.
*/
if (GM_sVektVekt(ka,kn,la,ln,ma,mn,na,nn,sa,sn)){
@@ -173,7 +167,7 @@ Index: fyba/src/GM/GM.cpp
return 1; /* Skj�ring funnet ==> returnerer */
}
-@@ -486,17 +486,17 @@
+@@ -486,17 +486,17 @@ CD kryss = GM_Overlapp(ka,kn,la,ln,ma,mn
SK_EntPnt_GM short GM_Overlapp(double ka,double kn,double la,double ln,double ma,double mn,double na,double nn)
{
// Sorterer f�rst ut �penbare tilfeller der det ikke er skj�ring
@@ -199,7 +193,7 @@ Index: fyba/src/GM/GM.cpp
{
return 3;
}
-@@ -594,10 +594,10 @@
+@@ -594,10 +594,10 @@ SK_EntPnt_GM short GM_sVektVekt(double k
/* Sorterer f�rst ut �penbare tilfeller der det ikke er skj�ring */
@@ -214,7 +208,7 @@ Index: fyba/src/GM/GM.cpp
det = anm * nlk - nnm * alk;
-@@ -679,10 +679,10 @@
+@@ -679,10 +679,10 @@ SK_EntPnt_GM short GM_sLinBue(double sa,
/* Sjekk om punktene ligger p� linjen */
if (kryss > 0){
@@ -229,7 +223,7 @@ Index: fyba/src/GM/GM.cpp
if (kryss == 2){
if (! (*a2 <= maxa && *a2 >= mina &&
-@@ -1025,8 +1025,8 @@
+@@ -1025,8 +1025,8 @@ SK_EntPnt_GM short GM_fotp(double a1,dou
}
/* Sjekk at fotpunktet er p� linjen */
@@ -240,7 +234,7 @@ Index: fyba/src/GM/GM.cpp
beregnet = 2;
} else {
beregnet = 1;
-@@ -1038,8 +1038,8 @@
+@@ -1038,8 +1038,8 @@ SK_EntPnt_GM short GM_fotp(double a1,dou
*nf = n1;
/* Sjekk at fotpunktet er p� linjen */
@@ -251,7 +245,7 @@ Index: fyba/src/GM/GM.cpp
beregnet = 2;
} else {
beregnet = 1;
-@@ -1073,10 +1073,10 @@
+@@ -1073,10 +1073,10 @@ SK_EntPnt_GM short GM_fotp(double a1,dou
*/
/* Sjekk at fotpunktet er p� linjen */
@@ -266,7 +260,7 @@ Index: fyba/src/GM/GM.cpp
beregnet = 2; /* P� linjen */
} else {
beregnet = 1; /* Utenfor linjen */
-@@ -1186,7 +1186,7 @@
+@@ -1186,7 +1186,7 @@ SK_EntPnt_GM short GM_fotp_ny(double a1,
}
/* Sjekk at fotpunktet er p� linjen */
@@ -275,7 +269,7 @@ Index: fyba/src/GM/GM.cpp
beregnet = 2;
} else {
beregnet = 1;
-@@ -1198,7 +1198,7 @@
+@@ -1198,7 +1198,7 @@ SK_EntPnt_GM short GM_fotp_ny(double a1,
*nf = n1;
/* Sjekk at fotpunktet er p� linjen */
@@ -284,7 +278,7 @@ Index: fyba/src/GM/GM.cpp
beregnet = 2;
} else {
beregnet = 1;
-@@ -1212,12 +1212,12 @@
+@@ -1212,12 +1212,12 @@ SK_EntPnt_GM short GM_fotp_ny(double a1,
// Forslag til ny metode for fotpunktberegning. Endrer ikke de opprinnelige punktene,
// og det blir da mulig � gi korrekt tilbakemelding om punktet ligger inne p� den gitte linjen.
retning = GM_RetnGon(a1,n1,a2,n2);
@@ -300,7 +294,7 @@ Index: fyba/src/GM/GM.cpp
beregnet = 2; /* P� linjen */
} else {
beregnet = 1; /* Utenfor linjen */
-@@ -1658,8 +1658,8 @@
+@@ -1658,8 +1658,8 @@ SK_EntPnt_GM short GM_bepa(double a1, do
if(atmp > ACCY || ntmp > ACCY) {
@@ -311,7 +305,7 @@ Index: fyba/src/GM/GM.cpp
div = dmn / dmx;
rinv = 1.0 / (dmx * sqrt(1.0+div*div));
-@@ -2035,10 +2035,10 @@
+@@ -2035,10 +2035,10 @@ SK_EntPnt_GM void GM_buebox(double as,do
a2 = as + r*cos(fi+dfi);
n2 = ns + r*sin(fi+dfi);
@@ -326,7 +320,7 @@ Index: fyba/src/GM/GM.cpp
// For hver akse (fra sentrumspunktet) som krysses utvides omskrevet boks
radius = fabs(radius);
-@@ -2103,27 +2103,27 @@
+@@ -2103,27 +2103,27 @@ SK_EntPnt_GM void GM_buebox(double as,do
if (fi >= 0.0 && fi < PI/2.0){
// Slutt i 1. kvadrant
if (r2 >= 0.0 && r2 < PI/2.0){
@@ -364,7 +358,7 @@ Index: fyba/src/GM/GM.cpp
*ohn = ns + r;
}
-@@ -2134,82 +2134,82 @@
+@@ -2134,82 +2134,82 @@ SK_EntPnt_GM void GM_buebox(double as,do
*nva = as - r;
*nvn = ns - r;
*oha = as + r;
@@ -477,10 +471,8 @@ Index: fyba/src/GM/GM.cpp
}
}
}
-Index: fyba/src/UT/fyut.h
-===================================================================
---- fyba.orig/src/UT/fyut.h 2016-08-19 17:47:17.055355770 +0000
-+++ fyba/src/UT/fyut.h 2016-08-19 17:47:17.047355770 +0000
+--- a/src/UT/fyut.h
++++ b/src/UT/fyut.h
@@ -125,8 +125,8 @@
@@ -492,11 +484,9 @@ Index: fyba/src/UT/fyut.h
-Index: fyba/src/FYBA/FYLI.cpp
-===================================================================
---- fyba.orig/src/FYBA/FYLI.cpp 2016-08-19 17:47:17.055355770 +0000
-+++ fyba/src/FYBA/FYLI.cpp 2016-08-19 17:47:17.051355770 +0000
-@@ -1141,8 +1141,8 @@
+--- a/src/FYBA/FYLI.cpp
++++ b/src/FYBA/FYLI.cpp
+@@ -1141,8 +1141,8 @@ CD LC_EraseBt(fra_kol,til_kol);
SK_EntPnt_FYBA void LC_EraseBt(short fra_kol,short til_kol)
{
/* Beregner lovlige kolonner */
@@ -507,7 +497,7 @@ Index: fyba/src/FYBA/FYLI.cpp
LI_EraseBt(fra_kol,til_kol);
}
-@@ -1248,8 +1248,8 @@
+@@ -1248,8 +1248,8 @@ void LI_EraseBt(short fra_kol,short til_
LC_FILADM *pFil;
/* Beregner lovlige omr�der */
@@ -518,7 +508,7 @@ Index: fyba/src/FYBA/FYLI.cpp
maske = 0x0000; /* Lager slettemaske */
for ( ; fra_kol <= til_kol; fra_kol++){
-@@ -1302,8 +1302,8 @@
+@@ -1302,8 +1302,8 @@ SK_EntPnt_FYBA void LC_CopyBt(short fra_
unsigned long ul;
/* Beregner lovlige omr�der */
@@ -529,11 +519,9 @@ Index: fyba/src/FYBA/FYLI.cpp
/* Returner verdi */
maske_fra = 0x00000001UL << fra_kol;
-Index: fyba/src/FYBA/FYLO.cpp
-===================================================================
---- fyba.orig/src/FYBA/FYLO.cpp 2016-08-19 17:47:17.055355770 +0000
-+++ fyba/src/FYBA/FYLO.cpp 2016-08-19 17:49:59.907357517 +0000
-@@ -1598,10 +1598,10 @@
+--- a/src/FYBA/FYLO.cpp
++++ b/src/FYBA/FYLO.cpp
+@@ -1598,10 +1598,10 @@ SK_EntPnt_FYBA void LC_CloseSos(LC_FILAD
if (pFil->usLag & (LC_FRAMGR | LC_BAKGR)) {
/* Filen inneholder data */
if (pFil->pGeoRN != NULL) {
@@ -548,7 +536,7 @@ Index: fyba/src/FYBA/FYLO.cpp
}
}
pFil = pFil->pNesteFil;
-@@ -1789,10 +1789,10 @@
+@@ -1789,10 +1789,10 @@ SK_EntPnt_FYBA short LC_GetBaOm(unsigned
while (LC_NextFil(&pFil,usLag)) {
sAntall++;
if (LC_GetFiOm(pFil,&na,&nn,&oa,&on)) {
@@ -563,7 +551,7 @@ Index: fyba/src/FYBA/FYLO.cpp
}
}
-@@ -2034,10 +2034,10 @@
+@@ -2034,10 +2034,10 @@ static short LO_InklSos(LC_FILADM *pFil,
if (pFil->usLag & (LC_FRAMGR | LC_BAKGR)) {
/* Filen inneholder data */
if (pFil->pGeoRN != NULL) {
@@ -578,11 +566,9 @@ Index: fyba/src/FYBA/FYLO.cpp
}
}
pFil = pFil->pNesteFil;
-Index: fyba/src/FYBA/FYLX.cpp
-===================================================================
---- fyba.orig/src/FYBA/FYLX.cpp 2016-08-19 17:47:17.055355770 +0000
-+++ fyba/src/FYBA/FYLX.cpp 2016-08-19 17:47:17.051355770 +0000
-@@ -2086,7 +2086,7 @@
+--- a/src/FYBA/FYLX.cpp
++++ b/src/FYBA/FYLX.cpp
+@@ -2086,7 +2086,7 @@ SK_EntPnt_FYBA char *LC_GetGP(const char
if (sSlutt != 0 && sSlutt < (short)strlen(rp)) {
*(rp+sSlutt) = '\0';
}
@@ -591,7 +577,7 @@ Index: fyba/src/FYBA/FYLX.cpp
rp += (sStart-1);
}
-@@ -2279,7 +2279,7 @@
+@@ -2279,7 +2279,7 @@ SK_EntPnt_FYBA char *LC_GetPiVerdi(const
/* Hent enhet og formater h�yden */
niv = 2;
LC_GetCurEnhet(Sys.GrId.pFil,&niv,&enhet,&enhet_h,&enhet_d);
@@ -600,7 +586,7 @@ Index: fyba/src/FYBA/FYLX.cpp
UT_SNPRINTF(format,20,"%%.%dlf",sAntDes);
UT_SNPRINTF(retur_str,LC_MAX_SOSI_LINJE_LEN,format,h);
funnet = UT_TRUE;
-@@ -2329,7 +2329,7 @@
+@@ -2329,7 +2329,7 @@ SK_EntPnt_FYBA char *LC_GetPiVerdi(const
if (sSlutt != 0 && sSlutt < (short)strlen(rp)) {
*(rp+sSlutt) = '\0';
}
@@ -609,7 +595,7 @@ Index: fyba/src/FYBA/FYLX.cpp
rp += (sStart-1);
}
-@@ -2600,7 +2600,7 @@
+@@ -2600,7 +2600,7 @@ SK_EntPnt_FYBA short LC_PutGP(const char
if (sSlutt != 0 && sSlutt < (short)strlen(rp)) {
*(rp+sSlutt) = '\0';
}
@@ -618,7 +604,7 @@ Index: fyba/src/FYBA/FYLX.cpp
rp += (sStart-1);
}
-@@ -2783,28 +2783,28 @@
+@@ -2783,28 +2783,28 @@ SK_EntPnt_FYBA void LC_InitPP(char *sosi
UT_StrToken(sosi_navn,0,&itxu,LC_MAX_SOSINAVN_LEN,pp_stat->pinfo_navn); /* SOSI-navnet */
UT_StrUpper(pp_stat->pinfo_navn);
@@ -652,7 +638,7 @@ Index: fyba/src/FYBA/FYLX.cpp
}
}
}
-@@ -2874,7 +2874,7 @@
+@@ -2874,7 +2874,7 @@ SK_EntPnt_FYBA char *LC_GetPP(long *punk
niv = 2;
LC_GetCurEnhet(Sys.GrId.pFil,&niv,&enhet,&enhet_h,&enhet_d);
@@ -661,7 +647,7 @@ Index: fyba/src/FYBA/FYLX.cpp
UT_SNPRINTF(format,20,"%%.%dlf",sAntDes);
UT_SNPRINTF(retur_str,LC_MAX_SOSI_LINJE_LEN,format,h);
-@@ -3001,8 +3001,8 @@
+@@ -3001,8 +3001,8 @@ short LC_FinnKp(long *forste_punkt,long
if (Sys.GrId.lNr != INGEN_GRUPPE){ /* Aktuell gruppe OK */
if(Sys.pGrInfo->info & GI_KP){ /* Gruppen har knutepunkt */
@@ -672,11 +658,9 @@ Index: fyba/src/FYBA/FYLX.cpp
/* Skann gruppen */
for (punkt--; punkt<siste_punkt; ++punkt) {
-Index: fyba/src/FYBA/FYLS.cpp
-===================================================================
---- fyba.orig/src/FYBA/FYLS.cpp 2016-08-19 17:47:17.055355770 +0000
-+++ fyba/src/FYBA/FYLS.cpp 2016-08-19 17:47:17.051355770 +0000
-@@ -207,7 +207,7 @@
+--- a/src/FYBA/FYLS.cpp
++++ b/src/FYBA/FYLS.cpp
+@@ -207,7 +207,7 @@ SK_EntPnt_FYBA long LC_FASn(LC_SNR_ADM *
LC_BGR AktBgr,Bgr;
long lSnr,lGrNr;
long lAntall = 0;
@@ -685,7 +669,7 @@ Index: fyba/src/FYBA/FYLS.cpp
/* LO_TestFilpeker(pSnrAdm->pFil,"LC_FASn"); */
-@@ -269,7 +269,7 @@
+@@ -269,7 +269,7 @@ SK_EntPnt_FYBA short LC_FFSn(LC_SNR_ADM
/* LO_TestFilpeker(pSnrAdm->pFil,"LC_FFSn"); */
LO_TestFilpeker(pSnrAdm->pFil,"FFSn");
@@ -694,7 +678,7 @@ Index: fyba/src/FYBA/FYLS.cpp
/* Sjekker fra starten av s�keomr�det */
for (lSnr=pSnrAdm->lMinSnr; lSnr<=lMaxSnr; lSnr++) {
-@@ -314,7 +314,7 @@
+@@ -314,7 +314,7 @@ SK_EntPnt_FYBA short LC_FFSnBt(LC_SNR_AD
/* LO_TestFilpeker(pSnrAdm->pFil,"LC_FFSnBt"); */
LO_TestFilpeker(pSnrAdm->pFil,"FFSnBt");
@@ -703,7 +687,7 @@ Index: fyba/src/FYBA/FYLS.cpp
/* Sjekker fra starten av s�keomr�det */
for (lSnr=pSnrAdm->lMinSnr; lSnr<=lMaxSnr; lSnr++) {
-@@ -361,7 +361,7 @@
+@@ -361,7 +361,7 @@ SK_EntPnt_FYBA short LC_FNSn(LC_SNR_ADM
/* LO_TestFilpeker(pSnrAdm->pFil,"LC_FNSn"); */
LO_TestFilpeker(pSnrAdm->pFil,"FNSn");
@@ -712,7 +696,7 @@ Index: fyba/src/FYBA/FYLS.cpp
/* Sjekker fra aktuellt serienummer */
for (lSnr=pSnrAdm->lAktSnr+1L; lSnr<=lMaxSnr; lSnr++) {
-@@ -406,7 +406,7 @@
+@@ -406,7 +406,7 @@ SK_EntPnt_FYBA short LC_FNSnBt(LC_SNR_AD
/* LO_TestFilpeker(pSnrAdm->pFil,"LC_FNSnBt"); */
LO_TestFilpeker(pSnrAdm->pFil,"FNSnBt");
@@ -721,7 +705,7 @@ Index: fyba/src/FYBA/FYLS.cpp
/* Sjekker fra aktuellt serienummer */
for (lSnr=pSnrAdm->lAktSnr+1L; lSnr<=lMaxSnr; lSnr++) {
-@@ -540,7 +540,7 @@
+@@ -540,7 +540,7 @@ SK_EntPnt_FYBA short LC_FLSn(LC_SNR_ADM
/* LO_TestFilpeker(pSnrAdm->pFil,"LC_FLSn"); */
LO_TestFilpeker(pSnrAdm->pFil,"FLSn");
@@ -730,7 +714,7 @@ Index: fyba/src/FYBA/FYLS.cpp
/* Sjekker fra slutten av tabellen */
for (; lSnr>=pSnrAdm->lMinSnr; lSnr--) {
-@@ -586,7 +586,7 @@
+@@ -586,7 +586,7 @@ SK_EntPnt_FYBA short LC_FLSnBt(LC_SNR_AD
/* LO_TestFilpeker(pSnrAdm->pFil,"LC_FLSnBt"); */
LO_TestFilpeker(pSnrAdm->pFil,"FLSnBt");
@@ -739,11 +723,9 @@ Index: fyba/src/FYBA/FYLS.cpp
/* Sjekker fra slutten av tabellen */
for (; lSnr>=pSnrAdm->lMinSnr; lSnr--) {
-Index: fyba/src/FYBA/FYLR.cpp
-===================================================================
---- fyba.orig/src/FYBA/FYLR.cpp 2016-08-19 17:47:17.055355770 +0000
-+++ fyba/src/FYBA/FYLR.cpp 2016-08-19 17:47:17.051355770 +0000
-@@ -141,10 +141,10 @@
+--- a/src/FYBA/FYLR.cpp
++++ b/src/FYBA/FYLR.cpp
+@@ -141,10 +141,10 @@ void LR_Indx(void)
// Spesialhandtering av ulogiske sirkler og buer. H�ndteres som KURVE
for (pt=0; pt<Sys.pGrInfo->nko; pt++) {
@@ -758,7 +740,7 @@ Index: fyba/src/FYBA/FYLR.cpp
}
}
-@@ -152,10 +152,10 @@
+@@ -152,10 +152,10 @@ void LR_Indx(void)
} else {
/* Omskreven firkant */
for (pt=0; pt<Sys.pGrInfo->nko; pt++) {
@@ -773,7 +755,7 @@ Index: fyba/src/FYBA/FYLR.cpp
}
}
-@@ -412,10 +412,10 @@
+@@ -412,10 +412,10 @@ void LR_IndxFlate(void)
for (s=0; s<ant_ref; s++) {
pRL = LI_GetGeo(pFi,ref_arr[s]);
if (pRL != NULL) {
@@ -788,7 +770,7 @@ Index: fyba/src/FYBA/FYLR.cpp
}
}
-@@ -1857,10 +1857,10 @@
+@@ -1857,10 +1857,10 @@ CD =====================================
*/
static void LR_R_BoksSum(LC_BOKS * pB1,LC_BOKS * pB2)
{
@@ -803,7 +785,7 @@ Index: fyba/src/FYBA/FYLR.cpp
}
-@@ -1886,8 +1886,8 @@
+@@ -1886,8 +1886,8 @@ static double LR_BoksDeltaArealSum(LC_BO
//lGml = (pB1->dMaxAust - pB1->dMinAust) * (pB1->dMaxNord - pB1->dMinNord);
//return (lNy - lGml);
@@ -814,11 +796,9 @@ Index: fyba/src/FYBA/FYLR.cpp
return dDeltaAreal;
}
-Index: fyba/src/FYBA/FYLB.cpp
-===================================================================
---- fyba.orig/src/FYBA/FYLB.cpp 2016-08-19 17:46:35.887355329 +0000
-+++ fyba/src/FYBA/FYLB.cpp 2016-08-19 17:47:40.359356020 +0000
-@@ -710,8 +710,8 @@
+--- a/src/FYBA/FYLB.cpp
++++ b/src/FYBA/FYLB.cpp
+@@ -710,8 +710,8 @@ SK_EntPnt_FYBA void LC_WsGrPart(LC_FILAD
/* OK ==> Skriv */
} else{
/* Sjekker at punktnummer er lovlig */
@@ -829,7 +809,7 @@ Index: fyba/src/FYBA/FYLB.cpp
/* Skriver */
LB_WGru(SKRIV_SISTE,fra_punkt,antall,pFil,pFil->n64AktPos,&neste);
-@@ -2738,7 +2738,7 @@
+@@ -2738,7 +2738,7 @@ CD LB_FormaterEnhet(streng,sStrengMaxLen
char *LB_FormaterEnhet(char *streng,short sStrengMaxLen,char *SosiNavn,double enhet)
{
char enhet_buffer[20],*cp;
@@ -838,7 +818,7 @@ Index: fyba/src/FYBA/FYLB.cpp
UT_StrCopy(streng,SosiNavn,sStrengMaxLen);
UT_StrCat(streng," ",sStrengMaxLen);
-@@ -3014,11 +3014,11 @@
+@@ -3014,11 +3014,11 @@ SK_EntPnt_FYBA short LC_DelGiL(short lin
if (antall > 0) {
Sys.sGrEndra = (short)END_ENDRA;
@@ -852,7 +832,7 @@ Index: fyba/src/FYBA/FYLB.cpp
if (start+antall <= Sys.pGrInfo->ngi) {
/* Beregn forflytting */
-@@ -3116,11 +3116,11 @@
+@@ -3116,11 +3116,11 @@ SK_EntPnt_FYBA long LC_DelKoL(long linje
Sys.sGrEndra = (short)END_ENDRA;
if (linje <= Sys.lPibufPnr) Sys.sPibufStatus = LC_PIBUF_TOM;
@@ -866,11 +846,9 @@ Index: fyba/src/FYBA/FYLB.cpp
/* UT_FPRINTF(stderr," %hd - %hd\n",start,antall); */
-Index: fyba/src/UT/UT3.cpp
-===================================================================
---- fyba.orig/src/UT/UT3.cpp 2016-08-19 17:23:20.471340362 +0000
-+++ fyba/src/UT/UT3.cpp 2016-08-19 17:50:33.567357878 +0000
-@@ -68,7 +68,7 @@
+--- a/src/UT/UT3.cpp
++++ b/src/UT/UT3.cpp
+@@ -68,7 +68,7 @@ SK_EntPnt_UT void UT_Pause (short dur)
UT_InqTime (tid);
t1 = 100*tid[2] + tid[3];
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/fyba.git
More information about the Pkg-grass-devel
mailing list