SOURCES: kdenetwork-branch.diff - updated

arekm arekm at pld-linux.org
Wed Oct 11 11:49:52 CEST 2006 

Author: arekm                        Date: Wed Oct 11 09:49:52 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   kdenetwork-branch.diff (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SOURCES/kdenetwork-branch.diff
diff -u SOURCES/kdenetwork-branch.diff:1.12 SOURCES/kdenetwork-branch.diff:1.13
--- SOURCES/kdenetwork-branch.diff:1.12	Thu Sep  7 17:28:52 2006
+++ SOURCES/kdenetwork-branch.diff	Wed Oct 11 11:49:47 2006
@@ -1,145322 +1,864 @@
-Index: kpf/kpfpropertiesdialogplugin.desktop
+Index: krfb/kinetd/eventsrc
 ===================================================================
---- kpf/kpfpropertiesdialogplugin.desktop	(.../tags/KDE/3.5.4/kdenetwork)	(revision 581799)
-+++ kpf/kpfpropertiesdialogplugin.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 581799)
-@@ -16,6 +16,7 @@
- Name[fi]=KPF-hakemiston ominaisuussivu
- Name[fr]=Page des propriĂŠtĂŠs d'un dossier KPF
- Name[gl]=PĂĄxina coas propiedades do directorio KPF
-+Name[he]=דף מאפייני ץפריה ׊ל KPF
- Name[hu]=KPF kÜnyvtårjellemzők-adatlap
- Name[is]=KPF mĂśppustillingasĂ­Ă°a
- Name[it]=Pagina proprietĂ  directory KPF
-Index: kpf/kpfapplet.desktop
+--- krfb/kinetd/eventsrc	(.../tags/KDE/3.5.5/kdenetwork)	(revision 594431)
++++ krfb/kinetd/eventsrc	(.../branches/KDE/3.5/kdenetwork)	(revision 594431)
+@@ -80,7 +80,7 @@
+ Comment[es]=Recibida conexiĂłn entrante
+ Comment[et]=Saadi sissetulev Ăźhendus
+ Comment[eu]=Konexio bat jaso da
+-Comment[fa]=اتؾال ŮˆŘ§ŘąŘŻ شده ŘŻŘąŰŒŘ§ŮŘŞ Ř´ŘŻâ€Œ
++Comment[fa]=اتؾال ŮˆŘ§ŘąŘŻŘ´ŘŻŮ‡ ŘŻŘąŰŒŘ§ŮŘŞ Ř´ŘŻâ€Œ
+ Comment[fi]=Vastaanotettiin saapuva yhteys
+ Comment[fr]=Reçu une connexion entrante
+ Comment[gl]=RecibĂ­use unha conexiĂłn entrante
+Index: lanbrowsing/kcmlisa/kcmkiolan.desktop
 ===================================================================
