Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for crash scaling an image

Browse Source
This commit is contained in:
Campbell Barton
2012-06-29 10:52:37 +00:00
parent 6264579f6b
commit 5d9f3c5d18
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_image.h
View File

@@ -191,7 +191,7 @@ struct Image *BKE_image_copy(struct Image *ima);
void BKE_image_merge(struct Image *dest, struct Image *source); void BKE_image_merge(struct Image *dest, struct Image *source);
/* scale the image */ /* scale the image */
void BKE_image_scale(struct Image *image, int width, int height); int BKE_image_scale(struct Image *image, int width, int height);
/* check if texture has alpha (depth=32) */ /* check if texture has alpha (depth=32) */
int BKE_image_has_alpha(struct Image *image); int BKE_image_has_alpha(struct Image *image);

10
source/blender/blenkernel/intern/image.c
View File

@@ -514,17 +514,21 @@ void BKE_image_merge(Image *dest, Image *source)
} }
/* note, we could be clever and scale all imbuf's but since some are mipmaps its not so simple */ /* note, we could be clever and scale all imbuf's but since some are mipmaps its not so simple */
void BKE_image_scale(Image *image, int width, int height) int BKE_image_scale(Image *image, int width, int height)
{ {
ImBuf *ibuf; ImBuf *ibuf;
void *lock; void *lock;
ibuf = BKE_image_acquire_ibuf(image, NULL, &lock); ibuf = BKE_image_acquire_ibuf(image, NULL, &lock);
IMB_scaleImBuf(ibuf, width, height); if (ibuf) {
ibuf->userflags |= IB_BITMAPDIRTY; IMB_scaleImBuf(ibuf, width, height);
ibuf->userflags |= IB_BITMAPDIRTY;
}
BKE_image_release_ibuf(image, lock); BKE_image_release_ibuf(image, lock);
return (ibuf != NULL);
} }
Image *BKE_image_load(const char *filepath) Image *BKE_image_load(const char *filepath)

7
source/blender/makesrna/intern/rna_image_api.c
View File

@@ -178,9 +178,11 @@ static void rna_Image_update(Image *image, ReportList *reports)
IMB_rect_from_float(ibuf); IMB_rect_from_float(ibuf);
} }
static void rna_Image_scale(Image *image, int width, int height) static void rna_Image_scale(Image *image, int width, int height, , ReportList *reports)
{ {
BKE_image_scale(image, width, height); if (!BKE_image_scale(image, width, height)) {
BKE_reportf(reports, RPT_ERROR, "Image \"%s\" does not have any image data", image->id.name + 2);
}
} }
static int rna_Image_gl_load(Image *image, ReportList *reports, int filter, int mag) static int rna_Image_gl_load(Image *image, ReportList *reports, int filter, int mag)
@@ -285,6 +287,7 @@ void RNA_api_image(StructRNA *srna)
func = RNA_def_function(srna, "scale", "rna_Image_scale"); func = RNA_def_function(srna, "scale", "rna_Image_scale");
RNA_def_function_ui_description(func, "Scale the image in pixels"); RNA_def_function_ui_description(func, "Scale the image in pixels");
RNA_def_function_flag(func, FUNC_USE_REPORTS);
parm = RNA_def_int(func, "width", 0, 1, 10000, "", "Width", 1, 10000); parm = RNA_def_int(func, "width", 0, 1, 10000, "", "Width", 1, 10000);
RNA_def_property_flag(parm, PROP_REQUIRED); RNA_def_property_flag(parm, PROP_REQUIRED);
parm = RNA_def_int(func, "height", 0, 1, 10000, "", "Height", 1, 10000); parm = RNA_def_int(func, "height", 0, 1, 10000, "", "Height", 1, 10000);