[Bf-blender-cvs] [6b2386f] temp_imbuf_types_refactor: Imbuf types refactor.
Antony Riakiotakis
noreply at git.blender.org
Mon Jun 8 12:08:03 CEST 2015
Commit: 6b2386fa2b0c34e90edc893b7046b1c2a5543cc6
Author: Antony Riakiotakis
Date: Mon Jun 8 12:07:34 2015 +0200
Branches: temp_imbuf_types_refactor
https://developer.blender.org/rB6b2386fa2b0c34e90edc893b7046b1c2a5543cc6
Imbuf types refactor.
ImBuf types were getting stored as bitflags in a 32bit integer which had
already run out of space. Solved the problem by separating file type to
an ftype enum, and file specific options to foptions.
Now we have 2^32 image formats to support, hopefully won't run out any
time soon.
Patch is committed to branch for inclusion after release due to
increased volatility, which could result explosions, spikes, acid, lava
and signs with "bad" on them if included now.
===================================================================
M source/blender/blenkernel/BKE_image.h
M source/blender/blenkernel/intern/dynamicpaint.c
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/movieclip.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/editors/space_image/image_buttons.c
M source/blender/editors/space_image/image_ops.c
M source/blender/gpu/intern/gpu_draw.c
M source/blender/imbuf/IMB_imbuf_types.h
M source/blender/imbuf/intern/allocimbuf.c
M source/blender/imbuf/intern/cineon/cineon_dpx.c
M source/blender/imbuf/intern/colormanagement.c
M source/blender/imbuf/intern/filetype.c
M source/blender/imbuf/intern/jp2.c
M source/blender/imbuf/intern/jpeg.c
M source/blender/imbuf/intern/openexr/openexr_api.cpp
M source/blender/imbuf/intern/png.c
M source/blender/imbuf/intern/targa.c
M source/blender/imbuf/intern/tiff.c
M source/blender/makesrna/intern/rna_image.c
M source/gameengine/Ketsji/BL_Texture.cpp
===================================================================
diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h
index facf3cf..68aa14f 100644
--- a/source/blender/blenkernel/BKE_image.h
+++ b/source/blender/blenkernel/BKE_image.h
@@ -79,8 +79,8 @@ void BKE_image_path_from_imtype(
const char imtype, const bool use_ext, const bool use_frames, const char *suffix);
int BKE_image_path_ensure_ext_from_imformat(char *string, const struct ImageFormatData *im_format);
int BKE_image_path_ensure_ext_from_imtype(char *string, const char imtype);
-char BKE_image_ftype_to_imtype(const int ftype);
-int BKE_image_imtype_to_ftype(const char imtype);
+char BKE_image_ftype_to_imtype(const int ftype, const int options);
+int BKE_image_imtype_to_ftype(const char imtype, int *r_options);
bool BKE_imtype_is_movie(const char imtype);
int BKE_imtype_supports_zbuf(const char imtype);
@@ -269,7 +269,7 @@ bool BKE_image_has_anim(struct Image *image);
bool BKE_image_has_packedfile(struct Image *image);
bool BKE_image_is_animated(struct Image *image);
bool BKE_image_is_dirty(struct Image *image);
-void BKE_image_file_format_set(struct Image *image, int ftype);
+void BKE_image_file_format_set(struct Image *image, int ftype, int options);
bool BKE_image_has_loaded_ibuf(struct Image *image);
struct ImBuf *BKE_image_get_ibuf_with_name(struct Image *image, const char *name);
struct ImBuf *BKE_image_get_first_ibuf(struct Image *image);
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index 8dac578..47ecbf7 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -2785,10 +2785,13 @@ void dynamicPaint_outputSurfaceImage(DynamicPaintSurface *surface, char *filenam
}
/* Set output format, png in case exr isn't supported */
- ibuf->ftype = PNG | 95;
+ ibuf->ftype = PNG;
+ ibuf->foptions = 95;
+
#ifdef WITH_OPENEXR
if (format == R_IMF_IMTYPE_OPENEXR) { /* OpenEXR 32-bit float */
- ibuf->ftype = OPENEXR | OPENEXR_COMPRESS;
+ ibuf->ftype = OPENEXR;
+ ibuf->foptions = OPENEXR_COMPRESS;
}
#endif
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index a8c5620..b2e607f 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -1209,20 +1209,24 @@ void BKE_image_all_free_anim_ibufs(int cfra)
/* *********** READ AND WRITE ************** */
-int BKE_image_imtype_to_ftype(const char imtype)
+int BKE_image_imtype_to_ftype(const char imtype, int *r_options)
{
if (imtype == R_IMF_IMTYPE_TARGA)
return TGA;
- else if (imtype == R_IMF_IMTYPE_RAWTGA)
- return RAWTGA;
+ else if (imtype == R_IMF_IMTYPE_RAWTGA) {
+ *r_options = RAWTGA;
+ return TGA;
+ }
else if (imtype == R_IMF_IMTYPE_IRIS)
return IMAGIC;
#ifdef WITH_HDR
else if (imtype == R_IMF_IMTYPE_RADHDR)
return RADHDR;
#endif
- else if (imtype == R_IMF_IMTYPE_PNG)
- return PNG | 15;
+ else if (imtype == R_IMF_IMTYPE_PNG) {
+ *r_options = 15;
+ return PNG;
+ }
#ifdef WITH_DDS
else if (imtype == R_IMF_IMTYPE_DDS)
return DDS;
@@ -1245,46 +1249,50 @@ int BKE_image_imtype_to_ftype(const char imtype)
else if (imtype == R_IMF_IMTYPE_JP2)
return JP2;
#endif
- else
- return JPG | 90;
+ else {
+ *r_options = 90;
+ return JPG;
+ }
}
-char BKE_image_ftype_to_imtype(const int ftype)
+char BKE_image_ftype_to_imtype(const int ftype, const int options)
{
if (ftype == 0)
return R_IMF_IMTYPE_TARGA;
else if (ftype == IMAGIC)
return R_IMF_IMTYPE_IRIS;
#ifdef WITH_HDR
- else if (ftype & RADHDR)
+ else if (ftype == RADHDR)
return R_IMF_IMTYPE_RADHDR;
#endif
- else if (ftype & PNG)
+ else if (ftype == PNG)
return R_IMF_IMTYPE_PNG;
#ifdef WITH_DDS
- else if (ftype & DDS)
+ else if (ftype == DDS)
return R_IMF_IMTYPE_DDS;
#endif
- else if (ftype & BMP)
+ else if (ftype == BMP)
return R_IMF_IMTYPE_BMP;
#ifdef WITH_TIFF
- else if (ftype & TIF)
+ else if (ftype == TIF)
return R_IMF_IMTYPE_TIFF;
#endif
- else if (ftype & OPENEXR)
+ else if (ftype == OPENEXR)
return R_IMF_IMTYPE_OPENEXR;
#ifdef WITH_CINEON
- else if (ftype & CINEON)
+ else if (ftype == CINEON)
return R_IMF_IMTYPE_CINEON;
- else if (ftype & DPX)
+ else if (ftype == DPX)
return R_IMF_IMTYPE_DPX;
#endif
- else if (ftype & TGA)
- return R_IMF_IMTYPE_TARGA;
- else if (ftype & RAWTGA)
- return R_IMF_IMTYPE_RAWTGA;
+ else if (ftype == TGA) {
+ if (options & RAWTGA)
+ return R_IMF_IMTYPE_RAWTGA;
+ else
+ return R_IMF_IMTYPE_TARGA;
+ }
#ifdef WITH_OPENJPEG
- else if (ftype & JP2)
+ else if (ftype == JP2)
return R_IMF_IMTYPE_JP2;
#endif
else
@@ -1591,8 +1599,8 @@ void BKE_imformat_defaults(ImageFormatData *im_format)
void BKE_imbuf_to_image_format(struct ImageFormatData *im_format, const ImBuf *imbuf)
{
- int ftype = imbuf->ftype & ~IB_CUSTOM_FLAGS_MASK;
- int custom_flags = imbuf->ftype & IB_CUSTOM_FLAGS_MASK;
+ int ftype = imbuf->ftype;
+ int custom_flags = imbuf->foptions;
BKE_imformat_defaults(im_format);
@@ -1649,34 +1657,33 @@ void BKE_imbuf_to_image_format(struct ImageFormatData *im_format, const ImBuf *i
#endif
else if (ftype == TGA) {
- im_format->imtype = R_IMF_IMTYPE_TARGA;
- }
- else if (ftype == RAWTGA) {
- im_format->imtype = R_IMF_IMTYPE_RAWTGA;
+ if (custom_flags & RAWTGA)
+ im_format->imtype = R_IMF_IMTYPE_RAWTGA;
+ else
+ im_format->imtype = R_IMF_IMTYPE_TARGA;
}
-
#ifdef WITH_OPENJPEG
- else if (ftype & JP2) {
+ else if (ftype == JP2) {
im_format->imtype = R_IMF_IMTYPE_JP2;
im_format->quality = custom_flags & ~JPG_MSK;
- if (ftype & JP2_16BIT)
+ if (custom_flags & JP2_16BIT)
im_format->depth = R_IMF_CHAN_DEPTH_16;
- else if (ftype & JP2_12BIT)
+ else if (custom_flags & JP2_12BIT)
im_format->depth = R_IMF_CHAN_DEPTH_12;
- if (ftype & JP2_YCC)
+ if (custom_flags & JP2_YCC)
im_format->jp2_flag |= R_IMF_JP2_FLAG_YCC;
- if (ftype & JP2_CINE) {
+ if (custom_flags & JP2_CINE) {
im_format->jp2_flag |= R_IMF_JP2_FLAG_CINE_PRESET;
- if (ftype & JP2_CINE_48FPS)
+ if (custom_flags & JP2_CINE_48FPS)
im_format->jp2_flag |= R_IMF_JP2_FLAG_CINE_48;
}
- if (ftype & JP2_JP2)
+ if (custom_flags & JP2_JP2)
im_format->jp2_codec = R_IMF_JP2_CODEC_JP2;
- else if (ftype & JP2_J2K)
+ else if (custom_flags & JP2_J2K)
im_format->jp2_codec = R_IMF_JP2_CODEC_J2K;
else
BLI_assert(!"Unsupported jp2 codec was specified in file type");
@@ -2161,9 +2168,9 @@ void BKE_imbuf_write_prepare(ImBuf *ibuf, ImageFormatData *imf)
if (imtype == R_IMF_IMTYPE_PNG) {
if (imf->depth == R_IMF_CHAN_DEPTH_16)
- ibuf->ftype |= PNG_16BIT;
+ ibuf->foptions |= PNG_16BIT;
- ibuf->ftype |= compress;
+ ibuf->foptions |= compress;
}
}
@@ -2180,15 +2187,15 @@ void BKE_imbuf_write_prepare(ImBuf *ibuf, ImageFormatData *imf)
ibuf->ftype = TIF;
if (imf->depth == R_IMF_CHAN_DEPTH_16)
- ibuf->ftype |= TIF_16BIT;
+ ibuf->foptions |= TIF_16BIT;
}
#endif
#ifdef WITH_OPENEXR
else if (ELEM(imtype, R_IMF_IMTYPE_OPENEXR, R_IMF_IMTYPE_MULTILAYER)) {
ibuf->ftype = OPENEXR;
if (imf->depth == R_IMF_CHAN_DEPTH_16)
- ibuf->ftype |= OPENEXR_HALF;
- ibuf->ftype |= (imf->exr_codec & OPENEXR_COMPRESS);
+ ibuf->foptions |= OPENEXR_HALF;
+ ibuf->foptions |= (imf->exr_codec & OPENEXR_COMPRESS);
if (!(imf->flag & R_IMF_FLAG_ZBUF))
ibuf->zbuf_float = NULL; /* signal for exr saving */
@@ -2199,31 +2206,31 @@ void BKE_imbuf_write_prepare(ImBuf *ibuf, ImageFormatData *imf)
else if (imtype == R_IMF_IMTYPE_CINEON) {
ibuf->ftype = CINEON;
if (imf->cineon_flag & R_IMF_CINEON_FLAG_LOG) {
- ibuf->ftype |= CINEON_LOG;
+ ibuf->foptions |= CINEON_LOG;
}
if (imf->depth == R_IMF_CHAN_DEPTH_16) {
- ibuf->ftype |= CINEON_16BIT;
+ ibuf->foptions |= CINEON_16BIT;
}
else if (imf->depth == R_IMF_CHAN_DEPTH_12) {
- ibuf->ftype |= CINEON_12BIT;
+ ibuf->foptions |= CINEON_12BIT;
}
else if (imf->depth == R_IMF_CHAN_DEPTH_10) {
- ibuf->ftype |= CINEON_10BIT;
+ ibuf->foptions |= CINEON_10BIT;
}
}
else if (imtype == R_IMF_IMTYPE_DPX) {
ibuf->ftype = DPX;
if (imf->cineon_flag & R_IMF_CINEON_FLAG_LOG) {
- ibuf->ftype |= CINEON_LOG;
+ ibuf->foptions |= CINEON_LOG;
}
if (imf->depth == R_IMF_CHAN_DEPTH_16) {
- ibuf->ftype |= CINEON_16BIT;
+ ibuf->foptions |= CINEON_16BIT;
}
else if (imf->depth == R_IMF_CHAN_DEPTH_12) {
- ibuf->ftype |= CINEON_12BIT;
+ ibuf->foptions |= CINEON_12BIT;
}
else if (imf->depth == R_IMF_CHAN_DEPTH_10) {
- ibuf->ftype |= CINEON_10BIT;
+ ibuf->foptions |= CINEON_10BIT;
}
}
#endif
@@ -2231,34 +2238,36 @@ void BKE_imbuf_write_prepare(ImBuf *ibuf, ImageFormatData *imf)
ibuf->ftype = TGA;
}
else if (imtype == R_IMF_IMTYPE_RAWTGA) {
- ibuf->ftype = RAWTGA;
+ ibuf->ftype = TGA;
+ ibuf->foptions = RAWTGA;
}
#ifdef WITH_OPENJPEG
else if (imtype == R_IMF_IMTYPE_JP2) {
if (quality < 10) quality = 90;
- ibuf->ftype = JP2 | quality;
+ ibuf->ftype = JP2;
+ ibuf->foptions = quality;
if (imf->depth == R_IMF_CHAN_DEPTH_16) {
- ibuf->ftype |= JP2_16BIT;
+ ibuf->foptions |= JP2_16BIT;
}
else if (imf->depth == R_IMF_CHAN_DEPTH_12) {
- ibuf->ftype |= JP2_12BIT;
+ ibuf->foptions |= JP2_12BIT;
}
if (imf->jp2_flag & R_IMF_JP2_FLAG_YCC) {
- ibuf->ftype |= JP2_YCC;
+ ibuf->foptions |= JP2_YCC;
}
if (imf->jp2_flag & R_IMF_JP2_FLAG_CINE_PRESET) {
- ibuf->ftype |= JP2_CINE;
+ ibuf->foptions |= JP2_CINE;
if (imf->jp2_flag & R_IMF_JP2_FLAG_CINE_48)
- ibuf->ftype |= JP2_CINE_48FPS;
+ ibuf->foptions |= JP2_CINE_48FPS;
}
if (imf->jp2_codec == R_IMF_JP2_CODEC_JP2)
- ibuf->ftype |= JP2_JP2;
+ ibuf->foptions |= JP2_JP2;
else if (imf->jp2_codec == R_IMF_JP2_CODEC_J2K)
- ibuf->ftype |= JP2_J2K;
+ ibuf->foptions |= JP2_J2K;
else
BLI_assert(!"Unsupported jp2 codec was specified in im_format->jp2_codec");
}
@@ -2266,7 +2275,8 @@ void BKE_imbuf_write_prepare(ImBuf *ibuf, ImageFormatData *imf)
else {
/* R_IMF_IMTYPE_JPEG90, etc. default we save jpegs */
if (quality < 10) quality = 90;
- ibuf->fty
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list