---- kpf/kpfapplet.desktop	(.../tags/KDE/3.5.4/kdenetwork)	(revision 581799)
-+++ kpf/kpfapplet.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 581799)
-@@ -78,6 +78,7 @@
- Comment[eu]=Sarean zehar fitxtegiak partekatzea errazten duen web-zerbitzari txiki bat
- Comment[fr]=Un petit serveur web permettant de partager facilement des fichiers sur le rĂŠseau
- Comment[gl]=Un pequeno servidor web que fai doada a comparticiĂłn de ficheiros por rede
-+Comment[he]=׊רת אינטרנט קטן ׊גורם ×œ×Ş×˘×‘×•×¨×Ş ×§×‘×Ś×™× בר׊ת ×œ×”×™×•×Ş קלה
- Comment[hu]=Mini webkiszolgĂĄlĂł egyszerĹą fĂĄjlmegosztĂĄshoz
- Comment[is]=LĂ­till vefĂžjĂłnn sem auĂ°veldar deilingu af skrĂĄm yfir netiĂ°
- Comment[it]=Un piccolo server web che permette di condividere dei file attraverso la rete in modo semplice
-@@ -92,7 +93,7 @@
- Comment[pt]=Um pequeno servidor Web que torna simples a partilha de ficheiros na rede
- Comment[pt_BR]=Um pequeno servidor web que facilita o compartilhamento de arquivos na rede
- Comment[ru]=ĐĐľĐąĐžĐťŃŒŃˆĐžĐš вой-сорвор, ОйНогчающиК ОйщиК Đ´ĐžŃŃ‚ŃƒĐż Đş фаКНаП пО соти
--Comment[sk]=Malý web server, ktorý robí zdielanie súborov v sieti jednoduchým
-+Comment[sk]=Malý web server, ktorý robí zdieĞanie súborov v sieti jednoduchým
- Comment[sl]=Majhen spletni streĹžnik, ki poenostavi deljenje datotek prek omreĹžja
- Comment[sr]=ĐœĐ°ĐťĐ¸ вой сорвор ĐşĐžŃ˜Đ¸ дољоњо Ń„Đ°Ń˜ĐťĐžĐ˛Đ° прокО ПроМо чини НакиП
- Comment[sr at Latn]=Mali veb server koji deljenje fajlova preko mreže čini lakim
-Index: krdc/krdc.desktop
-===================================================================
---- krdc/krdc.desktop	(.../tags/KDE/3.5.4/kdenetwork)	(revision 581799)
-+++ krdc/krdc.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 581799)
-@@ -23,6 +23,7 @@
- GenericName[fr]=Connexion Ă  un bureau distant
- GenericName[ga]=Nasc Deisce Cianda
- GenericName[gl]=ConexiĂłn Remota de Escritorio
-+GenericName[he]=חיבור ל׊ולחן עבודה מרוחק
- GenericName[hu]=TĂĄvoli munkaasztal elĂŠrĂŠse
- GenericName[is]=Tengingar viĂ° fjarlĂŚg skjĂĄborĂ°
- GenericName[it]=Connessione a desktop remoto
-Index: krdc/vidmode.cpp
-===================================================================
---- krdc/vidmode.cpp	(.../tags/KDE/3.5.4/kdenetwork)	(revision 581799)
-+++ krdc/vidmode.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 581799)
-@@ -38,7 +38,9 @@
- 	if (!XF86VidModeQueryExtension(dpy, &eventB, &errorB))
- 		return;
- 
--	XF86VidModeGetAllModeLines(dpy,oldResolution.screen,&modecount, &modes);
-+	if (!XF86VidModeGetAllModeLines(dpy, oldResolution.screen, &modecount, &modes))
-+		return;
-+
- 	for (int i = 0; i < modecount; i++) {
- 		int w = (*modes[i]).hdisplay;
- 		int h = (*modes[i]).vdisplay;
-@@ -69,7 +71,9 @@
- 	if (!XF86VidModeQueryExtension(dpy, &eventB, &errorB))
- 		return Resolution();
- 
--	XF86VidModeGetAllModeLines(dpy,screen,&modecount, &modes);
-+	if (!XF86VidModeGetAllModeLines(dpy,screen,&modecount, &modes))
-+		return Resolution();
-+
- 	int cw = (*modes[0]).hdisplay;
- 	int ch = (*modes[0]).vdisplay;
- 	nx = cw;
-Index: krdc/krdc.cpp
-===================================================================
---- krdc/krdc.cpp	(.../tags/KDE/3.5.4/kdenetwork)	(revision 581799)
-+++ krdc/krdc.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 581799)
-@@ -732,7 +732,7 @@
- 
- 	switch (m_isFullscreen) {
- 	case WINDOW_MODE_AUTO:
--		if ((w >= dw) || (h >= dh))
-+		if ((w > dw) || (h > dh))
- 			switchToFullscreen(m_windowScaling);
- 		else
- 			switchToNormal(m_windowScaling);
-Index: krfb/krfb/xupdatescanner.cc
-===================================================================
---- krfb/krfb/xupdatescanner.cc	(.../tags/KDE/3.5.4/kdenetwork)	(revision 581799)
-+++ krfb/krfb/xupdatescanner.cc	(.../branches/KDE/3.5/kdenetwork)	(revision 581799)
-@@ -140,7 +140,7 @@
- 	tilesX = (width + tileWidth - 1) / tileWidth;
- 	tilesY = (height + tileHeight - 1) / tileHeight;
- 	tileMap = new bool[tilesX * tilesY];
--        tileRegionMap = new struct TileChangeRegion[tilesX * tilesY];
-+	tileRegionMap = new struct TileChangeRegion[tilesX * tilesY];
- 
- 	unsigned int i;
- 	for (i = 0; i < tilesX * tilesY; i++)
-@@ -203,8 +203,8 @@
- 		XDestroyImage(scanline);
- 		XDestroyImage(tile);
- 	}
--	delete tileMap;
--        delete tileRegionMap;
-+	delete [] tileMap;
-+	delete [] tileRegionMap;
- }
- 
- 
-Index: krfb/krfb/eventsrc
-===================================================================
---- krfb/krfb/eventsrc	(.../tags/KDE/3.5.4/kdenetwork)	(revision 581799)
-+++ krfb/krfb/eventsrc	(.../branches/KDE/3.5/kdenetwork)	(revision 581799)
-@@ -626,7 +626,7 @@
- Comment[hu]=A meghĂ­vott fĂŠl ĂŠrvĂŠnytelen jelszĂłt kĂźldĂśtt. A csatlakozĂĄs nem sikerĂźlt.
- Comment[is]=BoĂ°inn aĂ°ili sendi Ăłgilt lykilorĂ°. Tengingu hafnaĂ°
- Comment[it]=La parte invitata ha inviato una password non valida. Connessione rifiutata.
--Comment[ja]=ć‹›ĺž
ă•ă‚ŒăŸäşşăŒä¸ć­ŁăŞăƒ‘ă‚šăƒŻăƒźăƒ‰ă‚’é€ăŁăŚăăžă—ăŸă€‚ćŽĽçśšăŻć‹’ĺŚă•ă‚Œăžă—ăŸă€‚
-+Comment[ja]=ć‹›ĺž
ă•ă‚ŒăŸäşşăŒä¸ć­ŁăŞăƒ‘ă‚šăƒŻăƒźăƒ‰ă‚’é€ăŁăŚăăžă—ăŸă€‚ćŽĽçśšă‚’ć‹’ĺŚă—ăžă—ăŸă€‚
- Comment[km]=áž—ážśáž‚áž¸â€‹ážŠáŸ‚áž›â€‹áž”ážśáž“â€‹áž˘áž‰áŸ’áž‡ážžáž‰ áž”ážśáž“â€‹áž•áŸ’áž‰ážžâ€‹áž–ážśáž€áŸ’áž™â€‹ážŸáž˜áŸ’áž„ážśážáŸ‹â€‹áž˜ážˇáž“â€‹ážáŸ’ážšážšáž˜ážáŸ’ážšážźážœÂ áŸ” áž€ážśážšâ€‹ážáž—áŸ’áž‡ážśáž”áŸ‹â€‹ážáŸ’ážšážźážœâ€‹áž”ážśáž“â€‹áž”ážŠážˇážŸáŸáž’Â áŸ”
- Comment[lt]=Pakviestoji pusÄ— atsiuntÄ— neteisingÄ
 slaptaĹžodÄŻ. RyĹĄys nutrauktas.
