diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-22 04:35:26 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-22 04:35:26 +0400 |
| commit | 743d2f8c0f4359eef120eab4db7bfe00b5185e05 (patch) | |
| tree | 2ea0e95f16a5a4cdb285ef40202995842ad6f920 /source/creator | |
| parent | 7d124edeadeb60b41e7c828c6b9c18c0850aa933 (diff) | |
rename image type defines to be less ambiguous, also set BMP as not supporting alpha (it reads but cant write)
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/creator.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/source/creator/creator.c b/source/creator/creator.c index 0fa60b96bf4..3a356e709f7 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -584,38 +584,38 @@ static int set_image_type(int argc, const char **argv, void *data) if (scene) { char imtype_new; - if (!strcmp(imtype,"TGA")) imtype_new = R_TARGA; - else if (!strcmp(imtype,"IRIS")) imtype_new = R_IRIS; + if (!strcmp(imtype,"TGA")) imtype_new = R_IMF_IMTYPE_TARGA; + else if (!strcmp(imtype,"IRIS")) imtype_new = R_IMF_IMTYPE_IRIS; #ifdef WITH_DDS - else if (!strcmp(imtype,"DDS")) imtype_new = R_DDS; + else if (!strcmp(imtype,"DDS")) imtype_new = R_IMF_IMTYPE_DDS; #endif - else if (!strcmp(imtype,"JPEG")) imtype_new = R_JPEG90; - else if (!strcmp(imtype,"IRIZ")) imtype_new = R_IRIZ; - else if (!strcmp(imtype,"RAWTGA")) imtype_new = R_RAWTGA; - else if (!strcmp(imtype,"AVIRAW")) imtype_new = R_AVIRAW; - else if (!strcmp(imtype,"AVIJPEG")) imtype_new = R_AVIJPEG; - else if (!strcmp(imtype,"PNG")) imtype_new = R_PNG; - else if (!strcmp(imtype,"AVICODEC")) imtype_new = R_AVICODEC; - else if (!strcmp(imtype,"QUICKTIME")) imtype_new = R_QUICKTIME; - else if (!strcmp(imtype,"BMP")) imtype_new = R_BMP; + else if (!strcmp(imtype,"JPEG")) imtype_new = R_IMF_IMTYPE_JPEG90; + else if (!strcmp(imtype,"IRIZ")) imtype_new = R_IMF_IMTYPE_IRIZ; + else if (!strcmp(imtype,"RAWTGA")) imtype_new = R_IMF_IMTYPE_RAWTGA; + else if (!strcmp(imtype,"AVIRAW")) imtype_new = R_IMF_IMTYPE_AVIRAW; + else if (!strcmp(imtype,"AVIJPEG")) imtype_new = R_IMF_IMTYPE_AVIJPEG; + else if (!strcmp(imtype,"PNG")) imtype_new = R_IMF_IMTYPE_PNG; + else if (!strcmp(imtype,"AVICODEC")) imtype_new = R_IMF_IMTYPE_AVICODEC; + else if (!strcmp(imtype,"QUICKTIME")) imtype_new = R_IMF_IMTYPE_QUICKTIME; + else if (!strcmp(imtype,"BMP")) imtype_new = R_IMF_IMTYPE_BMP; #ifdef WITH_HDR - else if (!strcmp(imtype,"HDR")) imtype_new = R_RADHDR; + else if (!strcmp(imtype,"HDR")) imtype_new = R_IMF_IMTYPE_RADHDR; #endif #ifdef WITH_TIFF - else if (!strcmp(imtype,"TIFF")) imtype_new = R_TIFF; + else if (!strcmp(imtype,"TIFF")) imtype_new = R_IMF_IMTYPE_TIFF; #endif #ifdef WITH_OPENEXR - else if (!strcmp(imtype,"EXR")) imtype_new = R_OPENEXR; - else if (!strcmp(imtype,"MULTILAYER")) imtype_new = R_MULTILAYER; + else if (!strcmp(imtype,"EXR")) imtype_new = R_IMF_IMTYPE_OPENEXR; + else if (!strcmp(imtype,"MULTILAYER")) imtype_new = R_IMF_IMTYPE_MULTILAYER; #endif - else if (!strcmp(imtype,"MPEG")) imtype_new = R_FFMPEG; - else if (!strcmp(imtype,"FRAMESERVER")) imtype_new = R_FRAMESERVER; + else if (!strcmp(imtype,"MPEG")) imtype_new = R_IMF_IMTYPE_FFMPEG; + else if (!strcmp(imtype,"FRAMESERVER")) imtype_new = R_IMF_IMTYPE_FRAMESERVER; #ifdef WITH_CINEON - else if (!strcmp(imtype,"CINEON")) imtype_new = R_CINEON; - else if (!strcmp(imtype,"DPX")) imtype_new = R_DPX; + else if (!strcmp(imtype,"CINEON")) imtype_new = R_IMF_IMTYPE_CINEON; + else if (!strcmp(imtype,"DPX")) imtype_new = R_IMF_IMTYPE_DPX; #endif #ifdef WITH_OPENJPEG - else if (!strcmp(imtype,"JP2")) imtype_new = R_JP2; + else if (!strcmp(imtype,"JP2")) imtype_new = R_IMF_IMTYPE_JP2; #endif else { printf("\nError: Format from '-F / --render-format' not known or not compiled in this release.\n"); |