git » fp-git.git » commit e90fdd1

diff --git a/PR/src/lib/actions/import.c b/PR/src/lib/actions/import.c
index 4a11b42..df038ae 100644
--- a/PR/src/lib/actions/import.c
+++ b/PR/src/lib/actions/import.c
@@ -156,7 +156,7 @@ int partialCompile(const char* vFiledat, const char* vDirExt, tResourceList* r,
 
 	/* main loop */
 	for (indexNumber=0;(indexNumber<numberOfItems);indexNumber++) {
-		if ((error=mReadFileInDatFile(&res,indexNumber))) return error; /* Read error */
+		if (!mReadFileInDatFile(&res,indexNumber)) return PR_RESULT_ERR_INVALID_DAT; /* Read error */
 
 		if (res.id.value==0xFFFF) continue; /* Tammo Jan Bug fix * TODO: move to the dat layer? */
 
@@ -188,7 +188,6 @@ int partialCompile(const char* vFiledat, const char* vDirExt, tResourceList* r,
 			}
 		} else {
 			/* the file wasn't in the partial list, so I'll re-copy it from the open dat file */
-			res.size--;
 			mWriteFileInDatFileIgnoreChecksum(&res);
 		}
 	}
diff --git a/PR/src/lib/layers/disk.c b/PR/src/lib/layers/disk.c
index b206ee6..c86a3b0 100644
--- a/PR/src/lib/layers/disk.c
+++ b/PR/src/lib/layers/disk.c
@@ -162,9 +162,7 @@ void addFileToOpenFilesList(const char* fileName,int hasBackup) {
 	openFilesList=newNode;
 }
 
-void addPointerToOpenFilesList(FILE* fp) { /* TODO: use a define */
-	openFilesList->file=fp;
-}
+#define addPointerToOpenFilesList(fp) openFilesList->file=fp;
 
 int getFromOpenFilesList(FILE* fp, char** fileName, unsigned char** content, unsigned long int *size) {
 	tOpenFiles* currentNode;
diff --git a/PR/src/lib/object/image/image16.c b/PR/src/lib/object/image/image16.c
index f5b06b0..4ce4179 100644
--- a/PR/src/lib/object/image/image16.c
+++ b/PR/src/lib/object/image/image16.c
@@ -231,7 +231,6 @@ int mCompressGraphic(unsigned char* *data,tImage* image, int* dataSizeInBytes) {
 
 	/* Initialize variables */
 	imageSizeInBytes=image->widthInBytes*image->height;
-	for (i=0;i<COMPRESS_WORKING_ALGORITHMS;i++) compressedSize[i]=imageSizeInBytes; /* TODO: remove this line */
 
 	/*
 		Perform all compressions
diff --git a/PR/src/lib/object/image/image2.c b/PR/src/lib/object/image/image2.c
index f5b06b0..4ce4179 100644
--- a/PR/src/lib/object/image/image2.c
+++ b/PR/src/lib/object/image/image2.c
@@ -231,7 +231,6 @@ int mCompressGraphic(unsigned char* *data,tImage* image, int* dataSizeInBytes) {
 
 	/* Initialize variables */
 	imageSizeInBytes=image->widthInBytes*image->height;
-	for (i=0;i<COMPRESS_WORKING_ALGORITHMS;i++) compressedSize[i]=imageSizeInBytes; /* TODO: remove this line */
 
 	/*
 		Perform all compressions
diff --git a/PR/src/lib/object/image/image256.c b/PR/src/lib/object/image/image256.c
index f5b06b0..4ce4179 100644
--- a/PR/src/lib/object/image/image256.c
+++ b/PR/src/lib/object/image/image256.c
@@ -231,7 +231,6 @@ int mCompressGraphic(unsigned char* *data,tImage* image, int* dataSizeInBytes) {
 
 	/* Initialize variables */
 	imageSizeInBytes=image->widthInBytes*image->height;
-	for (i=0;i<COMPRESS_WORKING_ALGORITHMS;i++) compressedSize[i]=imageSizeInBytes; /* TODO: remove this line */
 
 	/*
 		Perform all compressions
diff --git a/PR/src/lib/object/image/image_common.c b/PR/src/lib/object/image/image_common.c
index f5b06b0..4ce4179 100644
--- a/PR/src/lib/object/image/image_common.c
+++ b/PR/src/lib/object/image/image_common.c
@@ -231,7 +231,6 @@ int mCompressGraphic(unsigned char* *data,tImage* image, int* dataSizeInBytes) {
 
 	/* Initialize variables */
 	imageSizeInBytes=image->widthInBytes*image->height;
-	for (i=0;i<COMPRESS_WORKING_ALGORITHMS;i++) compressedSize[i]=imageSizeInBytes; /* TODO: remove this line */
 
 	/*
 		Perform all compressions