diff options
| author | Kent Mein <mein@cs.umn.edu> | 2005-01-10 19:22:40 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2005-01-10 19:22:40 +0300 |
| commit | 3c592ec3ad40cd3809890f3532875a609c635fb3 (patch) | |
| tree | aef5e4a5a9779eda429b0ca4c3d21dc402ead55c /source/blender/imbuf/intern/jpeg.c | |
| parent | d1d8950eac2e0cbdbbf97e5b893f72a4fdca3b12 (diff) | |
This is for bug # 2068
I standarized the returns on a failed opening of the output file for
the above image formats.
I also cleaned up a couple of warnings.
Kent
Diffstat (limited to 'source/blender/imbuf/intern/jpeg.c')
| -rw-r--r-- | source/blender/imbuf/intern/jpeg.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/source/blender/imbuf/intern/jpeg.c b/source/blender/imbuf/intern/jpeg.c index 7cc4e4fdefe..fda48bf18cc 100644 --- a/source/blender/imbuf/intern/jpeg.c +++ b/source/blender/imbuf/intern/jpeg.c @@ -351,10 +351,7 @@ ImBuf * imb_ibJpegImageFromFilename (char * filename, int flags) FILE * infile; ImBuf * ibuf; - if ((infile = fopen(filename, "rb")) == NULL) { - /*fprintf(stderr, "can't open %s\n", filename);*/ - return 0; - } + if ((infile = fopen(filename, "rb")) == NULL) return 0; cinfo->err = jpeg_std_error(&jerr); jerr.error_exit = jpeg_error; @@ -494,7 +491,7 @@ static int save_stdjpeg(char * name, struct ImBuf * ibuf) struct jpeg_compress_struct _cinfo, *cinfo = &_cinfo; struct jpeg_error_mgr jerr; - if ((outfile = fopen(name, "wb")) == NULL) return(-1); + if ((outfile = fopen(name, "wb")) == NULL) return 0; jpeg_default_quality = 75; cinfo->err = jpeg_std_error(&jerr); @@ -518,7 +515,7 @@ static int save_vidjpeg(char * name, struct ImBuf * ibuf) struct jpeg_compress_struct _cinfo, *cinfo = &_cinfo; struct jpeg_error_mgr jerr; - if ((outfile = fopen(name, "wb")) == NULL) return(-1); + if ((outfile = fopen(name, "wb")) == NULL) return 0; jpeg_default_quality = 90; cinfo->err = jpeg_std_error(&jerr); @@ -584,7 +581,7 @@ static int save_maxjpeg(char * name, struct ImBuf * ibuf) struct jpeg_compress_struct _cinfo, *cinfo = &_cinfo; struct jpeg_error_mgr jerr; - if ((outfile = fopen(name, "wb")) == NULL) return(-1); + if ((outfile = fopen(name, "wb")) == NULL) return 0; jpeg_default_quality = 100; cinfo->err = jpeg_std_error(&jerr); @@ -607,7 +604,6 @@ static int save_maxjpeg(char * name, struct ImBuf * ibuf) return(jpeg_failed); } - int imb_savejpeg(struct ImBuf * ibuf, char * name, int flags) { |