diff options
author | Campbell Barton <ideasman42@gmail.com> | 2006-03-26 13:25:30 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2006-03-26 13:25:30 +0400 |
commit | 915cd5b80b888c0eb70160ca6be11d7d39d43e8d (patch) | |
tree | 9873d1cdaabcc580f76ed6072be327f3d08d5706 /source/blender/blenkernel | |
parent | e2637de00fed1d46f9cdcce6c57431b9e623a340 (diff) |
Added python image pack/unpack per image.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_packedFile.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/packedFile.c | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenkernel/BKE_packedFile.h b/source/blender/blenkernel/BKE_packedFile.h index 270a0492f91..be9792322c4 100644 --- a/source/blender/blenkernel/BKE_packedFile.h +++ b/source/blender/blenkernel/BKE_packedFile.h @@ -52,7 +52,7 @@ int readPackedFile(struct PackedFile * pf, void * data, int size); int countPackedFiles(void); void freePackedFile(struct PackedFile * pf); void packAll(void); -int writePackedFile(char * filename, struct PackedFile *pf); +int writePackedFile(char * filename, struct PackedFile *pf, int guimode); int checkPackedFile(char * filename, struct PackedFile * pf); char * unpackFile(char * abs_name, char * local_name, struct PackedFile * pf, int how); int unpackVFont(struct VFont * vfont, int how); diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index cb47c43da06..49ad8d2ac67 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -278,7 +278,7 @@ char * find_new_name(char * name) */ -int writePackedFile(char * filename, PackedFile *pf) +int writePackedFile(char * filename, PackedFile *pf, int guimode) { int file, number, remove_tmp = FALSE; int ret_value = RET_OK; @@ -309,28 +309,28 @@ int writePackedFile(char * filename, PackedFile *pf) file = open(name, O_BINARY + O_WRONLY + O_CREAT + O_TRUNC, 0666); if (file >= 0) { if (write(file, pf->data, pf->size) != pf->size) { - error("Error writing file: %s", name); + if(guimode) error("Error writing file: %s", name); ret_value = RET_ERROR; } close(file); } else { - error("Error creating file: %s", name); + if(guimode) error("Error creating file: %s", name); ret_value = RET_ERROR; } if (remove_tmp) { if (ret_value == RET_ERROR) { if (BLI_rename(tempname, name) == RET_ERROR) { - error("Error restoring tempfile. Check files: '%s' '%s'", tempname, name); + if(guimode) error("Error restoring tempfile. Check files: '%s' '%s'", tempname, name); } } else { if (BLI_delete(tempname, 0, 0) == RET_ERROR) { - error("Error deleting '%s' (ignored)"); + if(guimode) error("Error deleting '%s' (ignored)"); } } } - waitcursor(0); + if(guimode) waitcursor(0); return (ret_value); } @@ -468,7 +468,7 @@ char * unpackFile(char * abs_name, char * local_name, PackedFile * pf, int how) } // else fall through and create it case PF_WRITE_LOCAL: - if (writePackedFile(local_name, pf) == RET_OK) { + if (writePackedFile(local_name, pf, 1) == RET_OK) { temp = local_name; } break; @@ -480,7 +480,7 @@ char * unpackFile(char * abs_name, char * local_name, PackedFile * pf, int how) } // else fall through and create it case PF_WRITE_ORIGINAL: - if (writePackedFile(abs_name, pf) == RET_OK) { + if (writePackedFile(abs_name, pf, 1) == RET_OK) { temp = abs_name; } break; |