WebSVN – spk – Diff – /libspk/src/BaseFile.cpp

 				char *newData = NULL;
 				size_t size = 0;
 				size_t newSize = 0;
 				if (f->GetData() && f->GetDataSize())
-				{
-					data = (char *)f->GetData();
+					data = (char *)f->UncompressData((long *)&size, NULL);
-					size = static_cast<size_t>(f->GetDataSize());
-				}
 				else if(f->isExternalFile())
 					data = CFileIO(f->filePointer()).ReadToData(&size);
 				if (newfile->GetData() && newfile->GetDataSize())
-				{
-					newData = (char *)newfile->GetData();
+					newData = (char *)f->UncompressData((long *)&newSize, NULL);
-					newSize = static_cast<size_t>(newfile->GetDataSize());
-				}
 				else
 					newData = CFileIO(newfile->filePointer()).ReadToData(&newSize);
 				// compare bytes
 				bool matched = false;
 							break;
+						}
+					}
+				}
-				if (data && !f->GetData())
+				if (data)
 					delete data;
-				if (newData && !newfile->GetData())
+				if (newData)
 					delete newData;
 				if (matched)
+				{
 					if(!f->game() || f->game() == GAME_ALLNEW)

Subversion Repositories spk