summaryrefslogtreecommitdiff
path: root/devel/tvision/patches/patch-ab
blob: 200ef75b4b3637b29778163b050f1fc30f31b64d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
$NetBSD: patch-ab,v 1.3 2006/01/03 09:45:57 joerg Exp $

--- lib/TResourceFile.cc.orig	2006-01-03 09:18:35.000000000 +0000
+++ lib/TResourceFile.cc
@@ -62,7 +62,7 @@ TResourceFile::TResourceFile( fpstream *
     int repeat;
     do {
        repeat = 0;
-       if (basePos <= (streamSize - (long)sizeof(THeader)))
+       if (basePos <= ((long)streamSize - sizeof(THeader)))
            {
            stream->seekg(basePos, ios::beg);
            stream->readBytes(&header, sizeof(THeader));
@@ -172,7 +172,7 @@ void TResourceFile::put(TStreamable *ite
     p->pos =  indexPos;
     stream->seekp(basePos + indexPos, ios::beg);
     *stream << item;
-    indexPos = stream->tellp() - basePos;
+    indexPos = (long)stream->tellp() - basePos;
     p->size  = indexPos - p->pos;
 
     modified = True;
@@ -213,7 +213,7 @@ void doCopyResource(void* item, void* ar
   SwitchInfo* si = (SwitchInfo*)arg;
 
   si->sourceStream->seekg(si->oldBasePos + ((TResourceItem*)item)->pos);
-  ((TResourceItem*)item)->pos = si->destStream->tellp() - si->newBasePos;
+  ((TResourceItem*)item)->pos = (long)si->destStream->tellp() - si->newBasePos;
 
   copyStream( si->destStream, si->sourceStream, ((TResourceItem*)item)->size);
 }
@@ -231,7 +231,7 @@ fpstream* TResourceFile::switchTo( fpstr
 	 args.destStream = aStream;
     aStream->seekp( args.newBasePos + sizeof(long)*3);
     index->forEach(doCopyResource, &args);
-    indexPos = aStream->tellp() - args.newBasePos;
+    indexPos = (long)aStream->tellp() - args.newBasePos;
   }
   else
   {