- Comment[mk]=ĐŸĐžĐşĐ°Đ˝ĐľŃ‚Đ°Ń‚Đ° страна испрати новаНидна НОСинка. ĐŸĐžĐ˛Ń€ĐˇŃƒĐ˛Đ°ŃšĐľŃ‚Đž Đľ ОдйионО.
-@@ -685,7 +685,7 @@
- Name[hu]=ĂšjKapcsolatTartva
- Name[is]=NýTengingÁBið
- Name[it]=Nuova connessione da tenere
--Name[ja]=çś­ćŒä¸­ăŽć–°čŚćŽĽçśš
-+Name[ja]=äżç•™ä¸­ăŽć–°čŚćŽĽçśš
- Name[km]=áž€ážśážšâ€‹ážâ€‹áž—áŸ’áž‡ážśáž”áŸ‹â€‹ážáŸ’áž˜áž¸ áž€áŸ†áž–ážťáž„â€‹ážŸáŸ’ážážˇážâ€‹áž“áŸ
â€‹áž€áŸ’áž“ážťáž„â€‹áž€ážśážšâ€‹ážšáž„áŸ‹â€‹áž
ážśáŸ†
- Name[lt]=Naujas kvietimas ryĹĄiui sulaikytas
- Name[mk]=Нова врска на чокањо
-@@ -743,7 +743,7 @@
- Comment[hu]=Csatlakozåsi kÊrÊs, megerősítÊs szßksÊges
- Comment[is]=BeiĂ°ni um tengingu, notandi verĂ°ur aĂ° samĂžykkja
- Comment[it]=Connessione richiesta, l'utente deve accettare
--Comment[ja]=ćŽĽçśšăŒčŚćą‚ă•ă‚ŒăŚă„ăžă™ă€‚ăƒŚăƒźă‚śăŻĺ—ă‘ĺ
Ľă‚ŒăŞă‘ă‚Œă°ăŞă‚Šăžă›ă‚“ă€‚
-+Comment[ja]=ćŽĽçśšăŒčŚćą‚ă•ă‚ŒăŚă„ăžă™ă€‚ăƒŚăƒźă‚śăŒč¨ąĺŻă—ăŞă‘ă‚Œă°ăŞă‚Šăžă›ă‚“ă€‚
- Comment[km]=áž”ážśáž“â€‹ážŸáŸ’áž“ážžâ€‹áž€ážśážšâ€‹ážâ€‹áž—áŸ’áž‡ážśáž”áŸ‹â€‹,​ áž˘áŸ’áž“áž€â€‹áž”áŸ’ážšážžâ€‹ážáŸ’ážšážźážœâ€‹ážáŸ‚â€‹áž‘áž‘áž˝áž›áž™áž€
- Comment[lt]=Kvietimas ryĹĄiui iĹĄsiĹłstas, naudotojas turi priimti kvietimÄ

- Comment[mk]=ĐŸĐžĐąĐ°Ń€Đ°Đ˝Đž Đľ ĐżĐžĐ˛Ń€ĐˇŃƒĐ˛Đ°ŃšĐľ, кОрисникОт ПОра Đ´Đ° прифати
-@@ -802,7 +802,7 @@
- Name[hu]=ĂšjKapcsolatAutoElfogadva
- Name[is]=NýTengingSjålfvirktSamÞykkt
- Name[it]=Accettata nuova connessione automatica
--Name[ja]=ć–°čŚćŽĽçśšăŽć–°čŚĺ—ă‘ĺ
Ľă‚Œ
-+Name[ja]=ć–°čŚćŽĽçśšăŽč‡Şĺ‹•ĺ—ă‘ĺ
Ľă‚Œ
- Name[km]=áž”ážśáž“â€‹áž‘áž‘áž˝áž›â€‹áž™áž€â€‹áž€ážśážšâ€‹ážâ€‹áž—áŸ’áž‡ážśáž”áŸ‹â€‹ážáŸ’áž˜áž¸â€‹ážŠáŸ„áž™â€‹ážŸáŸ’ážœáŸáž™â€‹áž”áŸ’ážšážœážáŸ’ážážˇ
- Name[lt]=Naujas kvietimas ryĹĄiui automatiĹĄkai priimtas
- Name[mk]=Ново ĐżĐžĐ˛Ń€ĐˇŃƒĐ˛Đ°ŃšĐľ автОПатски прифатонО
-@@ -861,7 +861,7 @@
- Comment[hu]=Automatikusan lĂŠtrejĂśtt az Ăşj kapcsolat
- Comment[is]=Nýjar tengingar sjålfkrafa samÞykktar
- Comment[it]=Stabilita nuova connessione automaticamente
--Comment[ja]=ć–°čŚćŽĽçśšăŻč‡Şĺ‹•çš„ăŤç˘şçŤ‹ă•ă‚Œăžă™
-+Comment[ja]=ć–°čŚćŽĽçśšă‚’č‡Şĺ‹•çš„ăŤç˘şçŤ‹ă—ăžă—ăŸ
- Comment[km]=áž”ážśáž“â€‹áž”áž„áŸ’áž€ážžážâ€‹áž€ážśážšâ€‹ážâ€‹áž—áŸ’áž‡ážśáž”áŸ‹â€‹ážáŸ’áž˜áž¸â€‹ážŠáŸ„áž™â€‹ážŸáŸ’ážœáŸáž™â€‹áž”áŸ’ážšážœážáŸ’ážážˇ
- Comment[lt]=Naujas ryĹĄys uĹžmegztas automatiĹĄkai
- Comment[mk]=АвтОПатски Đľ вОспОставонО нОвО ĐżĐžĐ˛Ń€ĐˇŃƒĐ˛Đ°ŃšĐľ
-@@ -982,7 +982,7 @@
- Comment[hu]=Foglalt, a csatlakozĂĄsi kĂŠrĂŠs visszautasĂ­tva
- Comment[is]=Uptekinn, tengingu hafnaĂ°
- Comment[it]=Occupato, connessione rifiutata
--Comment[ja]=ăƒ“ă‚¸ăƒźă§ă™ă€‚ćŽĽçśšăŻć‹’ĺŚă•ă‚Œăžă—ăŸ
-+Comment[ja]=ăƒ“ă‚¸ăƒźă§ă™ă€ćŽĽçśšă‚’ć‹’ĺŚă—ăžă—ăŸ
- Comment[km]=រវល់​,â€‹áž”áŸ„áŸ‡áž”áž„áŸ‹â€‹áž€ážśážšâ€‹ážâ€‹áž—áŸ’áž‡ážśáž”áŸ‹
- Comment[lt]=UĹžimta, kvietimas ryĹĄiui atmestas
- Comment[mk]=ЗафатонО, ĐżĐžĐ˛Ń€ĐˇŃƒĐ˛Đ°ŃšĐľŃ‚Đž Đľ ОдйионО
-Index: krfb/libvncserver/sraRegion.h
-===================================================================
---- krfb/libvncserver/sraRegion.h	(.../tags/KDE/3.5.4/kdenetwork)	(revision 581799)
-+++ krfb/libvncserver/sraRegion.h	(.../branches/KDE/3.5/kdenetwork)	(revision 581799)
-@@ -1,4 +1,3 @@
--
- #ifndef SRAREGION_H
- #define SRAREGION_H
- 
-@@ -38,6 +37,8 @@
- extern unsigned long sraRgnCountRects(const sraRegion *rgn);
- extern Bool sraRgnEmpty(const sraRegion *rgn);
- 
-+extern sraRegion *sraRgnBBox(const sraRegion *src);
-+
- /* -=- rectangle iterator */
- 
- typedef struct sraRectangleIterator {
-@@ -58,4 +59,7 @@
- extern Bool sraClipRect(int *x, int *y, int *w, int *h,
- 			int cx, int cy, int cw, int ch);
- 
-+extern Bool sraClipRect2(int *x, int *y, int *x2, int *y2,
-+			int cx, int cy, int cx2, int cy2);
-+
- #endif
-Index: krfb/libvncserver/sraRegion.c
+--- lanbrowsing/kcmlisa/kcmkiolan.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 594431)
++++ lanbrowsing/kcmlisa/kcmkiolan.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 594431)
+@@ -21,7 +21,6 @@
+ Name[es]=Esclavo de LAN KIO
+ Name[et]=KohtvĂľrgu KIO moodul
+ Name[eu]=LAN KIO morroia
+-Name[fa]=ŮžŰŒŘąŮˆ LAN KIO‌
+ Name[fi]=LAN-siirräntätyÜskentelijä
+ Name[fr]=Module KIO LAN
+ Name[ga]=SclĂĄbhaĂ­ KIO LAN
+@@ -68,7 +67,7 @@
+ Comment[es]=lan: y rlan: configuraciĂłn
+ Comment[et]=lan: ja rlan: seadistamine
+ Comment[eu]=lan: eta rlan: konfigurazioa
+-Comment[fa]=شبڊۀ Ů
Ř­Ů„ŰŒ:Ůˆ شبڊۀ Ů
Ř­Ů„ŰŒ عاه ŘŻŮˆŘą: Ř¨ŘąŮžŘ§ŰŒŰŒâ€Œ
++Comment[fa]=شبڊۀ Ů
Ř­Ů„ŰŒ: Ůˆ شبڊۀ Ů
Ř­Ů„ŰŒ عاه ŘŻŮˆŘą: Ř¨ŘąŮžŘ§ŰŒŰŒâ€Œ
+ Comment[fi]=lan: ja rlan: asetukset
+ Comment[fr]=configuration pour lan: et rlan:
+ Comment[ga]=CumraĂ­ocht lan: agus rlan:
+Index: lanbrowsing/kcmlisa/kcmlisa.desktop
+===================================================================
+--- lanbrowsing/kcmlisa/kcmlisa.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 594431)
++++ lanbrowsing/kcmlisa/kcmlisa.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 594431)
+@@ -9,7 +9,6 @@
+ X-KDE-FactoryName=lisa
+ 
+ Name=LISa
+-Name[fa]= LISa‌
+ Name[hi]=लिसञ
+ Name[sv]=Lisa
+ Name[th]=฼ิซา
+@@ -30,7 +29,7 @@
+ Comment[es]=ConfiguraciĂłn LISa
+ Comment[et]=LISa seadistamine
+ Comment[eu]=LISa konfiguratu
+-Comment[fa]=Ř¨ŘąŮžŘ§ŰŒŰŒ  LISa‌
++Comment[fa]=Ř¨ŘąŮžŘ§ŰŒŰŒ LISa‌
+ Comment[fi]=Aseta LISa
+ Comment[fr]=Configuration de LISa
+ Comment[ga]=Cumraigh LISa
+Index: kdnssd/kdedmodule/dnssdwatcher.desktop
 ===================================================================
---- krfb/libvncserver/sraRegion.c	(.../tags/KDE/3.5.4/kdenetwork)	(revision 581799)
-+++ krfb/libvncserver/sraRegion.c	(.../branches/KDE/3.5/kdenetwork)	(revision 581799)
-@@ -33,7 +33,7 @@
- sraSpanList *sraSpanListDup(const sraSpanList *src);
- void sraSpanListDestroy(sraSpanList *list);
- 
--sraSpan *
-+static sraSpan *
- sraSpanCreate(int start, int end, const sraSpanList *subspan) {
-   sraSpan *item = (sraSpan*)malloc(sizeof(sraSpan));
-   item->_next = item->_prev = NULL;
-@@ -43,7 +43,7 @@
-   return item;
- }
- 
--sraSpan *
-+static sraSpan *
- sraSpanDup(const sraSpan *src) {
-   sraSpan *span;
-   if (!src) return NULL;
+--- kdnssd/kdedmodule/dnssdwatcher.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 594431)
++++ kdnssd/kdedmodule/dnssdwatcher.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 594431)
 @@ -51,7 +51,7 @@
-   return span;
- }
- 
--void
-+static void
- sraSpanInsertAfter(sraSpan *newspan, sraSpan *after) {
-   newspan->_next = after->_next;
-   newspan->_prev = after;
-@@ -59,7 +59,7 @@
-   after->_next = newspan;
- }
- 
--void
-+static void
- sraSpanInsertBefore(sraSpan *newspan, sraSpan *before) {
-   newspan->_next = before;
-   newspan->_prev = before->_prev;
-@@ -67,32 +67,34 @@
-   before->_prev = newspan;
- }
- 
--void
-+static void
- sraSpanRemove(sraSpan *span) {
-   span->_prev->_next = span->_next;
-   span->_next->_prev = span->_prev;
- }
- 
--void
-+static void
- sraSpanDestroy(sraSpan *span) {
-   if (span->subspan) sraSpanListDestroy(span->subspan);
-   free(span);
- }
- 
--void
-+#ifdef DEBUG
-+static void
- sraSpanCheck(const sraSpan *span, const char *text) {
-   /* Check the span is valid! */
-   if (span->start == span->end) {
--    printf("%s:%d-%d\n", text, span->start, span->end); 
--    exit(0);
-+    printf(text); 
-+    printf(":%d-%d\n", span->start, span->end);
-   }
- }
-+#endif
- 
- /* -=- SpanList routines */
- 
--void sraSpanPrint(const sraSpan *s);
-+static void sraSpanPrint(const sraSpan *s);
- 
--void
-+static void
- sraSpanListPrint(const sraSpanList *l) {
-   sraSpan *curr;
-   if (!l) {
-@@ -115,8 +117,8 @@
-     sraSpanListPrint(s->subspan);
- }
- 
--sraSpanList *
--sraSpanListCreate() {
-+static sraSpanList *
-+sraSpanListCreate(void) {
-   sraSpanList *item = (sraSpanList*)malloc(sizeof(sraSpanList));
-   item->front._next = &(item->back);
-   item->front._prev = NULL;
-@@ -155,7 +157,7 @@
-   free(list);
- }
- 
--void
-+static void
- sraSpanListMakeEmpty(sraSpanList *list) {
-   sraSpan *curr, *next;
-   while (list->front._next != &(list->back)) {
-@@ -171,7 +173,7 @@
-   list->back._next = NULL;
- }
- 
--Bool
-+static Bool
- sraSpanListEqual(const sraSpanList *s1, const sraSpanList *s2) {
-   sraSpan *sp1, *sp2;
- 
-@@ -180,7 +182,7 @@
-       return 1;
-     } else {
-       printf("sraSpanListEqual:incompatible spans (only one NULL!)\n");
--      exit(1);
-+      return FALSE;
-     }
-   }
- 
-@@ -204,12 +206,12 @@
-   }    
- }
- 
--Bool
-+static Bool
- sraSpanListEmpty(const sraSpanList *list) {
-   return (list->front._next == &(list->back));
- }
- 
--unsigned long
-+static unsigned long
- sraSpanListCount(const sraSpanList *list) {
-   sraSpan *curr = list->front._next;
-   unsigned long count = 0;
-@@ -224,11 +226,12 @@
-   return count;
- }
- 
--void
-+static void
- sraSpanMergePrevious(sraSpan *dest) {
-   sraSpan *prev = dest->_prev;
--  while ((prev->end == dest->start) &&
--	 (prev->_prev) &&
-+ 
-+  while ((prev->_prev) &&
-+	 (prev->end == dest->start) &&
- 	 (sraSpanListEqual(prev->subspan, dest->subspan))) {
-     /*
-     printf("merge_prev:");
-@@ -244,11 +247,11 @@
-   }
- }    
- 
--void
-+static void
- sraSpanMergeNext(sraSpan *dest) {
-   sraSpan *next = dest->_next;
--  while ((next->start == dest->end) &&
--	 (next->_next) &&
-+  while ((next->_next) &&
-+	 (next->start == dest->end) &&
- 	 (sraSpanListEqual(next->subspan, dest->subspan))) {
- /*
- 	  printf("merge_next:");
-@@ -264,7 +267,7 @@
-   }
- }
- 
--void
-+static void
- sraSpanListOr(sraSpanList *dest, const sraSpanList *src) {
-   sraSpan *d_curr, *s_curr;
-   int s_start, s_end;
-@@ -274,7 +277,7 @@
-       return;
-     } else {
-       printf("sraSpanListOr:incompatible spans (only one NULL!)\n");
--      exit(1);
-+      return;
-     }
-   }
- 
-@@ -354,7 +357,7 @@
-   }
- }
- 
--Bool
-+static Bool
- sraSpanListAnd(sraSpanList *dest, const sraSpanList *src) {
-   sraSpan *d_curr, *s_curr, *d_next;
- 
-@@ -363,7 +366,7 @@
-       return 1;
-     } else {
-       printf("sraSpanListAnd:incompatible spans (only one NULL!)\n");
--      exit(1);
-+      return FALSE;
-     }
-   }
- 
-@@ -434,7 +437,7 @@
-   return !sraSpanListEmpty(dest);
- }
- 
--Bool
-+static Bool
- sraSpanListSubtract(sraSpanList *dest, const sraSpanList *src) {
-   sraSpan *d_curr, *s_curr;
- 
-@@ -443,7 +446,7 @@
-       return 1;
-     } else {
-       printf("sraSpanListSubtract:incompatible spans (only one NULL!)\n");
--      exit(1);
-+      return FALSE;
-     }
-   }
- 
-@@ -584,6 +587,38 @@
-   }
- }
- 
-+sraRegion *sraRgnBBox(const sraRegion *src) {
-+  int xmin=((unsigned int)(int)-1)>>1,ymin=xmin,xmax=1-xmin,ymax=xmax;
-+  sraSpan *vcurr, *hcurr;
-+
-+  if(!src)
-+    return sraRgnCreate();
-+
-+  vcurr = ((sraSpanList*)src)->front._next;
-+  while (vcurr != &(((sraSpanList*)src)->back)) {
-+    if(vcurr->start<ymin)
-+      ymin=vcurr->start;
-+    if(vcurr->end>ymax)
-+      ymax=vcurr->end;
-+    
-+    hcurr = vcurr->subspan->front._next;
-+    while (hcurr != &(vcurr->subspan->back)) {
-+      if(hcurr->start<xmin)
-+	xmin=hcurr->start;
-+      if(hcurr->end>xmax)
-+	xmax=hcurr->end;
-+      hcurr = hcurr->_next;
-+    }
-+
-+    vcurr = vcurr->_next;
-+  }
-+
-+  if(xmax<xmin || ymax<ymin)
-+    return sraRgnCreate();
-+
-+  return sraRgnCreateRect(xmin,ymin,xmax,ymax);
-+}
-+
- Bool
- sraRgnPopRect(sraRegion *rgn, sraRect *rect, unsigned long flags) {
-   sraSpan *vcurr, *hcurr;
-@@ -656,7 +691,7 @@
-   sraRectangleIterator *i =
-     (sraRectangleIterator*)malloc(sizeof(sraRectangleIterator));
-   if(!i)
--    return(0);
-+    return NULL;
- 
-   /* we have to recurse eventually. So, the first sPtr is the pointer to
-      the sraSpan in the first level. the second sPtr is the pointer to
-@@ -665,7 +700,7 @@
-   i->sPtrs = (sraSpan**)malloc(sizeof(sraSpan*)*DEFSIZE);
-   if(!i->sPtrs) {
-     free(i);
--    return(0);
-+    return NULL;
-   }
-   i->ptrSize = DEFSIZE;
-   i->sPtrs[0] = &(s->front);
-@@ -673,7 +708,7 @@
-   i->ptrPos = 0;
-   i->reverseX = 0;
-   i->reverseY = 0;
--  return(i);
-+  return i;
- }
- 
- sraRectangleIterator *sraRgnGetReverseIterator(sraRegion *s,Bool reverseX,Bool reverseY)
-@@ -688,13 +723,13 @@
-   return(i);
- }
- 
--Bool sraReverse(sraRectangleIterator *i)
-+static Bool sraReverse(sraRectangleIterator *i)
- {
-   return( ((i->ptrPos&2) && i->reverseX) ||
-      (!(i->ptrPos&2) && i->reverseY));
- }
- 
--sraSpan* sraNextSpan(sraRectangleIterator *i)
-+static sraSpan* sraNextSpan(sraRectangleIterator *i)
- {
-   if(sraReverse(i))
-     return(i->sPtrs[i->ptrPos]->_prev);
-@@ -730,8 +765,8 @@
-   }
- 
-   if((i->ptrPos%4)!=2) {
--    fprintf(stderr,"sraRgnIteratorNext: offset is wrong (%d%%4!=2)\n",i->ptrPos);
--    exit(-1);
-+    printf("sraRgnIteratorNext: offset is wrong (%d%%4!=2)\n",i->ptrPos);
-+    return FALSE;
-   }
- 
-   r->y1 = i->sPtrs[i->ptrPos-2]->start;
-@@ -773,6 +808,28 @@
-   return (*w>0) && (*h>0);
- }
- 
-+Bool
-+sraClipRect2(int *x, int *y, int *x2, int *y2,
-+	    int cx, int cy, int cx2, int cy2) {
-+  if (*x < cx)
-+    *x = cx;
-+  if (*y < cy)
-+    *y = cy;
-+  if (*x >= cx2)
-+    *x = cx2-1;
-+  if (*y >= cy2)
-+    *y = cy2-1;
-+  if (*x2 <= cx)
-+    *x2 = cx+1;
-+  if (*y2 <= cy)
-+    *y2 = cy+1;
-+  if (*x2 > cx2)
-+    *x2 = cx2;
-+  if (*y2 > cy2)
-+    *y2 = cy2;
-+  return (*x2>*x) && (*y2>*y);
-+}
-+
- /* test */
- 
- #ifdef SRA_TEST
-@@ -805,7 +862,7 @@
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdenetwork-branch.diff?r1=1.12&r2=1.13&f=u

More information about the pld-cvs-commit mailing list